r4627 - packages/trunk/conquest/debian

Barry deFreese bddebian-guest at alioth.debian.org
Sun Nov 11 14:56:30 UTC 2007 

Author: bddebian-guest
Date: 2007-11-11 14:56:30 +0000 (Sun, 11 Nov 2007)
New Revision: 4627

Added:
   packages/trunk/conquest/debian/compat
   packages/trunk/conquest/debian/conquest-data.install
   packages/trunk/conquest/debian/conquest-gl.install
   packages/trunk/conquest/debian/conquest-gl.manpages
   packages/trunk/conquest/debian/conquest-libs.install
   packages/trunk/conquest/debian/conquest-server.install
   packages/trunk/conquest/debian/conquest-server.manpages
   packages/trunk/conquest/debian/conquest.install
   packages/trunk/conquest/debian/conquest.manpages
Removed:
   packages/trunk/conquest/debian/conffiles
   packages/trunk/conquest/debian/conquest-gl.conffiles
   packages/trunk/conquest/debian/conquest.postrm
   packages/trunk/conquest/debian/shlibs
Modified:
   packages/trunk/conquest/debian/changelog
   packages/trunk/conquest/debian/conquest-server.postrm
   packages/trunk/conquest/debian/conquest-server.prerm
   packages/trunk/conquest/debian/conquest.docs
   packages/trunk/conquest/debian/control
   packages/trunk/conquest/debian/menu
   packages/trunk/conquest/debian/postinst
   packages/trunk/conquest/debian/postrm
   packages/trunk/conquest/debian/rules
   packages/trunk/conquest/debian/watch
Log:
* Add myself to uploaders
* Fix watch file
* Debhelperize build system
* Add quilt patching system
* 01_man_pages.diff - Fix manpage syntax issues
  + Thanks to Emmet Hikory for the patch and debhelper fixes


Modified: packages/trunk/conquest/debian/changelog
===================================================================
--- packages/trunk/conquest/debian/changelog	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/changelog	2007-11-11 14:56:30 UTC (rev 4627)
@@ -1,3 +1,15 @@
+conquest (8.3-2) UNRELEASED; urgency=low
+
+  [ Barry deFreese ]
+  * Add myself to uploaders
+  * Fix watch file
+  * Debhelperize build system
+  * Add quilt patching system
+  * 01_man_pages.diff - Fix manpage syntax issues
+    + Thanks to Emmet Hikory for the patch and debhelper fixes
+
+ -- Barry deFreese <bddebian at comcast.net>  Sun, 04 Nov 2007 14:06:31 -0500
+
 conquest (8.3-1) unstable; urgency=low
 
   * New upstream release.

Added: packages/trunk/conquest/debian/compat
===================================================================
--- packages/trunk/conquest/debian/compat	                        (rev 0)
+++ packages/trunk/conquest/debian/compat	2007-11-11 14:56:30 UTC (rev 4627)
@@ -0,0 +1 @@
+5

Deleted: packages/trunk/conquest/debian/conffiles
===================================================================
--- packages/trunk/conquest/debian/conffiles	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/conffiles	2007-11-11 14:56:30 UTC (rev 4627)
@@ -1,2 +0,0 @@
-/etc/conquest/conqinitrc
-/etc/conquest/soundrc

Added: packages/trunk/conquest/debian/conquest-data.install
===================================================================
--- packages/trunk/conquest/debian/conquest-data.install	                        (rev 0)
+++ packages/trunk/conquest/debian/conquest-data.install	2007-11-11 14:56:30 UTC (rev 4627)
@@ -0,0 +1 @@
+usr/share/games/*

Deleted: packages/trunk/conquest/debian/conquest-gl.conffiles
===================================================================
--- packages/trunk/conquest/debian/conquest-gl.conffiles	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/conquest-gl.conffiles	2007-11-11 14:56:30 UTC (rev 4627)
@@ -1,2 +0,0 @@
-/etc/conquest/texturesrc
-/etc/conquest/00_plantex.trc

Added: packages/trunk/conquest/debian/conquest-gl.install
===================================================================
--- packages/trunk/conquest/debian/conquest-gl.install	                        (rev 0)
+++ packages/trunk/conquest/debian/conquest-gl.install	2007-11-11 14:56:30 UTC (rev 4627)
@@ -0,0 +1,3 @@
+usr/games/conquestgl
+etc/conquest/texturesrc
+etc/conquest/00_plantex.trc

Added: packages/trunk/conquest/debian/conquest-gl.manpages
===================================================================
--- packages/trunk/conquest/debian/conquest-gl.manpages	                        (rev 0)
+++ packages/trunk/conquest/debian/conquest-gl.manpages	2007-11-11 14:56:30 UTC (rev 4627)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man6/conquestgl.6

Added: packages/trunk/conquest/debian/conquest-libs.install
===================================================================
--- packages/trunk/conquest/debian/conquest-libs.install	                        (rev 0)
+++ packages/trunk/conquest/debian/conquest-libs.install	2007-11-11 14:56:30 UTC (rev 4627)
@@ -0,0 +1 @@
+usr/lib/games/conquest/*.so*

Added: packages/trunk/conquest/debian/conquest-server.install
===================================================================
--- packages/trunk/conquest/debian/conquest-server.install	                        (rev 0)
+++ packages/trunk/conquest/debian/conquest-server.install	2007-11-11 14:56:30 UTC (rev 4627)
@@ -0,0 +1,5 @@
+usr/games/conqoper
+usr/games/conquestd
+usr/games/conqai
+usr/lib/games/conquest/conqdriv
+

Added: packages/trunk/conquest/debian/conquest-server.manpages
===================================================================
--- packages/trunk/conquest/debian/conquest-server.manpages	                        (rev 0)
+++ packages/trunk/conquest/debian/conquest-server.manpages	2007-11-11 14:56:30 UTC (rev 4627)
@@ -0,0 +1,4 @@
+debian/tmp/usr/share/man/man6/conqoper.6
+debian/tmp/usr/share/man/man6/conquestd.6
+debian/tmp/usr/share/man/man6/conqai.6
+

Modified: packages/trunk/conquest/debian/conquest-server.postrm
===================================================================
--- packages/trunk/conquest/debian/conquest-server.postrm	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/conquest-server.postrm	2007-11-11 14:56:30 UTC (rev 4627)
@@ -46,3 +46,5 @@
 
 	;;
 esac
+
+#DEBHELPER#

Modified: packages/trunk/conquest/debian/conquest-server.prerm
===================================================================
--- packages/trunk/conquest/debian/conquest-server.prerm	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/conquest-server.prerm	2007-11-11 14:56:30 UTC (rev 4627)
@@ -16,3 +16,5 @@
         exit 0
 
 esac
+
+#DEBHELPER#

Modified: packages/trunk/conquest/debian/conquest.docs
===================================================================
--- packages/trunk/conquest/debian/conquest.docs	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/conquest.docs	2007-11-11 14:56:30 UTC (rev 4627)
@@ -1,3 +1,2 @@
-TODO
-conquest-7.2.txt
+conquest-8.3.txt
 README

Added: packages/trunk/conquest/debian/conquest.install
===================================================================
--- packages/trunk/conquest/debian/conquest.install	                        (rev 0)
+++ packages/trunk/conquest/debian/conquest.install	2007-11-11 14:56:30 UTC (rev 4627)
@@ -0,0 +1,8 @@
+usr/games/conquestsh
+usr/games/conqmetad
+usr/games/conquest
+usr/games/conqinit
+usr/games/conqstrat
+etc/conquest/soundrc
+etc/conquest/conqinitrc
+

Added: packages/trunk/conquest/debian/conquest.manpages
===================================================================
--- packages/trunk/conquest/debian/conquest.manpages	                        (rev 0)
+++ packages/trunk/conquest/debian/conquest.manpages	2007-11-11 14:56:30 UTC (rev 4627)
@@ -0,0 +1,5 @@
+debian/tmp/usr/share/man/man6/conqinit.6
+debian/tmp/usr/share/man/man6/conqstrat.6
+debian/tmp/usr/share/man/man6/conqmetad.6
+debian/tmp/usr/share/man/man6/conquestsh.6
+debian/tmp/usr/share/man/man6/conquest.6

Deleted: packages/trunk/conquest/debian/conquest.postrm
===================================================================
--- packages/trunk/conquest/debian/conquest.postrm	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/conquest.postrm	2007-11-11 14:56:30 UTC (rev 4627)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	       purge|remove)
-		if [ -x /usr/bin/update-menus ]; then update-menus ; fi
-		;;
-esac

Modified: packages/trunk/conquest/debian/control
===================================================================
--- packages/trunk/conquest/debian/control	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/control	2007-11-11 14:56:30 UTC (rev 4627)
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Build-Depends: flex, bison, libncurses5-dev, zlib1g-dev, libgl1-mesa-dev | libgl-dev, freeglut3-dev | libglut-dev, libglu1-mesa-dev | libglu-dev, libxt-dev, libxi-dev, libxmu-dev, libsdl1.2-dev, libsdl-mixer1.2-dev
+Build-Depends: debhelper (>> 5.0), autotools-dev, quilt, flex, bison, libncurses5-dev, zlib1g-dev, libgl1-mesa-dev | libgl-dev, freeglut3-dev | libglut-dev, libglu1-mesa-dev | libglu-dev, libxt-dev, libxi-dev, libxmu-dev, libsdl1.2-dev, libsdl-mixer1.2-dev
 Standards-Version: 3.7.2
 
 Package: conquest

Modified: packages/trunk/conquest/debian/menu
===================================================================
--- packages/trunk/conquest/debian/menu	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/menu	2007-11-11 14:56:30 UTC (rev 4627)
@@ -1,2 +1,2 @@
-?package(conquest):needs="text" section="Games/Arcade" \
+?package(conquest):needs="text" section="Games/Action" \
   title="conquest" command="/usr/games/conquest"

Modified: packages/trunk/conquest/debian/postinst
===================================================================
--- packages/trunk/conquest/debian/postinst	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/postinst	2007-11-11 14:56:30 UTC (rev 4627)
@@ -51,4 +51,6 @@
     ;;
 esac
 
+#DEBHELPER#
+
 exit 0

Modified: packages/trunk/conquest/debian/postrm
===================================================================
--- packages/trunk/conquest/debian/postrm	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/postrm	2007-11-11 14:56:30 UTC (rev 4627)
@@ -34,4 +34,4 @@
 
 esac
 
-if [ -x /usr/bin/update-menus ]; then update-menus ; fi
+#DEBHELPER#

Modified: packages/trunk/conquest/debian/rules
===================================================================
--- packages/trunk/conquest/debian/rules	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/rules	2007-11-11 14:56:30 UTC (rev 4627)
@@ -1,250 +1,101 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
+include /usr/share/quilt/quilt.make
+
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
 CFLAGS = -Wall -g
-INSTALL = install
-INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
-INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
+	CFLAGS += -O0
 else
-CFLAGS += -O2
+	CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-INSTALL_PROGRAM += -s
-endif
 
-configure: configure-stamp
-configure-stamp:
-	$(checkdir)
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --bindir=/usr/games --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --localstatedir=/var/games --libexecdir=/usr/lib/games/conquest --datadir=/usr/share/games/conquest --sysconfdir=/etc/conquest
+config.status: configure
+	dh_testdir
 
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-	$(checkdir)
-
-	# Add here commands to compile the package.
-	$(MAKE) all
-	#/usr/bin/docbook-to-man debian/conquest.sgml > conquest.6
-
-	touch build-stamp
-
-clean: checkroot
-	$(checkdir)
-	rm -f build-stamp configure-stamp config.cache config.status config.log
-	-$(MAKE) clean
-	rm -f Makefile
-
-	rm -f debian/*.substvars debian/files debian/*.debhelper debian/substvars
-	rm -rf debian/conquest debian/conquest-gl debian/conquest-libs debian/conquest-data debian/conquest-server autom4te.cache
-	find . -type f -a \( -name \#\*\# -o -name .\*\~ -o -name \*\~ -o -name DEADJOE -o -name \*.orig -o -name \*.rej -o -name \*.bak -o -name .\*.orig -o -name .\*.rej -o -name .SUMS -o -name TAGS -o -name core -o \( -path \*/.deps/\* -a -name \*.P \) \) -exec rm -f {} \;
-
-install: build checkroot
-	$(checkdir)
-	$(INSTALL_DIR) debian/conquest/usr/games \
-		       debian/conquest/usr/share/games/conquest \
-		       debian/conquest/usr/share/doc/conquest \
-		       debian/conquest/usr/share/menu \
-		       debian/conquest/usr/share/man/man6 \
-		       debian/conquest/DEBIAN
-
-	# Use CONQGROUP=root because conquest group won't be available
-	# until postinst
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/conquest \
-			INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
-			CONQGROUP=root
-	chmod 775 $(CURDIR)/debian/conquest/etc/conquest
-	chmod 644 $(CURDIR)/debian/conquest/usr/lib/lib*.so.*
-	chmod 755 $(CURDIR)/debian/conquest/usr/games/conquestd \
-		  $(CURDIR)/debian/conquest/usr/games/conqoper \
-		  $(CURDIR)/debian/conquest/usr/lib/games/conquest/conqdriv
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	strip --remove-section=.comment --remove-section=.note \
-		debian/conquest/usr/games/conquestd \
-		debian/conquest/usr/games/conqoper \
-		debian/conquest/usr/lib/games/conquest/conqdriv
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
 endif
-
-	rm $(CURDIR)/debian/conquest/usr/lib/lib*.la \
-	   $(CURDIR)/debian/conquest/usr/lib/lib*.so 
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install checkroot
-	$(checkdir)
-
-	$(INSTALL_FILE) conquest-8*.txt README debian/README.Debian \
-			debian/copyright \
-		        debian/conquest/usr/share/doc/conquest
-	$(INSTALL_FILE) debian/menu debian/conquest/usr/share/menu/conquest
-	$(INSTALL_FILE) debian/conqstrat.6 \
-			debian/conquest/usr/share/man/man6/
-	$(INSTALL_FILE) debian/changelog \
-			debian/conquest/usr/share/doc/conquest/changelog.Debian
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/conquest/usr/lib/libconquest.so.1.0.0
-	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/conquest/usr/lib/libconqserv.so.1.0.0
-	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/conquest/usr/lib/libconqclnt.so.1.0.0
-	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/conquest/usr/lib/libconqinit.so.1.0.0
-	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/conquest/usr/lib/libcqsound.so.1.0.0
-	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/conquest/usr/lib/libUi.so.1.0.0
-	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/conquest/usr/lib/libUiCU.so.1.0.0
-	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/conquest/usr/lib/libUiGL.so.1.0.0
-	strip --remove-section=.comment --remove-section=.note debian/conquest/usr/lib/games/conquest/conqdriv
-	strip --remove-section=.comment --remove-section=.note debian/conquest/usr/games/conquest
-	strip --remove-section=.comment --remove-section=.note debian/conquest/usr/games/conquestgl
-	strip --remove-section=.comment --remove-section=.note debian/conquest/usr/games/conqai
-	strip --remove-section=.comment --remove-section=.note debian/conquest/usr/games/conqoper
-	strip --remove-section=.comment --remove-section=.note debian/conquest/usr/games/conqstrat
-#	strip --strip-debug debian/conquest/usr/lib/libconquest.a
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
 endif
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+	--prefix=/usr --bindir=\$${prefix}/games \
+	--libdir=\$${prefix}/lib/games/conquest \
+	--mandir=\$${prefix}/share/man \
+	--infodir=\$${prefix}/share/info \
+	--localstatedir=/var/games \
+	--libexecdir=\$${prefix}/lib/games/conquest \
+	--datadir=\$${prefix}/share/games/conquest \
+	--sysconfdir=/etc/conquest
+	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
-	$(INSTALL_DIR) debian/conquest-gl/usr/games debian/conquest-gl/DEBIAN \
-		       debian/conquest-gl/usr/share/doc/conquest-gl \
-		       debian/conquest-gl/etc/conquest
-	mv debian/conquest/usr/games/conquestgl debian/conquest-gl/usr/games
-	mv debian/conquest/etc/conquest/texturesrc debian/conquest-gl/etc/conquest
-	mv debian/conquest/etc/conquest/00_plantex.trc debian/conquest-gl/etc/conquest
-	chmod 644 debian/conquest-gl/etc/conquest/texturesrc
-	chmod 644 debian/conquest-gl/etc/conquest/00_plantex.trc
-	$(INSTALL_FILE) debian/changelog \
-			debian/conquest-gl/usr/share/doc/conquest-gl/changelog.Debian
-	$(INSTALL_FILE) debian/copyright \
-		        debian/conquest-gl/usr/share/doc/conquest-gl
 
-	$(INSTALL_DIR) debian/conquest-data/usr/share/games \
-		       debian/conquest-data/DEBIAN \
-		       debian/conquest-data/usr/share/doc/conquest-data
-	mv debian/conquest/usr/share/games/conquest debian/conquest-data/usr/share/games
-	$(INSTALL_FILE) debian/changelog \
-			debian/conquest-data/usr/share/doc/conquest-data/changelog.Debian
-	$(INSTALL_FILE) debian/copyright \
-		        debian/conquest-data/usr/share/doc/conquest-data
+build: build-stamp
 
-	$(INSTALL_DIR) debian/conquest-libs/usr/lib \
-		       debian/conquest-libs/DEBIAN \
-	               debian/conquest-libs/var/games/conquest \
-		       debian/conquest-libs/etc/conquest \
-		       debian/conquest-libs/usr/share/doc/conquest-libs
-	$(INSTALL_FILE) debian/changelog \
-			debian/conquest-libs/usr/share/doc/conquest-libs/changelog.Debian
-	$(INSTALL_FILE) debian/copyright \
-		        debian/conquest-libs/usr/share/doc/conquest-libs
-	$(INSTALL_FILE) debian/shlibs debian/conquest-libs/DEBIAN/shlibs
+build-stamp:  patch config.status
+	dh_testdir
 
-	mv debian/conquest/usr/lib/lib* debian/conquest-libs/usr/lib/
+	$(MAKE) all
 
-	$(INSTALL_DIR) debian/conquest-server/usr/games \
-		       debian/conquest-server/usr/lib/games \
-		       debian/conquest-server/DEBIAN \
-		       debian/conquest-server/usr/share/man/man6 \
-		       debian/conquest-server/usr/share/doc/conquest-server
-	$(INSTALL_FILE) CONQINIT.TXT debian/conquest-server/usr/share/doc/conquest-server
-	$(INSTALL_FILE) debian/changelog \
-			debian/conquest-server/usr/share/doc/conquest-server/changelog.Debian
-	$(INSTALL_FILE) debian/copyright \
-		        debian/conquest-server/usr/share/doc/conquest-server
-	mv debian/conquest/usr/games/conquestd \
-	   debian/conquest/usr/games/conqoper \
-	   debian/conquest/usr/games/conqai \
-	   debian/conquest-server/usr/games/
+	touch $@
 
-	mv debian/conquest/usr/lib/games/conquest \
-	   debian/conquest-server/usr/lib/games
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
 
-	mv debian/conquest/usr/share/man/man6/conqai.6 \
-	   debian/conquest/usr/share/man/man6/conqoper.6 \
-	   debian/conquest/usr/share/man/man6/conquestd.6 \
-	   debian/conquest-server/usr/share/man/man6/
+	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -f config.sub config.guess
 
-	cd debian/conquest && gzip -9f usr/share/man/man6/*.6 usr/share/doc/conquest/README usr/share/doc/conquest/changelog.Debian
-	cd debian/conquest-server && gzip -9f usr/share/man/man6/*.6 usr/share/doc/conquest-server/changelog.Debian
-	cd debian/conquest-data && gzip -9f  usr/share/doc/conquest-data/changelog.Debian
-	cd debian/conquest-libs && gzip -9f  usr/share/doc/conquest-libs/changelog.Debian
-	cd debian/conquest-gl && gzip -9f usr/share/doc/conquest-gl/changelog.Debian
-	$(INSTALL_SCRIPT) debian/postinst debian/conquest/DEBIAN/postinst
-	$(INSTALL_SCRIPT) debian/postrm debian/conquest/DEBIAN/postrm
-	$(INSTALL_FILE) debian/conffiles debian/conquest/DEBIAN/conffiles
+	dh_clean 
 
-	$(INSTALL_SCRIPT) debian/conquest-server.postinst debian/conquest-server/DEBIAN/postinst
-	$(INSTALL_SCRIPT) debian/conquest-server.prerm debian/conquest-server/DEBIAN/prerm
-	$(INSTALL_SCRIPT) debian/conquest-server.postrm debian/conquest-server/DEBIAN/postrm
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
 
-	$(INSTALL_FILE) debian/conquest-gl.conffiles debian/conquest-gl/DEBIAN/conffiles
+	$(MAKE) install CONQGROUP=root DESTDIR=$(CURDIR)/debian/tmp
 
-	dpkg-shlibdeps -Tdebian/conquest.substvars \
-			 debian/conquest/usr/games/conquest \
-			 debian/conquest/usr/games/conqstrat
+	dh_install --sourcedir=debian/tmp --list-missing
 
-	dpkg-shlibdeps -Tdebian/conquest-gl.substvars \
-			 debian/conquest-gl/usr/games/conquestgl
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_link -i
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
-	dpkg-shlibdeps -Tdebian/conquest-libs.substvars \
-			 debian/conquest-libs/usr/lib/lib*.so.*
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installmenu -a
+	dh_installman -a
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
-	dpkg-shlibdeps -Tdebian/conquest-server.substvars \
-			 debian/conquest-server/usr/games/conquestd \
-			 debian/conquest-server/usr/lib/games/conquest/conqdriv \
-			 debian/conquest-server/usr/games/conqai \
-			 debian/conquest-server/usr/games/conqoper
-
-	dpkg-gencontrol -pconquest -ldebian/changelog -isp -Tdebian/conquest.substvars -Pdebian/conquest
-	chmod 644 debian/conquest/DEBIAN/control
-	chown 0.0 debian/conquest/DEBIAN/control
-	cd debian/conquest >/dev/null && find . -type f  ! -regex '.*/DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums
-	chmod 644 debian/conquest/DEBIAN/md5sums
-	chown 0.0 debian/conquest/DEBIAN/md5sums
-	dpkg-deb --build debian/conquest ..
-
-	dpkg-gencontrol -pconquest-gl -ldebian/changelog -isp -Tdebian/conquest-gl.substvars -Pdebian/conquest-gl
-	chmod 644 debian/conquest-gl/DEBIAN/control
-	chown 0.0 debian/conquest-gl/DEBIAN/control
-	cd debian/conquest-gl >/dev/null && find . -type f  ! -regex '.*/DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums
-	chmod 644 debian/conquest-gl/DEBIAN/md5sums
-	chown 0.0 debian/conquest-gl/DEBIAN/md5sums
-	dpkg-deb --build debian/conquest-gl ..
-
-	dpkg-gencontrol -pconquest-data -ldebian/changelog -isp -Tdebian/conquest-data.substvars -Pdebian/conquest-data
-	chmod 644 debian/conquest-data/DEBIAN/control
-	chown 0.0 debian/conquest-data/DEBIAN/control
-	cd debian/conquest-data >/dev/null && find . -type f  ! -regex '.*/DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums
-	chmod 644 debian/conquest-data/DEBIAN/md5sums
-	chown 0.0 debian/conquest-data/DEBIAN/md5sums
-	dpkg-deb --build debian/conquest-data ..
-
-	dpkg-gencontrol -pconquest-libs -ldebian/changelog -isp -Tdebian/conquest-libs.substvars -Pdebian/conquest-libs
-	chmod 644 debian/conquest-libs/DEBIAN/control
-	chown 0.0 debian/conquest-libs/DEBIAN/control
-	cd debian/conquest-libs >/dev/null && find . -type f  ! -regex '.*/DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums
-	chmod 644 debian/conquest-libs/DEBIAN/md5sums
-	chown 0.0 debian/conquest-libs/DEBIAN/md5sums
-	dpkg-deb --build debian/conquest-libs ..
-
-	dpkg-gencontrol -pconquest-server -ldebian/changelog -isp -Tdebian/conquest-server.substvars -Pdebian/conquest-server
-	chmod 644 debian/conquest-server/DEBIAN/control
-	chown 0.0 debian/conquest-server/DEBIAN/control
-	cd debian/conquest-server >/dev/null && find . -type f  ! -regex '.*/DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums
-	chmod 644 debian/conquest-server/DEBIAN/md5sums
-	chown 0.0 debian/conquest-server/DEBIAN/md5sums
-	dpkg-deb --build debian/conquest-server ..
-
-
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure checkroot
-
-define checkdir
-	test -f debian/rules
-endef
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
+.PHONY: build clean binary-indep binary-arch binary install 

Deleted: packages/trunk/conquest/debian/shlibs
===================================================================
--- packages/trunk/conquest/debian/shlibs	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/shlibs	2007-11-11 14:56:30 UTC (rev 4627)
@@ -1,8 +0,0 @@
-libUi           1    conquest-libs
-libUiCU         1    conquest-libs
-libUiGL         1    conquest-libs
-libconqclnt     1    conquest-libs
-libconqserv     1    conquest-libs
-libconquest     1    conquest-libs
-libconqinit     1    conquest-libs
-libcqsound	1    conquest-libs

Modified: packages/trunk/conquest/debian/watch
===================================================================
--- packages/trunk/conquest/debian/watch	2007-11-10 18:46:18 UTC (rev 4626)
+++ packages/trunk/conquest/debian/watch	2007-11-11 14:56:30 UTC (rev 4627)
@@ -1,4 +1,3 @@
-version=2
+version=3
 
-http://www.radscan.com/conquest.html \
-	conquest/conquest-([\d.]+[a-z]*)\.src\.tar\.gz debian uupdate
+http://sf.net/conq/conquest-([\d.]+)\.src\.tar\.gz

More information about the Pkg-games-commits mailing list