Ticket #228: desktop.2.diff

File desktop.2.diff, 4.8 kB (added by james_w, 6 months ago)

Start of a patch to make desktop files validate.

  • avahi-python/avahi-discover/Makefile.am

    old new  
    2323    __init__.py \ 
    2424    SimpleGladeApp.py \ 
    2525    avahi-discover.in \ 
    26     avahi-discover.desktop.in 
     26    avahi-discover.desktop.in.in 
    2727 
    2828if HAVE_PYTHON 
    2929if HAVE_PYTHON_DBUS 
    …… 
    3232pythonscripts = 
    3333 
    3434desktopdir = $(datadir)/applications 
    35 desktop_DATA =  
     35desktop_in_files = avahi-discover.desktop.in 
     36desktop_DATA = 
     37@INTLTOOL_DESKTOP_RULE@ 
    3638 
    3739avahi_discoverdir = $(pythondir)/avahi_discover 
    3840avahi_discover_PYTHON = 
    …… 
    4042if HAVE_GDBM 
    4143pythonscripts += \ 
    4244    avahi-discover 
    43 desktop_DATA += avahi-discover.desktop 
     45desktop_DATA += $(desktop_in_files:.desktop.in=.desktop) 
    4446avahi_discover_PYTHON += __init__.py SimpleGladeApp.py 
    4547endif 
    4648 
    4749if HAVE_DBM 
    4850pythonscripts += \ 
    4951    avahi-discover 
    50 desktop_DATA += avahi-discover.desktop 
     52desktop_DATA += $(desktop_in_files:.desktop.in=.desktop) 
    5153avahi_discover_PYTHON += __init__.py SimpleGladeApp.py 
    5254endif 
    5355 
    54 avahi-discover.desktop: avahi-discover.desktop.in 
    55     sed -e 's,@bindir\@,$(bindir),g' $< > $@ 
    56  
    5756avahi-discover: avahi-discover.in 
    5857    sed -e 's,@PYTHON\@,$(PYTHON),g' \ 
    5958        -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@ 
    6059    chmod +x $@ 
    6160 
    6261bin_SCRIPTS = $(pythonscripts) 
    63 CLEANFILES = $(pythonscripts) $(desktop_DATA) *.pyc *.pyo 
     62CLEANFILES = $(pythonscripts) $(desktop_in_files) $(desktop_DATA) *.pyc *.pyo 
    6463 
    6564endif 
    6665endif 

  • avahi-python/avahi-discover/avahi-discover.desktop.in

    old new  
    11[Desktop Entry] 
    22Version=1.0 
    3 Encoding=UTF-8 
    4 Name=Avahi Zeroconf Browser 
    5 Comment=Browse for Zeroconf services available on your network 
     3_Name=Avahi Zeroconf Browser 
     4_Comment=Browse for Zeroconf services available on your network 
    65Exec=@bindir@/avahi-discover 
    76Terminal=false 
    87Type=Application 

  • avahi-ui/Makefile.am

    old new  
    2323AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' 
    2424 
    2525desktopdir = $(datadir)/applications 
     26desktop_in_files = bssh.desktop bvnc.desktop 
    2627desktop_DATA =  
     28@INTLTOOL_DESKTOP_RULE@ 
    2729 
    28 EXTRA_DIST = bssh.desktop.in bvnc.desktop.in 
     30EXTRA_DIST = bssh.desktop.in.in bvnc.desktop.in.in 
    2931 
    3032 
    3133if HAVE_GTK 
    …… 
    5860endif 
    5961 
    6062bin_PROGRAMS = bssh 
    61 desktop_DATA += bssh.desktop bvnc.desktop 
     63desktop_DATA += $(desktop_in_files:.desktop.in=.desktop) 
    6264 
    6365bssh_SOURCES = bssh.c 
    6466bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS) 
    …… 
    7072        $(LN_S) bssh bvnc && \ 
    7173        $(LN_S) bssh bshell 
    7274 
    73 bssh.desktop: bssh.desktop.in 
    74     sed -e 's,@bindir\@,$(bindir),g' $< > $@ 
    75  
    76 bvnc.desktop: bvnc.desktop.in 
    77     sed -e 's,@bindir\@,$(bindir),g' $< > $@ 
    78  
    7975endif # HAVE_GLIB 
    8076endif 
    8177endif 
    8278 
    83 CLEANFILES = $(desktop_DATA) 
     79CLEANFILES = $(desktop_in_files) $(desktop_DATA) 

  • avahi-ui/bssh.desktop.in

    old new  
    11[Desktop Entry] 
    22Version=1.0 
    3 Encoding=UTF-8 
    43_Name=Avahi SSH Server Browser 
    54_Comment=Browse for Zeroconf-enabled SSH Servers 
    65Exec=@bindir@/bssh 

  • avahi-ui/bvnc.desktop.in

    old new  
    11[Desktop Entry] 
    22Version=1.0 
    3 Encoding=UTF-8 
    43_Name=Avahi VNC Server Browser 
    54_Comment=Browse for Zeroconf-enabled VNC Servers 
    65Exec=@bindir@/bvnc 

  • configure.ac

    old new  
    10751075avahi-python/Makefile 
    10761076avahi-python/avahi/Makefile 
    10771077avahi-python/avahi-discover/Makefile 
     1078avahi-python/avahi-discover/avahi-discover.desktop.in 
    10781079examples/Makefile 
    10791080common/Makefile 
    10801081man/Makefile 
    …… 
    10871088avahi-compat-howl/samples/Makefile 
    10881089avahi-autoipd/Makefile 
    10891090avahi-ui/Makefile 
     1091avahi-ui/bssh.desktop.in 
     1092avahi-ui/bvnc.desktop.in 
    10901093po/Makefile.in 
    10911094]) 
    10921095AC_OUTPUT 

  • po/POTFILES.in

    old new  
    11# List of source files which contain translatable strings. 
    22avahi-common/error.c 
     3avahi-python/avahi-discover/avahi-discover.desktop.in.in 
    34avahi-ui/avahi-ui.c 
    45avahi-ui/bssh.c 
    5 avahi-ui/bssh.desktop.in 
    6 avahi-ui/bvnc.desktop.in 
     6avahi-ui/bssh.desktop.in.in 
     7avahi-ui/bvnc.desktop.in.in 
    78avahi-utils/avahi-browse.c 
    89avahi-utils/avahi-publish.c 
    910avahi-utils/avahi-resolve.c