r11878 - in packages/trunk/blockattack/debian: . patches

[Paul Wise]

Author: pabs
Date: 2011-03-10 09:23:49 +0000 (Thu, 10 Mar 2011)
New Revision: 11878

Added:
   packages/trunk/blockattack/debian/clean
   packages/trunk/blockattack/debian/docs
   packages/trunk/blockattack/debian/patches/fix-scons-paths.patch
Removed:
   packages/trunk/blockattack/debian/dirs
   packages/trunk/blockattack/debian/install
Modified:
   packages/trunk/blockattack/debian/changelog
   packages/trunk/blockattack/debian/compat
   packages/trunk/blockattack/debian/control
   packages/trunk/blockattack/debian/patches/series
   packages/trunk/blockattack/debian/rules
Log:
Switch to debhelper 7 dh tiny rules

Modified: packages/trunk/blockattack/debian/changelog
===================================================================
--- packages/trunk/blockattack/debian/changelog	2011-03-10 08:48:58 UTC (rev 11877)
+++ packages/trunk/blockattack/debian/changelog	2011-03-10 09:23:49 UTC (rev 11878)
@@ -7,6 +7,7 @@
     - 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
 

Added: packages/trunk/blockattack/debian/clean
===================================================================
--- packages/trunk/blockattack/debian/clean	                        (rev 0)
+++ packages/trunk/blockattack/debian/clean	2011-03-10 09:23:49 UTC (rev 11878)
@@ -0,0 +1,3 @@
+.sconsign.dblite
+man/blockattack.6.gz
+blockattack.desktop

Modified: packages/trunk/blockattack/debian/compat
===================================================================
--- packages/trunk/blockattack/debian/compat	2011-03-10 08:48:58 UTC (rev 11877)
+++ packages/trunk/blockattack/debian/compat	2011-03-10 09:23:49 UTC (rev 11878)
@@ -1 +1 @@
-5
+7

Modified: packages/trunk/blockattack/debian/control
===================================================================
--- packages/trunk/blockattack/debian/control	2011-03-10 08:48:58 UTC (rev 11877)
+++ packages/trunk/blockattack/debian/control	2011-03-10 09:23:49 UTC (rev 11878)
@@ -3,7 +3,7 @@
 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

Deleted: packages/trunk/blockattack/debian/dirs
===================================================================
--- packages/trunk/blockattack/debian/dirs	2011-03-10 08:48:58 UTC (rev 11877)
+++ packages/trunk/blockattack/debian/dirs	2011-03-10 09:23:49 UTC (rev 11878)
@@ -1 +0,0 @@
-usr/share/applications

Added: packages/trunk/blockattack/debian/docs
===================================================================
--- packages/trunk/blockattack/debian/docs	                        (rev 0)
+++ packages/trunk/blockattack/debian/docs	2011-03-10 09:23:49 UTC (rev 11878)
@@ -0,0 +1,3 @@
+README
+AUTHORS
+block_attack_manual.pdf

Deleted: packages/trunk/blockattack/debian/install
===================================================================
--- packages/trunk/blockattack/debian/install	2011-03-10 08:48:58 UTC (rev 11877)
+++ packages/trunk/blockattack/debian/install	2011-03-10 09:23:49 UTC (rev 11878)
@@ -1 +0,0 @@
-debian/blockattack.desktop usr/share/applications

Added: packages/trunk/blockattack/debian/patches/fix-scons-paths.patch
===================================================================
--- packages/trunk/blockattack/debian/patches/fix-scons-paths.patch	                        (rev 0)
+++ packages/trunk/blockattack/debian/patches/fix-scons-paths.patch	2011-03-10 09:23:49 UTC (rev 11878)
@@ -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'])
+ 

Modified: packages/trunk/blockattack/debian/patches/series
===================================================================
--- packages/trunk/blockattack/debian/patches/series	2011-03-10 08:48:58 UTC (rev 11877)
+++ packages/trunk/blockattack/debian/patches/series	2011-03-10 09:23:49 UTC (rev 11878)
@@ -1 +1,2 @@
 gcc44.diff
+fix-scons-paths.patch

Modified: packages/trunk/blockattack/debian/rules
===================================================================
--- packages/trunk/blockattack/debian/rules	2011-03-10 08:48:58 UTC (rev 11877)
+++ packages/trunk/blockattack/debian/rules	2011-03-10 09:23:49 UTC (rev 11878)
@@ -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