[SCM] Packaging for sauerbraten game engine branch, master, updated. upstream/0.0.20100728.dfsg-53-g7e807bc

Bruno Kleinert fuddl at tauware.de
Fri Jun 3 17:04:19 UTC 2011


The following commit has been merged in the master branch:
commit 7e807bcd30a408fa492cc623bac596bdf6b41ccb
Author: Bruno Kleinert <fuddl at tauware.de>
Date:   Fri Jun 3 19:03:57 2011 +0200

    Use debhelper 8
    
    Build-depend on debhelper >= 8
    
    Rewrite debian/rules.

diff --git a/debian/changelog b/debian/changelog
index a87e73e..4a71a8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ sauerbraten (0.0.20100728.dfsg-5) unstable; urgency=low
   * Update to standards version 3.9.2. No changes.
   * Don't mess with users' PATH environment in sauerbraten.desktop. Instead
     call /usr/games/sauerbraten directly
+  * Use debhelper 8 to build the package
+    * Build-depend on debhelper (>= 8)
+    * Rewrite debian/rules
 
- -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Fri, 03 Jun 2011 16:18:53 +0200
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Fri, 03 Jun 2011 19:03:03 +0200
 
 sauerbraten (0.0.20100728.dfsg-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 510c7ef..3de42ad 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: contrib/games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 8),
                libsdl1.2-dev,
                libsdl-image1.2-dev,
                libsdl-mixer1.2-dev,
diff --git a/debian/rules b/debian/rules
index 7679e9c..da997f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
+%:
+	dh $@
+
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -9,59 +12,27 @@ else
 	CXXFLAGS += -g -O2 -fomit-frame-pointer
 endif
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    MAKEFLAGS += -j$(NUMJOBS)
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-
-build: build-stamp
-build-stamp:
-	dh_testdir
+override_dh_auto_build:
 	convert debian/sauerbraten.png debian/sauerbraten.xpm
 	$(MAKE) CXXFLAGS="$(CXXFLAGS)"
-	touch $@
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
+override_dh_auto_clean:
 	$(MAKE) clean
 	rm -f debian/sauerbraten.xpm
-	dh_clean 
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	dh_install
-
-binary-indep: build install
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	# Uhm... yes, it's a hack to strip \.dfsg.* from the version...
-	# Improvements appreciated! It's used by dh_gencontrol
-	echo "sauerbraten-data-ver=`head -n1 debian/changelog | egrep -o '\(.*\)' | sed -e 's/(//' | sed -e 's/\.dfsg.*//'`" \
-			>> debian/sauerbraten.substvars
-	dh_installdocs
+override_dh_auto_binary-arch:
 	dh_installdocs --all debian/README.Debian
 	dh_installdocs -psauerbraten debian/NEWS.Debian
-	dh_install
-	dh_installmenu
-	dh_installman
-	dh_icons
-	dh_link
 	dh_strip -psauerbraten --dbg-package=sauerbraten-dbg
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_install:
+	# This override target must not be removed (even it empty!) to stop dh
+	# from trying upstream's broken install target.
+	# Uhm... yes, it's a hack to strip \.dfsg.* from the version string...
+	# Improvements appreciated! It's used by dh_gencontrol
+	echo "sauerbraten-data-ver=`head -n1 debian/changelog | egrep -o '\(.*\)' | sed -e 's/(//' | sed -e 's/\.dfsg.*//'`" \
+		>> debian/sauerbraten.substvars

-- 
Packaging for sauerbraten game engine



More information about the Pkg-games-commits mailing list