r11501 - packages/trunk/fenix/debian

[Peter Pentchev]

Author: roam-guest
Date: 2010-11-25 23:06:37 +0000 (Thu, 25 Nov 2010)
New Revision: 11501

Modified:
   packages/trunk/fenix/debian/changelog
   packages/trunk/fenix/debian/control
   packages/trunk/fenix/debian/rules
Log:
Use debhelper override rules.


Modified: packages/trunk/fenix/debian/changelog
===================================================================
--- packages/trunk/fenix/debian/changelog	2010-11-25 22:49:25 UTC (rev 11500)
+++ packages/trunk/fenix/debian/changelog	2010-11-25 23:06:37 UTC (rev 11501)
@@ -19,6 +19,7 @@
   * Bump the debhelper compatibility level to 7:
     - shorten the rules file using the dh(1) helper
     - use "dh --with autotools_dev" to handle config.guess and config.sub
+    - use debhelper override rules
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 25 Nov 2010 13:25:18 +0200
 

Modified: packages/trunk/fenix/debian/control
===================================================================
--- packages/trunk/fenix/debian/control	2010-11-25 22:49:25 UTC (rev 11500)
+++ packages/trunk/fenix/debian/control	2010-11-25 23:06:37 UTC (rev 11501)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 7.0.8), autotools-dev (>= 20100122.1~),
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 7.0.50~), autotools-dev (>= 20100122.1~),
  libsdl1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev, libgif-dev, libpng12-dev,
  libsmpeg-dev, libmikmod2-dev, libvorbis-dev
 Standards-Version: 3.9.1

Modified: packages/trunk/fenix/debian/rules
===================================================================
--- packages/trunk/fenix/debian/rules	2010-11-25 22:49:25 UTC (rev 11500)
+++ packages/trunk/fenix/debian/rules	2010-11-25 23:06:37 UTC (rev 11501)
@@ -16,9 +16,7 @@
 
 CFLAGS += -DUSE_GETTEXT
 
-build: build-stamp
-build-stamp:  configure
-	dh build --before auto_configure --with autotools_dev
+override_dh_auto_configure:
 	chmod +x configure
 	dh_auto_configure -- \
 		--enable-fxc \
@@ -28,20 +26,16 @@
 		--enable-dependency-tracking \
 		CFLAGS="$(CFLAGS)" \
 		LDFLAGS="-Wl,-z,defs"
-	dh build --before auto_build
+
+override_dh_auto_build:
 	dh_auto_build -- CFLAGS="$(CFLAGS)"
 	$(MAKE) -C debian/i18n
-	dh build --remaining
-	touch $@
 
-clean:
-	dh clean --before auto_clean
+override_dh_auto_clean:
 	dh_auto_clean
 	$(MAKE) -C debian/i18n clean
-	dh clean --remaining --with autotools_dev
 
-install: build
-	dh $@ --before auto_install
+override_dh_auto_install:
 	dh_auto_install
 	cd $(CURDIR)/debian/tmp/usr/bin/ && \
 		for f in *; do \
@@ -50,23 +44,21 @@
 	$(MAKE) -C debian/i18n install INSTALLPREFIX=$(CURDIR)/debian/tmp/usr/share/locale/
 	cp debian/fenix.sh $(CURDIR)/debian/tmp/usr/bin/fenix
 	chmod +x $(CURDIR)/debian/tmp/usr/bin/fenix
+
+override_dh_install:
 	dh_install
 	cd $(CURDIR)/debian/fenix-dev && patch -p1 < $(CURDIR)/debian/patches/headers.patch
+
+override_dh_installdocs:
 	dh_installdocs --exclude=license.txt --exclude=authors.txt
+
+override_dh_installchangelogs:
 	dh_installchangelogs NEWS
-	dh $@ --before compress
+
+override_dh_compress:
 	for i in debian/fenix/usr/share/doc/fenix/*.txt; do gzip $$i; done
 	dh_compress
-	dh $@ --remaining
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh $@
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh $@
-
 get-orig-source:
 	dh_testdir
 	dh_testroot
@@ -77,5 +69,5 @@
 	tar cvfz ../fenix_0.92a.dfsg1.orig.tar.gz Fenix/*
 	rm -rf Fenix fenix092a-src-release.tgz
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install get-orig-source
+%:
+	dh $@ --with autotools_dev