From e7f5e45df1ff9c01e2565938109ac1df7fa9026e Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Mon, 18 Jun 2001 18:11:07 +0000
Subject: [PATCH] r480:    * Revert change of 3.0.30. This broke too much
 stuff. Maybe I'll      change it in debhelper v4..

---
 debian/changelog |  7 +++++++
 dh_clean         |  2 +-
 dh_fixperms      |  2 +-
 dh_gencontrol    | 18 +-----------------
 dh_shlibdeps     |  2 +-
 5 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b408754..a9ebf76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (3.0.35) unstable; urgency=low
+
+  * Revert change of 3.0.30. This broke too much stuff. Maybe I'll
+    change it in debhelper v4..
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 18 Jun 2001 13:56:35 -0400
+
 debhelper (3.0.34) unstable; urgency=low
 
   * Unimportant spelling fix. Closes: #100666
diff --git a/dh_clean b/dh_clean
index bd3b72c..d86743a 100755
--- a/dh_clean
+++ b/dh_clean
@@ -62,7 +62,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $ext=pkgext($package);
 
 	if (! $dh{D_FLAG}) {
-		doit("rm","-f","debian/${ext}substvars.debhelper",
+		doit("rm","-f","debian/${ext}substvars",
 			"debian/${ext}postinst.debhelper",
 			"debian/${ext}postrm.debhelper",
 			"debian/${ext}preinst.debhelper",
diff --git a/dh_fixperms b/dh_fixperms
index 28315c3..5d982ad 100755
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -30,7 +30,7 @@ it removes the setuid and setgid bits from all files in the package.
 
 =over 4
 
-=item B<-X>I<item>, B<--exclude>I<item>
+=item B<-X>I<item>, B<--exclude> I<item>
 
 Exclude files that contain "item" anywhere in their filename from having
 their permissions changed. You may use this option multiple times to build
diff --git a/dh_gencontrol b/dh_gencontrol
index 99923cf..ae8605a 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -23,14 +23,6 @@ This program is merely a wrapper around L<dpkg-gencontrol(1)>, which calls
 it once for each package being acted on, and passes in some additional
 useful flags including "-isp". 
 
-Note that L<dpkg-gencontrol(1)> expands certian substirution variables
-when generating the control file (for details, see its man page). Those
-variables are typically generated by L<dh_shlibdeps(1)> and like programs.
-However, if you want to specify some of your own manually, you may do so,
-by creating files named debian/package.substvars (where package is the
-package these variables apply to). The files should be of the same form
-output by L<dpkg-shlibdeps(1)>
-
 =head1 OPTIONS
 
 =over 4
@@ -60,17 +52,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
 	}
 
-	# Merge in user-specified substvars file with debhelper generated
-	# one.
-	my $substvars=pkgfile($package,"substvars");
-	if ($substvars) {
-		complex_doit("cat $substvars >> debian/${ext}substvars.debhelper");
-	}
-
 	# Generate and install control file.
 	doit("dpkg-gencontrol","-l$changelog","-isp","-p$package",
-		     "-Tdebian/${ext}substvars.debhelper",
-		     "-P$tmp",@{$dh{U_PARAMS}});
+		     "-Tdebian/${ext}substvars", "-P$tmp",@{$dh{U_PARAMS}});
 
 	# This chmod is only necessary if the user sets the umask to
 	# something odd.
diff --git a/dh_shlibdeps b/dh_shlibdeps
index f9199c3..744aa5b 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -97,7 +97,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 
 	if (@filelist) {
-		doit("dpkg-shlibdeps","-Tdebian/${ext}substvars.debhelper",@{$dh{U_PARAMS}},'-dDepends',@filelist);
+		doit("dpkg-shlibdeps","-Tdebian/${ext}substvars",@{$dh{U_PARAMS}},'-dDepends',@filelist);
 	}
 }
 
-- 
2.39.2