[SCM] Packaging for scorched3d branch, master, updated. debian/43.2a.dfsg-6-13-gc06df20

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit 857541912b497ff848db29385814a9ba271b57cf
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Wed Feb 8 13:30:10 2012 -0500

    update to debhelper compat level 9

diff --git a/debian/changelog b/debian/changelog
index f95a8e8..ec941bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ scorched3d (43.3+dfsg-1) precise; urgency=low
   * new upstream release
   * added myself as an uploader
   * refreshed debian/patches/01-openal-pkgconfig.diff
+  * update to debhelper compat level 9
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Wed, 08 Feb 2012 13:06:12 -0500
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Wed, 08 Feb 2012 13:16:38 -0500
 
 scorched3d (43.2a.dfsg-6) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index b5c5ee8..10aa33e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,8 @@ Uploaders: Reinhard Tartler <siretart at tauware.de>,
            Bruno "Fuddl" Kleinert <fuddl at debian.org>,
            Gonéri Le Bouder <goneri at rulezlan.org>,
            Stephen M. Webb <stephen.webb at bregmasoft.ca>
-Build-Depends: autoconf,
-               automake,
-               binutils,
-               debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
                gawk,
                libalut-dev,
                libexpat1-dev,
diff --git a/debian/rules b/debian/rules
index 2ecf19b..a6b4945 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  MAKEFLAGS += -j$(NUMJOBS)
-endif
+	dh $@ --parallel --with autoreconf
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -22,7 +17,6 @@ else
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-confflags += --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
 confflags += --prefix=/usr --bindir=\$${prefix}/games
 confflags += --datadir=\$${prefix}/share/games/scorched3d
 confflags += --with-docdir=/usr/share/doc/scorched3d
@@ -31,17 +25,6 @@ confflags += --infodir=\$${prefix}/share/info
 
 CFLAGS += -Wall
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-$(info Disable all  optimisations)
-  CFLAGS += -O0
-else
-  CFLAGS += -O2
-endif
-
-# We want parallel builds (dh_build always does -j1)
-override_dh_auto_build:
-	$(MAKE)
-
 override_dh_auto_configure:
 	# Upstream ships non-DFSG icons, so we replace them
 	mkdir -p data/avatars
@@ -49,13 +32,10 @@ override_dh_auto_configure:
 	sh ./autogen.sh $(confflags) AWK=gawk
 
 override_dh_auto_clean:
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f	src/client/scorchedc/Makefile.am \
-		src/launcher/scorched/Makefile.am \
-		src/server/scorcheds/Makefile.am
 	rm -f data/fonts/test.ttf
 	rm -f config.log config.status
 	rm -rf data/avatars debian/avatars-svg/*.png
+	dh_auto_clean
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz

-- 
Packaging for scorched3d