r5152 - packages/trunk/warzone2100/debian

[Paul Wise]

Author: pabs
Date: 2008-01-02 02:02:13 +0000 (Wed, 02 Jan 2008)
New Revision: 5152

Modified:
   packages/trunk/warzone2100/debian/TODO
   packages/trunk/warzone2100/debian/changelog
   packages/trunk/warzone2100/debian/control
   packages/trunk/warzone2100/debian/rules
Log:
brown paper bag commit

Modified: packages/trunk/warzone2100/debian/TODO
===================================================================
--- packages/trunk/warzone2100/debian/TODO	2008-01-01 14:28:19 UTC (rev 5151)
+++ packages/trunk/warzone2100/debian/TODO	2008-01-02 02:02:13 UTC (rev 5152)
@@ -1,4 +1 @@
 Keep up to date with upstream SVN until they branch for 2.1
-
-After a release is uploaded, ensure that we don't define DEBUG and that
-we use the right optimization settings.

Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog	2008-01-01 14:28:19 UTC (rev 5151)
+++ packages/trunk/warzone2100/debian/changelog	2008-01-02 02:02:13 UTC (rev 5152)
@@ -1,3 +1,13 @@
+warzone2100 (2.1.0~0.svn3260-2) unstable; urgency=low
+
+  * Brown paper bag upload
+  * Don't attempt to build/install the data in binary-arch (Closes: #458526)
+  * Disable debug because that turns compiler warnings into errors
+  * Specifically use automake 1.10 since automake 1.9 is a higher priority in
+    the alternatives for automake and we need automake 1.10 or greater.
+
+ -- Paul Wise <pabs at debian.org>  Wed, 02 Jan 2008 11:31:35 +0930
+
 warzone2100 (2.1.0~0.svn3260-1) unstable; urgency=low
 
   * New upstream development snapshot

Modified: packages/trunk/warzone2100/debian/control
===================================================================
--- packages/trunk/warzone2100/debian/control	2008-01-01 14:28:19 UTC (rev 5151)
+++ packages/trunk/warzone2100/debian/control	2008-01-02 02:02:13 UTC (rev 5152)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Linas Žvirblis <0x0007 at gmail.com>, Paul Wise <pabs at debian.org>
-Build-Depends: debhelper (>= 5), quilt, bison, flex, libopenal-dev, zlib1g-dev, libsdl1.2-dev, libsdl-net1.2-dev, libvorbis-dev, libmad0-dev, libphysfs-dev, libpng12-dev, libjpeg-dev, autoconf, automake, dpkg-dev (>= 1.13.19), libglc-dev, libpopt-dev
+Build-Depends: debhelper (>= 5), quilt, bison, flex, libopenal-dev, zlib1g-dev, libsdl1.2-dev, libsdl-net1.2-dev, libvorbis-dev, libmad0-dev, libphysfs-dev, libpng12-dev, libjpeg-dev, autoconf, automake (>= 1:1.10+nogfdl-1), dpkg-dev (>= 1.13.19), libglc-dev, libpopt-dev
 Build-Depends-Indep: zip, unzip
 Build-Conflicts: autoconf2.13, automake1.4
 Standards-Version: 3.7.3

Modified: packages/trunk/warzone2100/debian/rules
===================================================================
--- packages/trunk/warzone2100/debian/rules	2008-01-01 14:28:19 UTC (rev 5151)
+++ packages/trunk/warzone2100/debian/rules	2008-01-02 02:02:13 UTC (rev 5152)
@@ -10,6 +10,8 @@
 UPSTREAM_SVN_VERSION = $(shell dpkg-parsechangelog | sed -n 's/^Version: .*svn\([^-]*\).*/\1/p')
 UPSTREAM_SVN_DATE = $(shell date --utc --rfc-3339=seconds -r configure.ac)
 
+SUBDIRS = $(shell sed -n 's/^ *SUBDIRS *= *\(.*\)/\1/;s/ po / /;s/ data / /p' Makefile.am)
+
 CFLAGS  = -Wall -g
 LDFLAGS = -Wl,-z,defs
 
@@ -29,6 +31,8 @@
 	[ -f backup/autorevision.conf ] || cp autorevision.conf backup
 	grep -q ^revision= autorevision.conf || echo revision=$(UPSTREAM_SVN_VERSION) >> autorevision.conf
 	grep -q ^date= autorevision.conf || echo "date=$(UPSTREAM_SVN_DATE)" >> autorevision.conf
+	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)" \
@@ -43,7 +47,8 @@
 	    --with-applicationdir=\$${prefix}/share/applications \
 	    --with-opengl \
 	    --with-ogg \
-	    --with-distributor=Debian
+	    --with-distributor=Debian \
+	    --disable-debug
 # -------------------------------------
 
 
@@ -53,7 +58,9 @@
 
 build-stamp:
 	dh_testdir
-	$(MAKE)
+	for d in $(SUBDIRS) ; do \
+		$(MAKE) -C $$d ; \
+	done 
 	touch $@
 # -------------------------------------
 
@@ -85,6 +92,8 @@
 	-mv -f backup/*.po po/
 	rm -rf depcomp aclocal.m4 configure config.guess \
 	backup install-sh config.sub missing config.h.in
+	sed -i -e 's_automake[^/" ]*_automake_g' autogen.sh
+	sed -i -e 's_aclocal[^/" ]*_aclocal_g' autogen.sh
 # -------------------------------------
 
 
@@ -105,7 +114,9 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_clean -k -a
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	for d in $(SUBDIRS) ; do \
+		$(MAKE) -C $$d install DESTDIR=$(CURDIR)/debian/tmp ; \
+	done
 	rm -rf debian/tmp/usr/share/doc/warzone2100
 # -------------------------------------