r9571 - in packages/branches/xmahjongg/lenny: . debian

[Peter Pentchev]

Author: roam-guest
Date: 2009-04-14 09:17:28 +0000 (Tue, 14 Apr 2009)
New Revision: 9571

Modified:
   packages/branches/xmahjongg/lenny/
   packages/branches/xmahjongg/lenny/debian/changelog
   packages/branches/xmahjongg/lenny/debian/compat
   packages/branches/xmahjongg/lenny/debian/control
   packages/branches/xmahjongg/lenny/debian/rules
Log:
Merge trunk rev. 9339 and 9340:
  Bump the debhelper compatibility level to 7:
  - specify a version in the debhelper build-dep
  - use dh_prep instead of dh_clean -k
  
  This is intentionally done separately from the bump to level 5 to allow
  easier backporting to etch.
........
  Shorten the rules file using debhelper 7's dh tool.



Property changes on: packages/branches/xmahjongg/lenny
___________________________________________________________________
Modified: svnmerge-integrated
   - /packages/trunk/xmahjongg:1-9338
   + /packages/trunk/xmahjongg:1-9340

Modified: packages/branches/xmahjongg/lenny/debian/changelog
===================================================================
--- packages/branches/xmahjongg/lenny/debian/changelog	2009-04-14 09:03:41 UTC (rev 9570)
+++ packages/branches/xmahjongg/lenny/debian/changelog	2009-04-14 09:17:28 UTC (rev 9571)
@@ -8,12 +8,14 @@
   * Add the Homepage, Vcs-Svn, and Vcs-Browser fields.
   * Flesh out the long description a bit.
   * Replace the obsolete x-dev dependency with x11proto-core-dev.
-  * Specify the debhelper compatibility level as 5:
+  * Specify the debhelper compatibility level as 7:
     - install into debian/xmahjongg instead of debian/tmp
     - add misc:Depends to the xmahjongg binary package
+    - specify the debhelper version in the build dependency
   * Use dh_installman instead of the deprecated dh_installmanpages.
   * Bump Standards-Version to 3.8.1:
     - add the README.source file mentioning the use of quilt
+  * Shorten the rules file using debhelper 7's dh helper.
 
  -- Peter Pentchev <roam at ringlet.net>  Tue, 31 Mar 2009 17:19:37 +0300
 

Modified: packages/branches/xmahjongg/lenny/debian/compat
===================================================================
--- packages/branches/xmahjongg/lenny/debian/compat	2009-04-14 09:03:41 UTC (rev 9570)
+++ packages/branches/xmahjongg/lenny/debian/compat	2009-04-14 09:17:28 UTC (rev 9571)
@@ -1 +1 @@
-5
+7

Modified: packages/branches/xmahjongg/lenny/debian/control
===================================================================
--- packages/branches/xmahjongg/lenny/debian/control	2009-04-14 09:03:41 UTC (rev 9570)
+++ packages/branches/xmahjongg/lenny/debian/control	2009-04-14 09:17:28 UTC (rev 9571)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter Pentchev <roam at ringlet.net>
 Standards-Version: 3.8.1
-Build-Depends: debhelper (>= 5), libx11-dev, x11proto-core-dev, quilt
+Build-Depends: debhelper (>= 7), libx11-dev, x11proto-core-dev, quilt
 Homepage: http://www.lcdf.org/xmahjongg/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/xmahjongg
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/xmahjongg/?op=log

Modified: packages/branches/xmahjongg/lenny/debian/rules
===================================================================
--- packages/branches/xmahjongg/lenny/debian/rules	2009-04-14 09:03:41 UTC (rev 9570)
+++ packages/branches/xmahjongg/lenny/debian/rules	2009-04-14 09:17:28 UTC (rev 9571)
@@ -13,37 +13,24 @@
 
 build: build-stamp
 build-stamp:	${QUILT_STAMPFN}
-	dh_testdir
-
+	dh build --before auto_configure
 	./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/games
 	# Avoid rebuilding config.h.in
 	touch config.h.in
-	# Add here commands to compile the package.
-	$(MAKE) 
-
+	dh build --after auto_configure
 	touch build-stamp
 
 clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp install-stamp
-
-	# Add here commands to clean up after the build process.
+	dh $@ --before auto_clean
 	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
+	dh $@ --after auto_clean
 	${MAKE} -f debian/rules unpatch
 
 install: install-stamp
 install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/xmahjongg.
+	dh install --before auto_install
 	$(MAKE) install prefix=$D/usr bindir=$D/usr/games mandir=$D/usr/share/man datadir=$D/usr/share/games
-
+	dh install --after auto_install
 	touch install-stamp
 
 # Build architecture-independent files here.
@@ -52,30 +39,7 @@
 
 # Build architecture-dependent files here.
 binary-arch: build install
-#	dh_testversion
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-#	dh_installemacsen
-#	dh_installinit
-	dh_installcron
-	dh_installman
-#	dh_undocumented
-	dh_installchangelogs 
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-#	dh_makeshlibs
-	dh_md5sums
-	dh_builddeb
+	dh $@
 
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary