r12854 - /desktop/unstable/totem/debian/rules

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Sep 26 21:17:31 2007
New Revision: 12854

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12854
Log:
Specify -i/-a directly instead of using DH_OPTIONS, which breaks other 
targets called from the binary-* targets.

Modified:
    desktop/unstable/totem/debian/rules

Modified: desktop/unstable/totem/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/rules?rev=12854&op=diff
==============================================================================
--- desktop/unstable/totem/debian/rules (original)
+++ desktop/unstable/totem/debian/rules Wed Sep 26 21:17:31 2007
@@ -2,7 +2,6 @@
 #-*- makefile -*-
 
 #export DH_VERBOSE=1
-export DH_OPTIONS
 
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
@@ -141,43 +140,41 @@
 binary: binary-arch binary-indep
 
 # Build architecture-independent files here.
-binary-indep: DH_OPTIONS=-i
 binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs -A NEWS README
-	dh_installchangelogs ChangeLog
-	dh_installman
-	dh_scrollkeeper
-	dh_gconf
-	dh_desktop
-	dh_compress
-	dh_link
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i -A NEWS README
+	dh_installchangelogs -i ChangeLog
+	dh_installman -i
+	dh_scrollkeeper -i
+	dh_gconf -i
+	dh_desktop -i
+	dh_compress -i
+	dh_link -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 # Build architecture-dependent files here.
-binary-arch: DH_OPTIONS=-a
 binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs -A NEWS README
-	dh_installmenu
-	dh_installchangelogs ChangeLog
-	dh_desktop
-	dh_compress
-	dh_link
-	dh_fixperms
-	dh_makeshlibs  -V 'libtotem-plparser7 (>= 2.20.0)' -X/usr/lib/totem/ -X/usr/lib/nautilus/extensions-
-	dh_strip --dbg-package=totem-dbg
-	dh_perl
-	dh_installdeb
-	dh_shlibdeps -L $(LIBPKG) -l debian/$(LIBPKG)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdocs -a -A NEWS README
+	dh_installmenu -a
+	dh_installchangelogs -a ChangeLog
+	dh_desktop -a
+	dh_compress -a
+	dh_link -a
+	dh_fixperms -a
+	dh_makeshlibs -a -V 'libtotem-plparser7 (>= 2.20.0)' -X/usr/lib/totem/ -X/usr/lib/nautilus/extensions-
+	dh_strip -a --dbg-package=totem-dbg
+	dh_perl -a
+	dh_installdeb -a
+	dh_shlibdeps -a -L $(LIBPKG) -l debian/$(LIBPKG)/usr/lib
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 .PHONY: patch configure build install clean install-clean binary-indep binary-arch binary