From d079e6683cfcbef6a979eb7a02780eebdf480a74 Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Tue, 17 Aug 1999 04:34:25 +0000
Subject: r12: Initial Import

---
 dh_testroot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dh_testroot')

diff --git a/dh_testroot b/dh_testroot
index fcc9b474..36577b29 100755
--- a/dh_testroot
+++ b/dh_testroot
@@ -3,7 +3,7 @@
 # Checks to make sure you are root.
 
 PATH=debian:$PATH:/usr/lib/debhelper
-source dh_lib
+. dh_lib
 
 if  [ "`whoami`" != root ]; then
 	error "You must run this as root."
-- 
cgit v1.2.3


From 473b811394da493f2643d196d3ea2316b6ea034f Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Tue, 17 Aug 1999 04:51:17 +0000
Subject: r86: Initial Import

---
 PROGRAMMING        |  3 +++
 README             | 53 +----------------------------------------------------
 TODO               | 11 +++++------
 debian/changelog   | 12 ++++++++++++
 debian/rules       |  2 +-
 dh_compress        | 11 +++++++----
 dh_fixperms        | 45 ++++++++++++++++++++++++++++++++++++---------
 dh_installdebfiles |  2 +-
 dh_installinit     |  6 ++++++
 dh_lib             |  5 +++++
 dh_movefiles       |  2 +-
 dh_testroot        |  4 +++-
 12 files changed, 81 insertions(+), 75 deletions(-)

(limited to 'dh_testroot')

diff --git a/PROGRAMMING b/PROGRAMMING
index a6078c1a..7dc0c638 100644
--- a/PROGRAMMING
+++ b/PROGRAMMING
@@ -143,6 +143,9 @@ verbose_echo()
 error()
 	Pass this command a string, it will output it to standard error and
 	exit.
+warning()
+	Pass this command a string, and it will output it to standard error
+	as a warning message.
 tmpdir()
 	Pass this command the name of a binary package, it will return the
 	name of the tmp directory that will be used as this package's
diff --git a/README b/README
index f821e8c0..986eb02c 100644
--- a/README
+++ b/README
@@ -18,57 +18,7 @@ process.
 Converting from debstd to debhelper:
 -----------------------------------
 
-Debhelper is designed to be mostly backwards compatible to debstd. I say
-mostly because I haven't made debhelper handle everything that debstd does
-yet, and in a few cases, it does things differently (and I hope, better).
-
-In general, you can switch over to using debhelper as follows. In your
-debian/rules, where you used to have some lines that read something like:
-
-	debstd CHANGES TODO README
-	dpkg-gencontrol
-	dpkg --build debian/tmp ..
-
-Remove that and replace it with something like:
-
-	dh_installdocs TODO README
-	dh_installexamples
-	dh_installmenu
-	dh_installcron
-	dh_installmanpages
-	dh_installchangelogs CHANGES
-	dh_movefiles
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_suidregister
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_makeshlibs
-	dh_md5sums
-	dh_builddeb
-
-Notice that the parameters sent to debstd get split up among the dh_*
-programs. The upstream changelog is passed to dh_installchangelogs, and the
-docs are passed to dh_installdocs.
-
-Debstd has many switches, that turn off different parts of it. So if you 
-were using debstd -m to tell it not to automatically install manpages,
-for example, you can just comment out the dh_installmanpages line.
-
-Finally, debstd automatically modified postinst, postrm, etc scripts. Some
-of the debhelper apps do that too, but they do it differently. Debstd just
-appends its commands to the end of the script. Debhelper requires that you
-insert a tag into your scripts, that will tell debhelper where to insert
-commands. So if you have postinst, postrm, etc scripts, add a line reading
-"#DEBHELPER#" to the end of them.
-
-Once you think it's all set up properly, do a test build of your package. If 
-it works ok, I recommend that you compare the new package and the old 
-debstd-generated package very closely. Pay special attention to the postinst, 
-postrm, etc scripts.
-
+See the file "from-debstd" for documentation on how to do this.
 
 Automatic generation of debian install scripts:
 ----------------------------------------------
@@ -116,7 +66,6 @@ affecting all packages.
 
 See examples/rules.multi for an example of how to use this.
 
-
 Package build directories -- debian/tmp, etc:
 --------------------------------------------
 
diff --git a/TODO b/TODO
index 542e9887..188e3c6c 100644
--- a/TODO
+++ b/TODO
@@ -3,12 +3,11 @@
     debmake (wishlist bug #17043). I just never saw the point of that file..
   - Make dh_movefiles remove emptied directories after it's moved all the
     files out of them (wishlist bug #17111).
-* dh_fixperms: allow listing of files not to be touched (difficult).
-* add a dh_debstd, which mimics debstd, but uses debhelper tools internally.
-  Note that the idea here is not just another debstd. This program will have
-  a -v switch, that lists all the other debhelper commands it needs to run to
-  do what debstd had to do. The intent is to make it easy to switch from
-  debstd to debhelper.
+* something should add ldconfig calls properly to the postinst of packages
+  that contain shared libraries. maybe dh_makeshlibs? But it wasn't designed
+  to do that originally, and even worse, it is often run after
+  dh_installdeb, so the fragements wouldn't go into the postinst. So maybe a
+  new script is called for.
 * info support for debhelper (currently implemented, but I hate how I did it,
   so it's not in the package.) (wishlist bug #15717)
 * enhance dh_installmanpages so it associates binaries and man pages and
diff --git a/debian/changelog b/debian/changelog
index 9d007f0f..0b443a16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+debhelper (0.88) unstable; urgency=low
+
+  * I had many hours on a train to hack on debhelper... enjoy!
+  * dh_compress: always pass -f to gzip, to force compression.
+  * dh_compress: added -X switch, to make it easy to specify files to
+    exclude, without all the bother of a debian/compress script. You can
+    use -X multiple times, too.
+  * PROGRAMMING, dh_getopt.pl: DH_EXCLUDE is now a variable set by the
+    --exclude (-X) switch. -x now sets DH_INCLUDE_CONFFILES.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sun, 17 May 1998 11:26:09 -0700
+
 debhelper (0.87) unstable; urgency=low
 
   * dh_strip: strip .comment and .note, not comment and note, when stripping
diff --git a/debian/rules b/debian/rules
index c1009b7f..44c77e07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ binary-indep: build
 	cp -a dh_lib dh_getopt.pl debian/tmp/usr/lib/debhelper
 	cp -a autoscripts debian/tmp/usr/lib/debhelper
 
-	./dh_installdocs TODO README PROGRAMMING
+	./dh_installdocs TODO README PROGRAMMING from-debstd
 	./dh_installexamples examples/*
 	./dh_installmenu
 	./dh_installmanpages
diff --git a/dh_compress b/dh_compress
index 1d30c65d..d24a561a 100755
--- a/dh_compress
+++ b/dh_compress
@@ -16,10 +16,10 @@ filelist () {
 		sh $olddir/$compress 2>/dev/null
 	else
 		# By default fall back on what the policy manual says to compress.
-		find usr/info usr/man usr/X11*/man -type f ! -name "*.gz" 2>/dev/null
+		find usr/info usr/man usr/X11*/man -type f ! -name "*.gz" 2>/dev/null || true
 		find usr/doc -type f \( -size +4k -or -name "changelog*" \) \
 			! -name "*.htm*" ! -name "*.gif" ! -name "*.gz" \
-			! -name "copyright" 2>/dev/null
+			! -name "copyright" 2>/dev/null || true
 	fi
 }
 
@@ -39,7 +39,9 @@ for PACKAGE in $DH_DOPACKAGES; do
 	# Run the file name gathering commands from within the directory
 	# structure that will be effected.
 	olddir=`pwd`
-	doit "cd $TMP"
+	# Can't use doit here, that breaks --no-act mode.
+	verbose_echo "cd $TMP"
+	cd "$TMP"
 
 	# Get the list of files to compress.
 	if [ "$DH_EXCLUDE_GREP" ]; then
@@ -56,7 +58,8 @@ for PACKAGE in $DH_DOPACKAGES; do
 	fi
 
 	# Change back to old pwd.
-	doit "cd $olddir"
+	verbose_echo "cd $olddir"
+	cd "$olddir"
 
 	# Fix up symlinks that were pointing to the uncompressed files.
 	for file in `find $TMP -type l`; do
diff --git a/dh_fixperms b/dh_fixperms
index d34ffd23..b30332a1 100755
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -5,35 +5,62 @@
 PATH=debian:$PATH:/usr/lib/debhelper
 . dh_lib
 
+# Pass this a list of files, one per line, it will return the list, with 
+# any files that need to be excluded removed.
+filelist_excluded () {
+	IFS="
+"
+	if [ "$DH_EXCLUDE_GREP" ]; then
+		# Use grep -F so we don't have to worry about regexp's.
+		echo -n "$*" | grep -v -F \
+			"`echo "$DH_EXCLUDE_GREP" | tr "|" "\n"`"
+	else
+		echo -n "$*"
+	fi
+	unset IFS
+}
+
 for PACKAGE in $DH_DOPACKAGES; do
 	TMP=`tmpdir $PACKAGE`
 
-	# General things..
-	if [ -d $TMP ]; then
-		doit "chown -R root.root $TMP"
-		doit "chmod -R go=rX $TMP"
-		doit "chmod -R u+rw $TMP"
+	# General permissions fixing.
+	if [ ! "$DH_EXCLUDE_GREP" ]; then
+		# It's much faster to do it this way, but we can only do
+		# this if there is nothing to exclude.
+		if [ -d $TMP ]; then
+			doit "chown -R root.root $TMP"
+			doit "chmod -R go=rX $TMP"
+			doit "chmod -R u+rw $TMP"
+		fi
+	else
+		# Do it the hard way.
+		files=`filelist_excluded \`find $TMP 2>/dev/null\` | tr "\n" " "`
+		if [ "$files" ]; then
+			doit "chown root.root $files"
+			doit "chmod go=rX $files"
+			doit "chmod u+rw $files"
+		fi
 	fi
 
 	# Fix up premissions in usr/doc, setting everything to not exectable
 	# by default, but leave examples directories alone.
-	files=`find $TMP/usr/doc -type f 2>/dev/null | grep -v /examples/ | tr "\n" " "` || true
+	files=`filelist_excluded \`find $TMP/usr/doc -type f 2>/dev/null | grep -v /examples/\` | tr "\n" " "`
 	if [ "$files" ]; then
 		doit "chmod 644 $files"
 	fi
-	files=`find $TMP/usr/doc -type d 2>/dev/null | tr "\n" " "` || true
+	files=`filelist_excluded \`find $TMP/usr/doc -type d 2>/dev/null\` | tr "\n" " "`
 	if [ "$files" ]; then
 		doit "chmod 755 $files"
 	fi
 
 	# Executable man pages are a bad thing..
-	files=`find $TMP/usr/man/ $TMP/usr/X11*/man/ -type f 2>/dev/null | tr "\n" " "` || true
+	files=`filelist_excluded \`find $TMP/usr/man/ $TMP/usr/X11*/man/ -type f 2>/dev/null\` | tr "\n" " "`
 	if [ "$files" ]; then
 		doit "chmod 644 $files"
 	fi
 
 	# ..and so are executable shared libraries (and .la files from libtool)
-	files=`find $TMP -perm -5 -type f \( -name "*.so*" -or -name "*.la" \) | tr "\n" " "` || true
+	files=`filelist_excluded \`find $TMP -perm -5 -type f \( -name "*.so*" -or -name "*.la" \)\` | tr "\n" " "`
 	if [ "$files" ]; then
 		doit "chmod a-X $files"
 	fi
diff --git a/dh_installdebfiles b/dh_installdebfiles
index 6afdf548..0fba35a5 100755
--- a/dh_installdebfiles
+++ b/dh_installdebfiles
@@ -5,7 +5,7 @@
 
 PATH=debian:$PATH:/usr/lib/debhelper
 
-echo "* Note: dh_installdebfiles is deprecated." >&2
+warn "Note: use of this program is deprecated."
 
 dh_installdeb $*
 dh_shlibdeps $*
diff --git a/dh_installinit b/dh_installinit
index 66ebfc57..21526e2b 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -10,6 +10,12 @@ for PACKAGE in $DH_DOPACKAGES; do
 	TMP=`tmpdir $PACKAGE`
 	init=`pkgfile $PACKAGE init`
 
+	# This is for backwards compatability with debstd, which used either
+	# name.
+	if [ ! "$init" ]; then
+		init=`pkgfile $PACKAGE init.d`
+	fi
+
 	if [ "$init" ]; then
 		if [ ! -d $TMP/etc/init.d ]; then
 			doit "install -d $TMP/etc/init.d"
diff --git a/dh_lib b/dh_lib
index 38f6734c..9e826499 100644
--- a/dh_lib
+++ b/dh_lib
@@ -37,6 +37,11 @@ error() {
 	exit 1
 }
 
+# Output a warning.
+warning() {
+	echo `basename $0`": $1" >&2
+}
+
 # Pass it a name of a binary package, it returns the name of the tmp dir to
 # use, for that package.
 # This is for back-compatability with the debian/tmp tradition.
diff --git a/dh_movefiles b/dh_movefiles
index ab7dcd01..964d4068 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -29,7 +29,7 @@ for PACKAGE in $DH_DOPACKAGES; do
 		# Putting symlinks last is a nice thing to do for library 
 		# packages and doesn't affect much of anything else.
 		#
-		# (The echo is in here to expand wildcards. Note that ls
+		# (The echo is in here to expand wildcards. Note that 'ls'
 		# won't work properly.)
 		tomove=""
 		for i in `(cd debian/tmp ; echo \`cat $files\`)`; do
diff --git a/dh_testroot b/dh_testroot
index 36577b29..c7041094 100755
--- a/dh_testroot
+++ b/dh_testroot
@@ -5,6 +5,8 @@
 PATH=debian:$PATH:/usr/lib/debhelper
 . dh_lib
 
-if  [ "`whoami`" != root ]; then
+# Test for uid = 0, not username of root, becuase
+# some people rename root.
+if  [ "`id -u`" != 0 ]; then
 	error "You must run this as root."
 fi
-- 
cgit v1.2.3


From 0287a9cbf507569b92fa157fb002a4ead079bbdb Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Tue, 17 Aug 1999 04:58:44 +0000
Subject: r116: Initial Import

---
 debian/changelog       | 18 ++++++++++++++++++
 debian/rules           | 19 +++++++------------
 dh_installchangelogs   |  5 +++++
 dh_installchangelogs.1 |  9 ++++++++-
 dh_shlibdeps           | 42 +++++++++++++++++++++++-------------------
 dh_testdir             | 17 +++++++++--------
 dh_testdir.1           |  2 --
 dh_testroot            | 13 +++++++------
 8 files changed, 77 insertions(+), 48 deletions(-)

(limited to 'dh_testroot')

diff --git a/debian/changelog b/debian/changelog
index f1a479e4..b124f138 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+debhelper (1.1.10) unstable; urgency=low
+
+  * It's come to my attention that a few packages use filename globbing in
+    debian/{docs,examples,whatever} files and expect that to work. It used
+    to work before the perl conversion, but it was never _documented_, or
+    intented to work. If you use this in your packages, they are broken and
+    need fixing (and will refuse to build with current versions of debhelper).
+    I apologize for the inconvenience.
+
+  * dh_clean: fixed a bug, intorduced in version 1.1.8, where it didn't
+    remove debian/files properly.
+  * dh_shlibdeps, dh_testdir, dh_testroot, dh_testversion: converted to perl.
+  * Encode the version of debhelper in a sepererate file, so dh_testversion
+    doesn't have to be generated when a new version of debhelper is built.
+  * Removed bogus menu file.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon, 17 Aug 1998 14:15:17 -0700
+
 debhelper (1.1.9) unstable; urgency=low
 
   * dh_fixperms: has been removing the +x bits of all doc/*/examples/* files
diff --git a/debian/rules b/debian/rules
index 8572498b..94af8686 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,35 +8,30 @@
 export DH_AUTOSCRIPTDIR=autoscripts
 
 # Figure out the current debhelper version.
-VERSION=$(shell expr "`dpkg-parsechangelog 2>/dev/null`" : \
-	'.*Version: \(.*\).*Distribution:')
+VERSION=$(shell expr "`dpkg-parsechangelog 2>/dev/null |grep Version:`" : '.*Version: \(.*\)')
 
 export DH_VERBOSE=1
 
-test_files=dh_lib
-
 build:
-	./dh_testdir $(test_files)
-	sed "s/#DEBHELPER_VERSION#/$(VERSION)/" < dh_testversion.in \
-		> dh_testversion
-	chmod 755 dh_testversion
+# Nothing to do.
 
 clean:
-	./dh_testdir $(test_files)
+	./dh_testdir
 	./dh_testroot
-	./dh_clean dh_testversion
+	./dh_clean
 
 # Build architecture-dependent files here.
 binary-arch: build
-# We have nothing to do by default.
+# Nothing to do.
 
 # Build architecture-independent files here.
 binary-indep: build
-	./dh_testdir $(test_files)
+	./dh_testdir
 	./dh_testroot
 	./dh_clean -k
 	./dh_installdirs usr/bin usr/lib/debhelper
 
+	echo -e "package Dh_Version;\n\$$version='$(VERSION)';" > debian/tmp/usr/lib/debhelper/Dh_Version.pm
 	find . -perm +111 -maxdepth 1 -type f -not -name "*.pl" \
 		-exec install -p {} debian/tmp/usr/bin \;
 	cp -a dh_lib dh_getopt.pl *.pm debian/tmp/usr/lib/debhelper
diff --git a/dh_installchangelogs b/dh_installchangelogs
index 0024fc10..97e057b7 100755
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -43,5 +43,10 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 
 	if ($upstream) {
 		doit("install","-p","-m644",$upstream,"$TMP/usr/doc/$PACKAGE/changelog");
+		if ($dh{K_FLAG}) {
+			# Install symlink to original name of the upstream changelog file.
+			# Use basename in case original file was in a subdirectory or something.
+			doit("ln","-sf","changelog","$TMP/usr/doc/$PACKAGE/".Dh_Lib::basename($upstream));
+		}
 	}
 }
diff --git a/dh_installchangelogs.1 b/dh_installchangelogs.1
index 9a579a65..815c2dda 100644
--- a/dh_installchangelogs.1
+++ b/dh_installchangelogs.1
@@ -3,7 +3,7 @@
 dh_installchangelogs \- install changelogs into package build directories
 .SH SYNOPSIS
 .B dh_installchangelogs
-.I "[debhelper options] [upstream]"
+.I "[debhelper options] [-k] [upstream]"
 .SH "DESCRIPTION"
 dh_installchangelogs is a debhelper program that is responsible for installing
 changelogs into package build directories.
@@ -25,6 +25,13 @@ See
 .BR debhelper (1)
 for a list of options common to all debhelper commands.
 .TP
+.B \-k, \--keep
+Keep the original name of the upstream changelog. This will be accomplished
+by installing the upstream changelog as "changelog", and making a symlink from
+that to the original name of the changelog file. This can be useful if the
+upstream changelog has an unusual name, or if other documentation in the
+package refers to the changelog file.
+.TP
 .B upstream
 Install this file as the upstream changelog.
 .SH NOTES
diff --git a/dh_shlibdeps b/dh_shlibdeps
index e30c4a5b..f7ac6012 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -1,24 +1,28 @@
-#!/bin/sh -e
+#!/usr/bin/perl -w
 #
 # Find dependancies. Simple dpkg-shlibdeps wrapper.
 
-PATH=debian:$PATH:/usr/lib/debhelper
-. dh_lib
+BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+use Dh_Lib;
+init();
 
-for PACKAGE in $DH_DOPACKAGES; do
-	TMP=`tmpdir $PACKAGE`
-	EXT=`pkgext $PACKAGE`
+foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
+	$TMP=tmpdir($PACKAGE);
+	$EXT=pkgext($PACKAGE);
 
-	# Run dpkg-shlibdeps to generate dependancies.
-	filelist=""
-	for file in `find $TMP -type f \( -perm +111 -or -name "*.so*" \) | tr "\n" " "` ; do
-		case "`file $file`" in
-			*ELF*)
-				filelist="$file $filelist"
-			;;
-		esac
-	done
-	if [ "$filelist" ]; then
-		doit "dpkg-shlibdeps -Tdebian/${EXT}substvars $DH_U_PARAMS $filelist"
-	fi
-done
+	my @filelist;
+	my $ff;
+
+	# Generate a list of all ELF binaries in the package.
+	foreach $file (split(/\n/,`find $TMP -type f \\( -perm +111 -or -name "*.so*" \\)`)) {
+		# TODO: this is slow, optimize. Ie, file can run once on multiple files..
+		$ff=`file $file`;
+		if ($ff=~m/ELF/) {
+			push @filelist,$file;
+		}
+	}
+
+	if (@filelist) {
+		doit("dpkg-shlibdeps","-Tdebian/$EXT\substvars",@{$dh{U_PARAMS}},@filelist);
+	}
+}
diff --git a/dh_testdir b/dh_testdir
index 4e482fce..0cb95c1d 100755
--- a/dh_testdir
+++ b/dh_testdir
@@ -1,14 +1,15 @@
-#!/bin/sh -e
+#!/usr/bin/perl -w
 #
 # Checks to make sure we are building the package in the right directory.
 # Tests for the existance of debian/control, and for the existance
 # of any other files you specify on the command line.
 
-PATH=debian:$PATH:/usr/lib/debhelper
-. dh_lib
+BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+use Dh_Lib;
+init();
 
-for file in debian/control $@; do
-	if [ ! -e "$file" ] ; then
-		error "\"$file\" not found. Are you sure you are in the correct directory?"
-	fi
-done
+foreach $file ('debian/control',@ARGV) {
+	if (! -e $file) {
+		error("\"$file\" not found. Are you sure you are in the correct directory?");
+	}
+}
diff --git a/dh_testdir.1 b/dh_testdir.1
index 309a7d94..43c7439a 100644
--- a/dh_testdir.1
+++ b/dh_testdir.1
@@ -24,7 +24,5 @@ See
 for a list of environment variables that affect all debhelper commands.
 .SH "SEE ALSO"
 .BR debhelper (1)
-.SH BUGS
-Files with spaces in their names will not be processed correctly.
 .SH AUTHOR
 Joey Hess <joeyh@master.debian.org>
diff --git a/dh_testroot b/dh_testroot
index c7041094..629b8f84 100755
--- a/dh_testroot
+++ b/dh_testroot
@@ -1,12 +1,13 @@
-#!/bin/sh -e
+#!/usr/bin/perl -w
 #
 # Checks to make sure you are root.
 
-PATH=debian:$PATH:/usr/lib/debhelper
-. dh_lib
+BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+use Dh_Lib;
+init();
 
 # Test for uid = 0, not username of root, becuase
 # some people rename root.
-if  [ "`id -u`" != 0 ]; then
-	error "You must run this as root."
-fi
+if ($< != 0) {
+	error("You must run this as root.");
+}
-- 
cgit v1.2.3


From 6a4c47eea5a5601f351a1fa0afd5e13aed56238b Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Tue, 17 Aug 1999 05:18:11 +0000
Subject: r238: Initial Import

---
 Dh_Lib.pm            | 6 +++---
 debian/changelog     | 6 ++++++
 dh_builddeb          | 2 +-
 dh_clean             | 2 +-
 dh_compress          | 2 +-
 dh_debstd            | 2 +-
 dh_du                | 2 +-
 dh_fixperms          | 2 +-
 dh_gencontrol        | 2 +-
 dh_installchangelogs | 2 +-
 dh_installcron       | 2 +-
 dh_installdeb        | 2 +-
 dh_installdebfiles   | 4 ++--
 dh_installdirs       | 2 +-
 dh_installdocs       | 2 +-
 dh_installemacsen    | 2 +-
 dh_installexamples   | 2 +-
 dh_installinfo       | 2 +-
 dh_installinit       | 2 +-
 dh_installmanpages   | 2 +-
 dh_installmenu       | 2 +-
 dh_installmime       | 2 +-
 dh_installmodules    | 2 +-
 dh_installpam        | 2 +-
 dh_installwm         | 2 +-
 dh_installxaw        | 6 +++---
 dh_link              | 2 +-
 dh_listpackages      | 2 +-
 dh_makeshlibs        | 2 +-
 dh_md5sums           | 2 +-
 dh_movefiles         | 2 +-
 dh_perl              | 2 +-
 dh_shlibdeps         | 2 +-
 dh_strip             | 2 +-
 dh_suidregister      | 2 +-
 dh_testdir           | 2 +-
 dh_testroot          | 2 +-
 dh_testversion       | 2 +-
 dh_undocumented      | 2 +-
 doc/PROGRAMMING      | 2 +-
 40 files changed, 50 insertions(+), 44 deletions(-)

(limited to 'dh_testroot')

diff --git a/Dh_Lib.pm b/Dh_Lib.pm
index 73fd44ad..c5146b91 100644
--- a/Dh_Lib.pm
+++ b/Dh_Lib.pm
@@ -296,11 +296,11 @@ sub autoscript { my $package=shift; my $script=shift; my $filename=shift; my $se
 		$infile="$ENV{DH_AUTOSCRIPTDIR}/$filename";
 	}
 	else {
-		if (-e "/usr/lib/debhelper/autoscripts/$filename") {
-			$infile="/usr/lib/debhelper/autoscripts/$filename";
+		if (-e "/usr/share/debhelper/autoscripts/$filename") {
+			$infile="/usr/share/debhelper/autoscripts/$filename";
 		}
 		else {
-			error("/usr/lib/debhelper/autoscripts/$filename does not exist");
+			error("/usr/share/debhelper/autoscripts/$filename does not exist");
 		}
 	}
 
diff --git a/debian/changelog b/debian/changelog
index ec5c5058..d8ced366 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (2.0.13) unstable; urgency=low
+
+  * dh_fixperms: FHS fixes (#41058)
+
+ -- Joey Hess <joeyh@master.debian.org>  Fri,  9 Jul 1999 13:07:49 -0700
+
 debhelper (2.0.12) unstable; urgency=low
 
   * dh_installinfo: fixed #SECTION# substitution.
diff --git a/dh_builddeb b/dh_builddeb
index 9d760b5e..04c3570a 100755
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -2,7 +2,7 @@
 #
 # Build the .deb package, assuming all the files are set up.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_clean b/dh_clean
index a328d12e..e87688de 100755
--- a/dh_clean
+++ b/dh_clean
@@ -3,7 +3,7 @@
 # Clean up $TMP and other tepmorary files generated by the
 # build process.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_compress b/dh_compress
index 73b12ba6..040291fb 100755
--- a/dh_compress
+++ b/dh_compress
@@ -4,7 +4,7 @@
 # compressed files get fixed.
 
 use Cwd;
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_debstd b/dh_debstd
index 1c2f1f05..89cfc182 100755
--- a/dh_debstd
+++ b/dh_debstd
@@ -38,7 +38,7 @@ foreach (@ARGV) {
 }
 @ARGV=@argv;
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_du b/dh_du
index f81b074d..d0358999 100755
--- a/dh_du
+++ b/dh_du
@@ -5,7 +5,7 @@
 #
 # No longer - it was decided these files are a bad idea.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 
 warning("this program does nothing and is deprecated. Remove it from debian/rules.");
diff --git a/dh_fixperms b/dh_fixperms
index f74a269c..ba4e74d6 100755
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -2,7 +2,7 @@
 #
 # Do some general file permission fixups.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_gencontrol b/dh_gencontrol
index cadfdc03..a2d152c4 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -2,7 +2,7 @@
 #
 # Generate and install the control file. Simple dpkg-gencontrol wrapper.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installchangelogs b/dh_installchangelogs
index 4be52020..3ebb04ec 100755
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -7,7 +7,7 @@
 # if so, the debian changelog is just installed as "changelog", and it is an 
 # error to specify an upstream changelog on the command line.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installcron b/dh_installcron
index 72872668..5b872aca 100755
--- a/dh_installcron
+++ b/dh_installcron
@@ -2,7 +2,7 @@
 #
 # Install cron scripts into the appropriate places.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installdeb b/dh_installdeb
index f5f3055a..d3eebe76 100755
--- a/dh_installdeb
+++ b/dh_installdeb
@@ -2,7 +2,7 @@
 #
 # Install files from debian/ into the package's DEBIAN directory.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installdebfiles b/dh_installdebfiles
index cd4562ea..72c17bcc 100755
--- a/dh_installdebfiles
+++ b/dh_installdebfiles
@@ -3,10 +3,10 @@
 # This program is deprecated, but left in the package for backwards
 # compatability. It simply calls the 3 programs that replaced it.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 
-$ENV{PATH}="debian:$ENV{PATH}:/usr/lib/debhelper";
+$ENV{PATH}="debian:$ENV{PATH}:/usr/share/debhelper";
 
 warning("use of this program is deprecated, see man page.");
 
diff --git a/dh_installdirs b/dh_installdirs
index 2d12b76b..7d5e49c1 100755
--- a/dh_installdirs
+++ b/dh_installdirs
@@ -2,7 +2,7 @@
 #
 # Reads debian/dirs, creates the directories listed there
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installdocs b/dh_installdocs
index 54e5b8e7..b82b21c2 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -4,7 +4,7 @@
 # Also installs the debian/copyright and debian/README.debian and debian/TODO
 # and handles debian/doc-base.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installemacsen b/dh_installemacsen
index 462e3f38..3fbaf8ba 100755
--- a/dh_installemacsen
+++ b/dh_installemacsen
@@ -2,7 +2,7 @@
 #
 # Registration with emacsen-common.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installexamples b/dh_installexamples
index 88e964ba..e8e5e3d6 100755
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -3,7 +3,7 @@
 # Reads debian/examples, installs all files listed there into
 # /usr/doc/$PACKAGE/examples
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installinfo b/dh_installinfo
index 20d5e003..8ef2bab3 100755
--- a/dh_installinfo
+++ b/dh_installinfo
@@ -3,7 +3,7 @@
 # Reads debian/info, installs all files listed there into /usr/info
 # and puts appropriate commands into the postinst.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installinit b/dh_installinit
index 6432c513..c43d24d9 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -3,7 +3,7 @@
 # Install debian/init[.d], and set up the postinst and postrm for init
 # scripts.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installmanpages b/dh_installmanpages
index f4dca9a3..6d615a16 100755
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -7,7 +7,7 @@
 # This is a little bit (hah!) DWIMish, but still very handy.
 
 use File::Find;
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installmenu b/dh_installmenu
index 2db16603..c077f215 100755
--- a/dh_installmenu
+++ b/dh_installmenu
@@ -8,7 +8,7 @@
 #
 # Also, add to postinst and postrm.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installmime b/dh_installmime
index 232ddc19..7cada574 100755
--- a/dh_installmime
+++ b/dh_installmime
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installmodules b/dh_installmodules
index 1e111e5a..0ee00dce 100755
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -2,7 +2,7 @@
 #
 # Register modules with modutils.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installpam b/dh_installpam
index 2262d810..897fd7d8 100755
--- a/dh_installpam
+++ b/dh_installpam
@@ -4,7 +4,7 @@
 #
 # If debian/pam file exists, save it to $TMP/etc/pam.d/$PACKAGE
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installwm b/dh_installwm
index 0cae9147..21ee6300 100755
--- a/dh_installwm
+++ b/dh_installwm
@@ -2,7 +2,7 @@
 #
 # Add to postinst and postrm to register a window manager.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_installxaw b/dh_installxaw
index 849fbf00..f9980a6e 100755
--- a/dh_installxaw
+++ b/dh_installxaw
@@ -7,7 +7,7 @@
 #
 # Also, add calls to postinst and postrm.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
@@ -51,8 +51,8 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 			close IN;
 
 			if ($stanza) {
-				$install_opts.="'$data{program} $data{'link-name'} $data{wrapped}'";
-				$remove_opts.="'$data{'link-name'} $data{wrapped}'";
+				$install_opts.="'$data{program} $data{'link-name'} $data{wrapped}' ";
+				$remove_opts.="'$data{'link-name'} $data{wrapped}' ";
 			}
 			
 			autoscript($PACKAGE,"postinst","postinst-xaw",
diff --git a/dh_link b/dh_link
index 919dc524..1f6299aa 100755
--- a/dh_link
+++ b/dh_link
@@ -3,7 +3,7 @@
 # Generate symlinks in debian packages, reading debian/links. The
 # file contains pairs of files and symlinks.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_listpackages b/dh_listpackages
index 7a764af5..3ce48e06 100755
--- a/dh_listpackages
+++ b/dh_listpackages
@@ -2,7 +2,7 @@
 #
 # Output a list of all packages debhelper will act on.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 print join("\n",@{$dh{DOPACKAGES}})."\n";
diff --git a/dh_makeshlibs b/dh_makeshlibs
index dbf6bfc9..41bf1614 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -2,7 +2,7 @@
 #
 # Automatically generate shlibs files.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_md5sums b/dh_md5sums
index 8015df79..80b5f479 100755
--- a/dh_md5sums
+++ b/dh_md5sums
@@ -4,7 +4,7 @@
 # package.
 
 use Cwd;
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_movefiles b/dh_movefiles
index 09159d3b..7978163e 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -2,7 +2,7 @@
 #
 # Move files out of debian/tmp, into subpackages.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_perl b/dh_perl
index 0614b9b8..735711c3 100755
--- a/dh_perl
+++ b/dh_perl
@@ -3,7 +3,7 @@
 # Find dependencies on perl stuff
 # Remove .packlist files
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_shlibdeps b/dh_shlibdeps
index f7ac6012..69047dc0 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -2,7 +2,7 @@
 #
 # Find dependancies. Simple dpkg-shlibdeps wrapper.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_strip b/dh_strip
index ad5d40a8..9d6ab050 100755
--- a/dh_strip
+++ b/dh_strip
@@ -3,7 +3,7 @@
 # Strip files.
 
 use File::Find;
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_suidregister b/dh_suidregister
index 15b1fe4d..dd01c2ce 100755
--- a/dh_suidregister
+++ b/dh_suidregister
@@ -6,7 +6,7 @@
 # If there are parameters, or there is a debian/suid, register the files
 # listed there.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_testdir b/dh_testdir
index 0cb95c1d..6d9258db 100755
--- a/dh_testdir
+++ b/dh_testdir
@@ -4,7 +4,7 @@
 # Tests for the existance of debian/control, and for the existance
 # of any other files you specify on the command line.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_testroot b/dh_testroot
index 629b8f84..6ce2a134 100755
--- a/dh_testroot
+++ b/dh_testroot
@@ -2,7 +2,7 @@
 #
 # Checks to make sure you are root.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/dh_testversion b/dh_testversion
index 57c0e588..096aa9e1 100755
--- a/dh_testversion
+++ b/dh_testversion
@@ -2,7 +2,7 @@
 #
 # Debhelper version check.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 use Dh_Version; # contains the version number of debhelper.
 init();
diff --git a/dh_undocumented b/dh_undocumented
index c4264d6b..77ee3f58 100755
--- a/dh_undocumented
+++ b/dh_undocumented
@@ -6,7 +6,7 @@
 # Also, it looks for debian/undocumented files for more lists of
 # undocumented man pages.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index 02b11a21..891d31b0 100644
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -51,7 +51,7 @@ supported now, though.)
 
 Use Dh_lib.pm like this:
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
-- 
cgit v1.2.3