r9879 - packages/trunk/warzone2100/debian

[Paul Wise]

Author: pabs
Date: 2009-06-22 09:41:09 +0000 (Mon, 22 Jun 2009)
New Revision: 9879

Modified:
   packages/trunk/warzone2100/debian/rules
   packages/trunk/warzone2100/debian/warzone2100-data.install
   packages/trunk/warzone2100/debian/warzone2100-music.dirs
   packages/trunk/warzone2100/debian/warzone2100-music.install
   packages/trunk/warzone2100/debian/warzone2100.docs
   packages/trunk/warzone2100/debian/warzone2100.install
Log:
update build rules for some changes in 2.2

Modified: packages/trunk/warzone2100/debian/rules
===================================================================
--- packages/trunk/warzone2100/debian/rules	2009-06-22 05:42:21 UTC (rev 9878)
+++ packages/trunk/warzone2100/debian/rules	2009-06-22 09:41:09 UTC (rev 9879)
@@ -34,9 +34,9 @@
 config.status:
 	dh_testdir
 	[ -d backup ] || ( mkdir backup && cp -f po/*.po backup )
-	sed -i -e 's_automake[^/" ]*_automake-1.10_g' autogen.sh
-	sed -i -e 's_aclocal[^/" ]*_aclocal-1.10_g' autogen.sh
-	./autogen.sh
+#	sed -i -e 's_automake[^/" ]*_automake-1.10_g' autogen.sh
+#	sed -i -e 's_aclocal[^/" ]*_aclocal-1.10_g' autogen.sh
+#	./autogen.sh
 	./configure \
 	    CFLAGS="$(CFLAGS)" \
 	    LDFLAGS="$(LDFLAGS)" \
@@ -88,13 +88,13 @@
 	dh_testroot
 	dh_clean
 	rm -f build-stamp build-indep-stamp
-	[ ! -f Makefile ] || $(MAKE) maintainer-clean
-	find -iname Makefile.in -print0 | xargs -0 rm -f
+	[ ! -f Makefile ] || $(MAKE) distclean
 	-mv -f backup/*.po po/
-	rm -rf depcomp aclocal.m4 configure config.guess \
-	backup install-sh config.sub missing config.h.in po/warzone2100.pot
-	sed -i -e 's_automake[^/" ]*_automake_g' autogen.sh
-	sed -i -e 's_aclocal[^/" ]*_aclocal_g' autogen.sh
+#	find -iname Makefile.in -print0 | xargs -0 rm -f
+#	rm -rf depcomp aclocal.m4 configure config.guess \
+#	backup install-sh config.sub missing config.h.in po/warzone2100.pot
+#	sed -i -e 's_automake[^/" ]*_automake_g' autogen.sh
+#	sed -i -e 's_aclocal[^/" ]*_aclocal_g' autogen.sh
 # -------------------------------------
 
 

Modified: packages/trunk/warzone2100/debian/warzone2100-data.install
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100-data.install	2009-06-22 05:42:21 UTC (rev 9878)
+++ packages/trunk/warzone2100/debian/warzone2100-data.install	2009-06-22 09:41:09 UTC (rev 9879)
@@ -1,4 +1,3 @@
 usr/share/locale
 usr/share/games/warzone2100/*.wz
 usr/share/games/warzone2100/mods/multiplay
-usr/share/games/warzone2100/mods/global/*.wz

Modified: packages/trunk/warzone2100/debian/warzone2100-music.dirs
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100-music.dirs	2009-06-22 05:42:21 UTC (rev 9878)
+++ packages/trunk/warzone2100/debian/warzone2100-music.dirs	2009-06-22 09:41:09 UTC (rev 9879)
@@ -1 +1 @@
-usr/share/games/warzone2100/mods/global/autoload
+usr/share/games/warzone2100/music

Modified: packages/trunk/warzone2100/debian/warzone2100-music.install
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100-music.install	2009-06-22 05:42:21 UTC (rev 9878)
+++ packages/trunk/warzone2100/debian/warzone2100-music.install	2009-06-22 09:41:09 UTC (rev 9879)
@@ -1 +1 @@
-usr/share/games/warzone2100/mods/global/autoload/music
+usr/share/games/warzone2100/music

Modified: packages/trunk/warzone2100/debian/warzone2100.docs
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100.docs	2009-06-22 05:42:21 UTC (rev 9878)
+++ packages/trunk/warzone2100/debian/warzone2100.docs	2009-06-22 09:41:09 UTC (rev 9879)
@@ -1,3 +1,2 @@
 doc/Readme.en
 doc/Readme.de
-doc/2.1-RELEASE_NOTES.txt

Modified: packages/trunk/warzone2100/debian/warzone2100.install
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100.install	2009-06-22 05:42:21 UTC (rev 9878)
+++ packages/trunk/warzone2100/debian/warzone2100.install	2009-06-22 09:41:09 UTC (rev 9879)
@@ -3,5 +3,3 @@
 usr/share/applications
 ../../debian/warzone2100-16x16.xpm usr/share/pixmaps
 ../../debian/warzone2100-32x32.xpm usr/share/pixmaps
-../../icons/warzone2100.svg usr/share/icons/hicolor/scalable/apps
-