r2587 - in packages/trunk/warzone2100/debian: . patches

Linas Žvirblis linas-guest at alioth.debian.org
Sun Apr 22 13:17:12 UTC 2007 

Author: linas-guest
Date: 2007-04-22 13:17:11 +0000 (Sun, 22 Apr 2007)
New Revision: 2587

Added:
   packages/trunk/warzone2100/debian/patches/do-not-force-32-bits.diff
   packages/trunk/warzone2100/debian/patches/series
Modified:
   packages/trunk/warzone2100/debian/changelog
   packages/trunk/warzone2100/debian/control
   packages/trunk/warzone2100/debian/rules
Log:
Big update. Bringing back autotools.

Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog	2007-04-21 21:45:15 UTC (rev 2586)
+++ packages/trunk/warzone2100/debian/changelog	2007-04-22 13:17:11 UTC (rev 2587)
@@ -1,9 +1,5 @@
-warzone2100 (2.0.4-1) UNRELEASED; urgency=low
+warzone2100 (2.0.6-1) UNRELEASED; urgency=low
 
-  [ Linas Žvirblis ]
   * Initial release (Closes: #325935).
 
-  [ Eddy Petrișor ]
-  * added dependency on dpkg-dev (>=1.13.19) since we use source:Version
-
- -- Eddy Petrișor <eddy.petrisor at gmail.com>  Sat, 23 Dec 2006 15:05:36 +0200
+ -- Linas Žvirblis <0x0007 at gmail.com>  Sun, 22 Apr 2007 16:13:41 +0300

Modified: packages/trunk/warzone2100/debian/control
===================================================================
--- packages/trunk/warzone2100/debian/control	2007-04-21 21:45:15 UTC (rev 2586)
+++ packages/trunk/warzone2100/debian/control	2007-04-22 13:17:11 UTC (rev 2587)
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Linas Žvirblis <0x0007 at gmail.com>
-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, dpkg-dev (>= 1.13.19)
+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
 Build-Depends-Indep: zip, unzip
+Build-Conflicts: autoconf2.13, automake1.4
 Standards-Version: 3.7.2
 
 Package: warzone2100

Added: packages/trunk/warzone2100/debian/patches/do-not-force-32-bits.diff
===================================================================
--- packages/trunk/warzone2100/debian/patches/do-not-force-32-bits.diff	2007-04-21 21:45:15 UTC (rev 2586)
+++ packages/trunk/warzone2100/debian/patches/do-not-force-32-bits.diff	2007-04-22 13:17:11 UTC (rev 2587)
@@ -0,0 +1,13 @@
+Index: Debian/configure.ac
+===================================================================
+--- Debian.orig/configure.ac	2007-04-22 14:09:04.000000000 +0300
++++ Debian/configure.ac	2007-04-22 14:09:27.000000000 +0300
+@@ -306,7 +306,7 @@
+ # add some required C flags here
+ # -DYY_STATIC is required by flex
+ # -m32 forces 32-bit compile, since code is not clean enough for 64-bit yet
+-WZ_CFLAGS="${WZ_CFLAGS} -m32 -DYY_STATIC -DDEFAULT_DATADIR=\\\"${datadir}/warzone2100\\\""
++WZ_CFLAGS="${WZ_CFLAGS} -DYY_STATIC -DDEFAULT_DATADIR=\\\"${datadir}/warzone2100\\\""
+ 
+ CFLAGS="${WZ_CFLAGS} ${CFLAGS} ${WZ_CFLAGS_OVERRIDE}"
+ LIBS="${LIBS} ${WZ_LIBS} ${WIN32_LIBS}"

Added: packages/trunk/warzone2100/debian/patches/series
===================================================================
--- packages/trunk/warzone2100/debian/patches/series	2007-04-21 21:45:15 UTC (rev 2586)
+++ packages/trunk/warzone2100/debian/patches/series	2007-04-22 13:17:11 UTC (rev 2587)
@@ -0,0 +1 @@
+do-not-force-32-bits.diff

Modified: packages/trunk/warzone2100/debian/rules
===================================================================
--- packages/trunk/warzone2100/debian/rules	2007-04-21 21:45:15 UTC (rev 2586)
+++ packages/trunk/warzone2100/debian/rules	2007-04-22 13:17:11 UTC (rev 2587)
@@ -19,9 +19,21 @@
 
 # Configure the package
 # -------------------------------------
-config.status: patch configure
+config.status: patch
 	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games --mandir=\$${prefix}/share/man CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" --with-opengl --with-ogg --with-mp3
+	./autogen.sh
+	./configure \
+	    CFLAGS="$(CFLAGS)" \
+	    LDFLAGS="$(LDFLAGS)" \
+	    --host=$(DEB_HOST_GNU_TYPE) \
+	    --build=$(DEB_BUILD_GNU_TYPE) \
+	    --prefix=/usr \
+	    --bindir=\$${prefix}/games \
+	    --datadir=\$${prefix}/share/games \
+	    --mandir=\$${prefix}/share/man \
+	    --with-opengl \
+	    --with-ogg \
+	    --with-mp3
 # -------------------------------------
 
 
@@ -31,7 +43,7 @@
 
 patch-stamp:
 	dh_testdir
-	quilt -a push
+	-test -r debian/patches/series && QUILT_PATCHES=debian/patches quilt -a push
 	touch $@
 # -------------------------------------
 
@@ -40,7 +52,7 @@
 # -------------------------------------
 unpatch: patch
 	dh_testdir
-	quilt -af pop
+	-test -r debian/patches/series && QUILT_PATCHES=debian/patches quilt -af pop
 	rm -f patch-stamp
 	rm -rf .pc
 # -------------------------------------
@@ -64,7 +76,8 @@
 
 build-indep-stamp: config.status
 	dh_testdir
-	cd data && $(MAKE) dist-hook
+	cd data && $(MAKE) warzone.wz
+	cd data && $(MAKE) mp.wz
 	touch $@
 # -------------------------------------
 
@@ -79,20 +92,17 @@
 	rm -f build-stamp
 	rm -f build-indep-stamp
 	-$(MAKE) clean
-	rm -f lib/*/*_lexer.c
-	rm -f lib/*/*_parser.c
-	rm -f lib/*/*_parser.h
-	rm -f src/*_lexer.c
-	rm -f src/*_parser.c
-	rm -f src/*_parser.h
-	rm -f src/version.c
-	rm -f config.h
+	-$(MAKE) distclean
+	rm -f configure
+	rm -f config.guess
+	rm -f config.sub
 	rm -f config.log
 	rm -f config.status
-	rm -f stamp-h1
-	rm -f Makefile
-	rm -f */Makefile
-	rm -f */*/Makefile
+	rm -f Makefile.in
+	rm -f */Makefile.in
+	rm -f */*/Makefile.in
+	rm -f */*_lexer.lex.c
+	rm -f */*/*_lexer.lex.c
 	rm -rf */.deps
 	rm -rf */*/.deps
 	dh_clean
@@ -106,7 +116,8 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install-data DESTDIR=$(CURDIR)/debian/warzone2100-data
+	dh_install -i data/warzone.wz usr/share/games/warzone2100
+	dh_install -i data/mp.wz usr/share/games/warzone2100
 # -------------------------------------
 
 
@@ -117,17 +128,17 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install-exec DESTDIR=$(CURDIR)/debian/warzone2100
+	dh_install -a src/warzone2100 usr/games
 # -------------------------------------
 
 
 # Build architecture-independent files
 # -------------------------------------
 binary-indep: build-indep install-indep
-	dh_testdir
-	dh_testroot
+	dh_testdir -i
+	dh_testroot -i
 	dh_installchangelogs -i ChangeLog
-	dh_installdocs -i
+	dh_installdocs -i README TODO
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
@@ -140,8 +151,8 @@
 # Build architecture-dependent files
 # -------------------------------------
 binary-arch: build install
-	dh_testdir
-	dh_testroot
+	dh_testdir -a
+	dh_testroot -a
 	dh_installchangelogs -a ChangeLog
 	dh_installdocs -a README TODO
 	dh_install -a debian/warzone2100-16x16.xpm /usr/share/pixmaps

More information about the Pkg-games-commits mailing list