r12287 - packages/trunk/xbill/debian

[Paul Wise]

Author: pabs
Date: 2011-05-09 07:57:48 +0000 (Mon, 09 May 2011)
New Revision: 12287

Added:
   packages/trunk/xbill/debian/docs
Modified:
   packages/trunk/xbill/debian/changelog
   packages/trunk/xbill/debian/compat
   packages/trunk/xbill/debian/control
   packages/trunk/xbill/debian/rules
   packages/trunk/xbill/debian/xbill.install
Log:
Switch to debhelper 7 dh minimal rules file

Modified: packages/trunk/xbill/debian/changelog
===================================================================
--- packages/trunk/xbill/debian/changelog	2011-05-09 07:21:06 UTC (rev 12286)
+++ packages/trunk/xbill/debian/changelog	2011-05-09 07:57:48 UTC (rev 12287)
@@ -17,6 +17,7 @@
   * Clean up extra whitespace, patch headers and other cruft
   * Add misc:Depends to Depends in case it is used by debhelper
   * Drop conflicts on suidmanager, which was removed before sarge
+  * Switch to debhelper 7 dh minimal rules file
 
  -- Vincent Legout <vincent at legout.info>  Tue, 08 Dec 2009 10:03:17 +0800
 

Modified: packages/trunk/xbill/debian/compat
===================================================================
--- packages/trunk/xbill/debian/compat	2011-05-09 07:21:06 UTC (rev 12286)
+++ packages/trunk/xbill/debian/compat	2011-05-09 07:57:48 UTC (rev 12287)
@@ -1 +1 @@
-5
+7

Modified: packages/trunk/xbill/debian/control
===================================================================
--- packages/trunk/xbill/debian/control	2011-05-09 07:21:06 UTC (rev 12286)
+++ packages/trunk/xbill/debian/control	2011-05-09 07:57:48 UTC (rev 12287)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bddebian at comcast.net>
-Build-Depends: debhelper (>= 5.0.0), libxaw7-dev
+Build-Depends: debhelper (>= 7.0.50~), libxaw7-dev
 Standards-Version: 3.7.3
 Homepage: http://www.xbill.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/xbill/

Added: packages/trunk/xbill/debian/docs
===================================================================
--- packages/trunk/xbill/debian/docs	                        (rev 0)
+++ packages/trunk/xbill/debian/docs	2011-05-09 07:57:48 UTC (rev 12287)
@@ -0,0 +1 @@
+README*

Modified: packages/trunk/xbill/debian/rules
===================================================================
--- packages/trunk/xbill/debian/rules	2011-05-09 07:21:06 UTC (rev 12286)
+++ packages/trunk/xbill/debian/rules	2011-05-09 07:57:48 UTC (rev 12287)
@@ -1,58 +1,17 @@
 #!/usr/bin/make -f
 
-# If compilation fails with:
-# /bin/sh: -c: line 1: syntax error near unexpected token `done'
-# then edit /usr/lib/X11/config/Imake.rules and add the ; to line 2329:
-#     set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i); fi; \@@\
-
-export DH_VERBOSE=1
 DEB=debian/tmp
 SCORES=$(DEB)/var/games/xbill.scores.default
 
-build:	build-stamp
+%:
+	dh $@ --parallel
 
-build-stamp:
-	dh_testdir
-	# gtk and setgid requires score-wrapper program
-	#./configure --prefix=/usr --enable-gtk
-	./configure --prefix=/usr --bindir=\$${prefix}/games \
-		--disable-gtk --disable-motif --enable-athena
-	$(MAKE) LOCAL_LDFLAGS=-s
-	touch build-stamp
+override_dh_auto_configure:
+	dh_auto_configure -- --bindir=\$${prefix}/games --disable-gtk --disable-motif --enable-athena
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) -i clean
-	[ ! -f Makefile ] || $(MAKE) -i distclean
-	dh_clean
-
-binary-indep:	build
-
-binary-arch:	build
-	dh_testdir
-	dh_testroot
-	dh_clean
-
-	DESTDIR=$(DEB) make install
-	dh_install
-
-	dh_installdocs README*
-	dh_installmenu
-	dh_installchangelogs ChangeLog
-	dh_compress
+override_dh_fixperms:
 	dh_fixperms
 	chown root:games $(CURDIR)/debian/xbill/usr/games/xbill
 	chown root:games $(CURDIR)/debian/xbill/var/games/xbill.scores.default
 	chmod 2755 $(CURDIR)/debian/xbill/usr/games/xbill
 	chmod 0664 $(CURDIR)/debian/xbill/var/games/xbill.scores.default
-	dh_strip
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary

Modified: packages/trunk/xbill/debian/xbill.install
===================================================================
--- packages/trunk/xbill/debian/xbill.install	2011-05-09 07:21:06 UTC (rev 12286)
+++ packages/trunk/xbill/debian/xbill.install	2011-05-09 07:57:48 UTC (rev 12287)
@@ -1,5 +1,2 @@
-debian/tmp/usr/games/* usr/games/
-debian/tmp/usr/share/* usr/share/
-debian/tmp/var/games/* var/games/
 debian/xbill.xpm usr/share/pixmaps/
 debian/xbill.desktop usr/share/applications/