r364: * Whoops, I forgot to add v3 to cvs, so it was missing from a few

     versions.

3 files changed, 73 insertions, 62 deletions

diff --git a/debian/changelog b/debian/changelog
index 38ec6e52..799110d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+debhelper (2.1.4) unstable; urgency=low
+
+  * Whoops, I forgot to add v3 to cvs, so it was missing from a few
+    versions.
+
+ -- Joey Hess <joeyh@debian.org>  Fri,  4 Aug 2000 14:27:46 -0700
+
+debhelper (2.1.3) unstable; urgency=low
+
+  * dh_shlibdeps: if it sets LD_LIBRARY_PATH, it now prints out a line
+    showing it is doing that when in verbose mode.
+  * examples/rules.multi: don't use DH_OPTIONS hack. It's too confusing.
+    rules.multi2 still uses it, but it has comments explaining the caveats
+    of the hack.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 21 Jul 2000 13:53:02 -0700
+
 debhelper (2.1.2) unstable; urgency=low
 
   * Minor man page updates as Overfiend struggles with debhelperizing X
diff --git a/dh_shlibdeps b/dh_shlibdeps
index 4504930b..e08184a0 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -29,7 +29,8 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 	}
 
 	if ($dh{L_PARAMS}) {
-		$ENV{'LD_LIBRARY_PATH'}=$dh{L_PARAMS}
+		$ENV{'LD_LIBRARY_PATH'}=$dh{L_PARAMS};
+		verbose_print("LD_LIBRARY_PATH=$dh{L_PARAMS} \\");
 	}
 
 	if (@filelist) {
diff --git a/examples/rules.multi b/examples/rules.multi
index 3ac7a030..0b5d7941 100755
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -12,9 +12,6 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=2
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -35,7 +32,7 @@ clean:
 
 	dh_clean
 
-install: DH_OPTIONS=
+install:
 install: build
 	dh_testdir
 	dh_testroot
@@ -48,71 +45,67 @@ install: build
 	dh_movefiles
 
 # Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-indep: DH_OPTIONS=-i
 binary-indep: build install
 	dh_testversion 2
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-	dh_installcron
-#	dh_installmanpages
-	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs
-	dh_link
-	dh_compress
-	dh_fixperms
+	dh_testdir -i
+	dh_testroot -i
+#	dh_installdebconf -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installmenu -i
+#	dh_installlogrotate -i
+#	dh_installemacsen -i
+#	dh_installpam -i
+#	dh_installmime -i
+#	dh_installinit -i
+	dh_installcron -i
+#	dh_installmanpages -i
+	dh_installinfo -i
+#	dh_undocumented -i
+	dh_installchangelogs -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
 	# You may want to make some executables suid here.
-	dh_suidregister
-	dh_installdeb
-#	dh_perl
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_suidregister -i
+	dh_installdeb -i
+#	dh_perl -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 # Build architecture-dependent files here.
-# Pass -a to all debhelper commands in this target to reduce clutter.
-binary-arch: DH_OPTIONS=-a
 binary-arch: build install
 	dh_testversion 2
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-	dh_installcron
-#	dh_installmanpages
-	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs
-	dh_strip
-	dh_link
-	dh_compress
-	dh_fixperms
+	dh_testdir -a
+	dh_testroot -a
+#	dh_installdebconf -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installmenu -a
+#	dh_installlogrotate -a
+#	dh_installemacsen -a
+#	dh_installpam -a
+#	dh_installmime -a
+#	dh_installinit -a
+	dh_installcron -a
+#	dh_installmanpages -a
+	dh_installinfo -a
+#	dh_undocumented -a
+	dh_installchangelogs -a
+	dh_strip -a
+	dh_link -a
+	dh_compress -a
+	dh_fixperms -a
 	# You may want to make some executables suid here.
-	dh_suidregister
-	dh_installdeb
-#	dh_makeshlibs
-#	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_suidregister -a
+	dh_installdeb -a
+#	dh_makeshlibs -a
+#	dh_perl -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install