r11512 - packages/trunk/fenix-plugins/debian

[Peter Pentchev]

Author: roam-guest
Date: 2010-11-26 10:03:30 +0000 (Fri, 26 Nov 2010)
New Revision: 11512

Modified:
   packages/trunk/fenix-plugins/debian/changelog
   packages/trunk/fenix-plugins/debian/rules
Log:
Shorten the rules file using the dh(1) helper.


Modified: packages/trunk/fenix-plugins/debian/changelog
===================================================================
--- packages/trunk/fenix-plugins/debian/changelog	2010-11-26 09:00:28 UTC (rev 11511)
+++ packages/trunk/fenix-plugins/debian/changelog	2010-11-26 10:03:30 UTC (rev 11512)
@@ -1,6 +1,6 @@
 fenix-plugins (0.0.20070803-4) UNRELEASED; urgency=low
 
-  TODO: debhelper: dh, overrides, then 8
+  TODO: debhelper: overrides, then 8
   TODO: dh --with autotools_dev
   TODO: dpkg-buildflags
 
@@ -28,7 +28,7 @@
   * Add a dummy watch file explaining why there is no watch file.
   * Bump Standards-Version to 3.9.1 with no changes.
   * Bump the debhelper compatibility level to 7:
-    - use dh_prep instead of dh_clean -k
+    - shorten the rules file using the dh(1) helper
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 25 Nov 2010 16:09:06 +0200
 

Modified: packages/trunk/fenix-plugins/debian/rules
===================================================================
--- packages/trunk/fenix-plugins/debian/rules	2010-11-26 09:00:28 UTC (rev 11511)
+++ packages/trunk/fenix-plugins/debian/rules	2010-11-26 10:03:30 UTC (rev 11512)
@@ -11,18 +11,6 @@
 	CFLAGS += -O2
 endif
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	for i in */ ; do \
-		if [ -e "$$i/configure.ac" ]; then \
-			cp -f /usr/share/misc/config.sub "$$i/config.sub" ; \
-			cp -f /usr/share/misc/config.guess "$$i/config.guess" ; \
-			cp -f /usr/share/libtool/config/ltmain.sh "$$i/ltmain.sh" ; \
-		fi \
-	done
-	touch $@
-
 PLUGINS = \
 	plugins/fgfx.so plugins/agua.so plugins/fire.so \
 	plugins/ttf.so plugins/image.so plugins/net.so \
@@ -30,51 +18,39 @@
 	plugins/tcpsock.so plugins/fsock.so
 
 build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	$(MAKE) \
+build-stamp:
+	dh build --before auto_build
+	for i in */ ; do \
+		if [ -e "$$i/configure.ac" ]; then \
+			cp -f /usr/share/misc/config.sub "$$i/config.sub" ; \
+			cp -f /usr/share/misc/config.guess "$$i/config.guess" ; \
+			cp -f /usr/share/libtool/config/ltmain.sh "$$i/ltmain.sh" ; \
+		fi \
+	done
+	dh_auto_build -- \
 		CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \
 		CONFFLAGS="--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)" \
 		$(PLUGINS)
-	$(MAKE) check
+	dh build --remaining
 	touch $@
 
 clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	$(MAKE) fullclean
-	dh_clean 
+	dh $@ --before auto_clean
+	dh_auto_clean -- fullclean
 	rm -f */ltmain.sh
+	dh $@ --remaining
 
 install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+	dh $@
 
 # Build architecture-independent files here.
 binary-indep: build install
+	dh $@
 
 # Build architecture-dependent files here.
 binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh $@ --before makeshlibs
+	dh $@ --after makeshlibs
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure