gnome-games r8574 - in trunk: . lightsoff po

[jclinton svn gnome org]

Author: jclinton
Date: Fri Jan 16 00:28:26 2009
New Revision: 8574
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8574&view=rev

Log:
Fixed lightsoff so that we can distcheck it in to a tarball

The lightsoff desktop file was using a slightly different method than the rest
of the games were. Now, it is added to the global AC_CONFIG_FILES in
configure.in and uses a .in.in version which is included in DIST_COMMON by
virtue of the .in dependency.

Added:
   trunk/lightsoff/lightsoff.desktop.in.in
      - copied, changed from r8573, /trunk/lightsoff/lightsoff.desktop.in
Removed:
   trunk/lightsoff/lightsoff.desktop.in
Modified:
   trunk/Makefile.am
   trunk/configure.in
   trunk/lightsoff/Makefile.am
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Jan 16 00:28:26 2009
@@ -12,7 +12,7 @@
 SUBDIRS += sounds
 endif
 
-DIST_SUBDIRS = po dependencies icons sounds libgames-support tests $(allgames)
+DIST_SUBDIRS = po dependencies icons sounds libgames-support tests $(allgames) $(staginggames)
 
 EXTRA_DIST = \
 	autogen.sh \

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jan 16 00:28:26 2009
@@ -1144,6 +1144,7 @@
 lightsoff/main.js
 lightsoff/score.js
 lightsoff/lightsoff
+lightsoff/lightsoff.desktop.in
 tests/Makefile
 tests/libgames-support/Makefile
 ])

Modified: trunk/lightsoff/Makefile.am
==============================================================================
--- trunk/lightsoff/Makefile.am	(original)
+++ trunk/lightsoff/Makefile.am	Fri Jan 16 00:28:26 2009
@@ -26,16 +26,16 @@
 	main.js \
 	score.js
 
-CLEANFILES = $(lojs_DATA)
-
 bin_SCRIPTS = \
 	lightsoff
 
-desktop_in_files = lightsoff.desktop.in
+desktop_in_files = lightsoff.desktop.in.in
 desktopdir = $(datadir)/applications
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
+CLEANFILES = $(lojs_DATA) $(desktop_DATA)
+
 EXTRA_DIST = \
 	board.js.in \
 	light.js.in \
@@ -60,6 +60,3 @@
 	arrow-r.svg \
 	lightsoff.in \
 	arrow.js.in
-
-
-

Copied: trunk/lightsoff/lightsoff.desktop.in.in (from r8573, /trunk/lightsoff/lightsoff.desktop.in)
==============================================================================

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Fri Jan 16 00:28:26 2009
@@ -296,7 +296,7 @@
 libgames-support/games-scores-dialog.c
 libgames-support/games-sound.c
 libgames-support/games-stock.c
-lightsoff/lightsoff.desktop.in
+lightsoff/lightsoff.desktop.in.in
 mahjongg/drawing.c
 mahjongg/mahjongg.c
 mahjongg/mahjongg.desktop.in.in

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Fri Jan 16 00:28:26 2009
@@ -21,5 +21,6 @@
 gnotski/gnotski.desktop.in
 gtali/gtali.desktop.in
 iagno/iagno.desktop.in
+lightsoff/lightsoff.desktop.in
 mahjongg/mahjongg.desktop.in
 same-gnome/same-gnome.desktop.in