[blockattack] 58/88: Switch to debhelper 7 dh tiny rules

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository blockattack.

commit 0b9d2d2548a19978b765e0d3f5d1027592a6d63d
Author: Paul Wise <pabs at debian.org>
Date:   Thu Mar 10 09:23:49 2011 +0000

    Switch to debhelper 7 dh tiny rules
---
 debian/changelog                     |  1 +
 debian/clean                         |  3 +++
 debian/compat                        |  2 +-
 debian/control                       |  2 +-
 debian/dirs                          |  1 -
 debian/docs                          |  3 +++
 debian/install                       |  1 -
 debian/patches/fix-scons-paths.patch | 12 +++++++++
 debian/patches/series                |  1 +
 debian/rules                         | 51 +++++++-----------------------------
 10 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db901ae..041f357 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ blockattack (1.4.1-1) UNRELEASED; urgency=low
     - Re-add desktop file dropped upstream
   * Clean up watch file
   * Switch to dpkg-source v3
+  * Switch to debhelper 7 dh tiny rules
 
  -- Paul Wise <pabs at debian.org>  Thu, 10 Mar 2011 15:33:15 +0800
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..3145870
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+.sconsign.dblite
+man/blockattack.6.gz
+blockattack.desktop
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 53befc5..4a89f7a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Cyril Brulebois <kibi at debian.org>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5.0.0), docbook-to-man, libsdl-mixer1.2-dev,
+Build-Depends: debhelper (>= 7.0.50~), docbook-to-man, libsdl-mixer1.2-dev,
  libsdl-image1.2-dev, libsdl1.2-dev, libenet-dev (>= 1.2-3), scons
 Standards-Version: 3.8.2
 Homepage: http://blockattack.sf.net
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 9ecda26..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/applications
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..1fa857e
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+README
+AUTHORS
+block_attack_manual.pdf
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 9857289..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/blockattack.desktop usr/share/applications
diff --git a/debian/patches/fix-scons-paths.patch b/debian/patches/fix-scons-paths.patch
new file mode 100644
index 0000000..ce14939
--- /dev/null
+++ b/debian/patches/fix-scons-paths.patch
@@ -0,0 +1,12 @@
+--- a/Game/SConscript
++++ b/Game/SConscript
+@@ -8,7 +8,7 @@
+ env.Alias('install',['$destdir/$sharedir'])
+ 
+ env.Install ('$destdir/$sharedir/res/',[
+-'res/testPuzzles',
+-'res/puzzle.levels'])
++'puzzles/testPuzzles',
++'puzzles/puzzle.levels'])
+ env.Alias('install', ['$destdir/$sharedir/res'])
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b79e912..84ea6fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 gcc44.diff
+fix-scons-paths.patch
diff --git a/debian/rules b/debian/rules
index 5c7cb95..1366144 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,55 +1,22 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
+
 #export DH_VERBOSE=1
 
+%:
+	dh $@
 
-build: build-stamp
-build-stamp:
-	dh_testdir
+override_dh_auto_build:
+	cd man ; docbook-to-man blockattack.sgml | gzip -9 > blockattack.6.gz
+	cp debian/blockattack.desktop .
 	scons prefix=/usr sharedir=/usr/share/games/blockattack
-	touch build-stamp
 
-clean:
-	dh_testdir
+override_dh_auto_clean:
 	scons -c
-	rm -f .sconsign.dblite build-stamp
-
-	rm -rf .pc
-	rm -f enet-1.0/config.status
-	rm -f enet-1.0/config.log
-
-	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
+override_dh_auto_install:
 	dh_installdirs
 	find Game -type f -exec chmod 644 {} \;
 	scons prefix=/usr bindir=/usr/games mandir=/usr/share/man sharedir=/usr/share/games/blockattack destdir=$(CURDIR)/debian/blockattack install
 
-	#Remove Windows Thumbnail database.
-	rm -f $(CURDIR)/debian/blockattack/usr/share/games/blockattack/gfx/Thumbs.db
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_install
+override_dh_installchangelogs:
 	dh_installchangelogs changelog*
-	dh_installdocs README AUTHORS block_attack_manual.pdf
-	dh_installman
-	dh_installmenu
-	dh_link
-	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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/blockattack.git