gwget r581 - in trunk: . data po

[davidsf svn gnome org]

Author: davidsf
Date: Tue May 20 18:28:25 2008
New Revision: 581
URL: http://svn.gnome.org/viewvc/gwget?rev=581&view=rev

Log:
2008-05-20  David SedeÃo <david alderia com>

        * Make desktop file translatable and moved to data/. Fix bug #530310.
	Thanks to Gabor Kelemen for the patch.



Removed:
   trunk/gwget.desktop.in
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/data/Makefile.am
   trunk/po/POTFILES.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue May 20 18:28:25 2008
@@ -11,8 +11,3 @@
 	intltool-merge.in \
 	intltool-update.in
 
-desktop_files=gwget.desktop
-
-Applicationsdir = $(datadir)/applications
-Applications_DATA = $(desktop_files)
-

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Tue May 20 18:28:25 2008
@@ -21,10 +21,23 @@
 schemas_DATA =  $(schemas_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
+desktopdir       = $(datadir)/applications
+desktop_in_files = gwget.desktop.in.in
+desktop_DATA     =$(desktop_in_files:.desktop.in.in=.desktop)
+
+%.desktop.in: %.desktop.in.in
+	sed -e "s/\ VERSION\@/$(VERSION)/" < $< > $@
+
+ INTLTOOL_DESKTOP_RULE@
 
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule gwget.schemas
 
 EXTRA_DIST = $(gwget_data_DATA) \
 	     $(service_in_files) \
+	     $(desktop_in_files) \
 	     $(schemas_in_files) 
+
+DISTCLEANFILES = 				\
+	$(desktop_DATA)       			
+

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Tue May 20 18:28:25 2008
@@ -1,6 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
+data/gwget.desktop.in
 data/gwget.glade
 data/gwget.schemas.in
 data/preferences.glade