r11784 - packages/trunk/warzone2100/debian

[Paul Wise]

Author: pabs
Date: 2011-02-18 15:16:31 +0000 (Fri, 18 Feb 2011)
New Revision: 11784

Added:
   packages/trunk/warzone2100/debian/warzone2100.manpages
Modified:
   packages/trunk/warzone2100/debian/changelog
   packages/trunk/warzone2100/debian/control
   packages/trunk/warzone2100/debian/rules
Log:
Switch to dh from debhelper 7

Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog	2011-02-18 14:31:00 UTC (rev 11783)
+++ packages/trunk/warzone2100/debian/changelog	2011-02-18 15:16:31 UTC (rev 11784)
@@ -3,6 +3,7 @@
   * New upstream release
     - No longer ignores armor (Closes: #606402)
   * Set the distributor based on the build distribution
+  * Switch to dh from debhelper 7
 
  -- Paul Wise <pabs at debian.org>  Tue, 08 Feb 2011 19:52:51 +0800
 

Modified: packages/trunk/warzone2100/debian/control
===================================================================
--- packages/trunk/warzone2100/debian/control	2011-02-18 14:31:00 UTC (rev 11783)
+++ packages/trunk/warzone2100/debian/control	2011-02-18 15:16:31 UTC (rev 11784)
@@ -5,7 +5,8 @@
 Uploaders: Paul Wise <pabs at debian.org>,
  Bradley Smith <bradsmith at debian.org>,
  Christoph Egger <christoph at debian.org>
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 7.0.50~),
+ autotools-dev,
  bison,
  flex (>= 2.5.35~) | flex (<< 2.5.34~), flex (>= 2.5.33~),
  libopenal-dev,

Modified: packages/trunk/warzone2100/debian/rules
===================================================================
--- packages/trunk/warzone2100/debian/rules	2011-02-18 14:31:00 UTC (rev 11783)
+++ packages/trunk/warzone2100/debian/rules	2011-02-18 15:16:31 UTC (rev 11784)
@@ -2,137 +2,19 @@
 
 #export DH_VERBOSE=1
 
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+%:
+	dh --parallel --with autotools_dev $@
 
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-	CROSS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-	CROSS = --build $(DEB_BUILD_GNU_TYPE)
-endif
-
-CFLAGS  = -Wall -g
-LDFLAGS = -Wl,-z,defs
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-
-# Configure the package
-# -------------------------------------
-configure: config.status
-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
+override_dh_auto_configure:
 	# Remove GLee embedded code copy so we never use it
 	rm -f lib/ivis_opengl/GLee.c lib/ivis_opengl/GLee.h
-	./configure \
-	    CFLAGS="$(CFLAGS)" \
-	    LDFLAGS="$(LDFLAGS)" \
-	    $(CROSS) \
-	    --prefix=/usr \
+	dh_auto_configure -- \
 	    --bindir=\$${prefix}/games \
 	    --datadir=\$${prefix}/share/games \
-	    --mandir=\$${prefix}/share/man \
 	    --with-icondir=\$${prefix}/share/icons/hicolor/128x128/apps \
 	    --with-applicationdir=\$${prefix}/share/applications \
 	    --with-distributor="$(shell dpkg-vendor --query vendor)" \
 	    --disable-debug
-# -------------------------------------
 
-
-# Compile the source
-# -------------------------------------
-build: build-stamp 
-
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	touch $@
-# -------------------------------------
-
-
-# Clean source directory
-# -------------------------------------
-clean: clean-really
-
-clean-really:
-	dh_testdir
-	dh_testroot
-	dh_clean
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	-mv -f backup/*.po po/
-#	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
-# -------------------------------------
-
-
-# Install all files
-# -------------------------------------
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	rm -rf debian/tmp/usr/share/doc/warzone2100
-# -------------------------------------
-
-
-# Build architecture-independent files
-# -------------------------------------
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdirs -i
-	dh_install -i --sourcedir=debian/tmp --list-missing
-	dh_installchangelogs -i ChangeLog
-	dh_installdocs -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-# -------------------------------------
-
-
-# Build architecture-dependent files
-# -------------------------------------
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdirs -a
-	dh_install -a --sourcedir=debian/tmp --list-missing
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
-	dh_installmenu -a
-	dh_icons -a
-	dh_installman -a debian/warzone2100.6
-	dh_strip -a --dbg-package=warzone2100-dbg
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-# -------------------------------------
-
-
-binary: binary-indep binary-arch
-.PHONY: configure build clean clean-really binary-indep binary-arch binary install
+override_dh_strip:
+	dh_strip --dbg-package=warzone2100-dbg

Added: packages/trunk/warzone2100/debian/warzone2100.manpages
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100.manpages	                        (rev 0)
+++ packages/trunk/warzone2100/debian/warzone2100.manpages	2011-02-18 15:16:31 UTC (rev 11784)
@@ -0,0 +1 @@
+debian/warzone2100.6