[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn2224-1-7-ga98017e

[Simon McVittie]

The following commit has been merged in the master branch:
commit 9e3d74df19e7ecb56c3b8303df8dd9073742630b
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Mar 31 22:14:45 2012 +0100

    Use default.mk from dpkg-dev >= 1.16.1

diff --git a/debian/changelog b/debian/changelog
index 321a0f1..77e69f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ioquake3 (1.36+svn2224-3) UNRELEASED; urgency=low
   * Merge from experimental
   * Back out the patch that changes colour handling in the console:
     misleading for non-OpenArena, only minor impact for OpenArena
+  * Use default.mk from dpkg-dev >= 1.16.1
 
  -- Simon McVittie <smcv at debian.org>  Sat, 31 Mar 2012 17:07:30 +0100
 
diff --git a/debian/control b/debian/control
index c03e178..0b33ae8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>,
            Simon McVittie <smcv at debian.org>
 Build-Depends: debhelper (>= 9),
+               dpkg-dev (>= 1.16.1),
                libcurl4-gnutls-dev,
                libjpeg8-dev,
                libopenal-dev,
diff --git a/debian/rules b/debian/rules
index 360599e..caa1f76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,18 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    MAKEFLAGS += -j$(NUMJOBS)
-endif
+include /usr/share/dpkg/default.mk
 
 Q3ARCH             := $(shell $(CURDIR)/debian/q3arch arch     HOST)
 Q3PLATFORM         := $(shell $(CURDIR)/debian/q3arch platform HOST)
 Q3COMPILE_ARCH     := $(shell $(CURDIR)/debian/q3arch arch     BUILD)
 Q3COMPILE_PLATFORM := $(shell $(CURDIR)/debian/q3arch platform BUILD)
 distro             := $(shell lsb_release -is)
-debian_version     := $(shell dpkg-parsechangelog -c1 | sed -ne 's/^Version: //p')
 
 CFLAGS += -fsigned-char -DWITH_OPENARENA
 
 %:
-	dh $@
+	dh $@ --parallel
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 TARGET = release
@@ -25,7 +21,8 @@ TARGET = debug
 endif
 
 override_dh_auto_build:
-	$(MAKE) \
+	dh_auto_build \
+		-- \
 		BR=build \
 		BD=build \
 		V=1 \
@@ -47,7 +44,7 @@ override_dh_auto_build:
 		DEFAULT_BASEDIR=/usr/lib/ioquake3 \
 		BUILD_GAME_SO=1 \
 		BUILD_GAME_QVM=0 \
-		VERSION=$(debian_version)/$(distro) \
+		VERSION=$(DEB_VERSION)/$(distro) \
 		CFLAGS="$(CFLAGS)" \
 		$(TARGET)
 	install build/ioq3ded.* build/ioq3ded

-- 
Quake 3 engine