r238: Initial Import

diff --git a/Dh_Lib.pm b/Dh_Lib.pm
index 73fd44ad61c4e40b76a9693813db6d4779a7d988..c5146b914d525c2c518fca984e5b0b5f1207afbb 100644 (file)
--- 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 ec5c5058d9f39fb45771fd9ed9dc6e0a852923ad..d8ced366faf4d3802408240d863c0cd05335c888 100644 (file)
--- 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 9d760b5e640ec9ab78f44208dd3a3e4eddc4a919..04c3570a8f31fc3c16aa9ead95c1b66936ec40e8 100755 (executable)
--- 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 a328d12e7be86bb3b3798fc5bb3a1fd01f01d510..e87688def0fa117ad238707552b310d04d4c3622 100755 (executable)
--- 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 73b12ba65ad9349f95392d21f94851144d36f511..040291fba16d1f36ad9f013fc778094c0e7d9b47 100755 (executable)
--- 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 1c2f1f05c99335175aec064783ebcbac3d4c8fdf..89cfc182b58ed81082b128cd7d803726c508eb79 100755 (executable)
--- 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 f81b074d464c62db6de311426f97ae43fe1e3791..d0358999b5034bc969207779382bbdf433047b2a 100755 (executable)
--- 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 f74a269c99a73efefd273f637c6e18fe6b271928..ba4e74d643d982b30b534a0bb17069b0befc157f 100755 (executable)
--- 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 cadfdc03bb254d3dc0acee4f1da763e14f95d800..a2d152c432e367613daf7931efeaf19d7c0ae5b2 100755 (executable)
--- 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 4be52020a292de072c126f5efa7d12de4258a6cb..3ebb04ec1920984405f1b8805621b295c288c508 100755 (executable)
--- 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 7287266856d98265a17c8c700b619e775bfd08e2..5b872aca96f6bac3f95ffb3fbf55e0565aa1a937 100755 (executable)
--- 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 f5f3055a821e5cfcbde428bb199f481a3433ec2a..d3eebe762e4cc3c64e3b3b65bb0f829275a291cf 100755 (executable)
--- 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 cd4562eab3a146087164c8e88e6a71b7effc4c13..72c17bccca3cbe09342834b46439ecbcc094b3e0 100755 (executable)
--- 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 2d12b76bab3435d1b3069f0bb5273884ab2afed8..7d5e49c1663185cc594224c7018a1a0206b78eec 100755 (executable)
--- 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 54e5b8e7904b52b2ca9f643b819a3321595eca01..b82b21c246e2f67b894ab389e302b4080c5524a5 100755 (executable)
--- 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 462e3f3826aeef2a06b6cd4e31514be1cce3ba21..3fbaf8ba100e5278f85fb5cc3ec76b1db1889526 100755 (executable)
--- 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 88e964baca026f5412ed67e47fb0958d64cf8a9b..e8e5e3d64f74849467433a3df9bbf098fb41c9e7 100755 (executable)
--- 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 20d5e003ec48641890ec2f4c3cdb867a5c8d996e..8ef2bab3bc8d3490ad9aef778f30d26c13b43310 100755 (executable)
--- 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 6432c513b2f491fc1542dee3a36d75a9e00dde02..c43d24d9efe55c7eba82b696f9314969f019b8f3 100755 (executable)
--- 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 f4dca9a3d9be9754f9ba4f43d3d0066d8965a5ee..6d615a16b90a338a9f429424af99d0227c3efe52 100755 (executable)
--- 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 2db1660346672c2aec958fd130819034cfade1a9..c077f21583991547577963e46c04e9b264d21c13 100755 (executable)
--- 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 232ddc19e1fe99de96223b35f247bd9e24e06f35..7cada574762b86b44349556eea2fd0f8e23d796a 100755 (executable)
--- 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 1e111e5abc5810ff7c91470ded46413387bbfcd0..0ee00dce7c86243bac06d7df6cac2611e7942360 100755 (executable)
--- 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 2262d810fe67251af704a47f8cca2c5b03c6e166..897fd7d85e54e729bca84cc21d64372098359d15 100755 (executable)
--- 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 0cae9147208719d81259075e0b2aa18f18aa008f..21ee63006968ab55cb7f19dbf0a27d6d873c04b9 100755 (executable)
--- 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 849fbf00c62c267d733e5fcb2642ada7aa77a246..f9980a6e435317a3f05753691ae45ffe9ed2a550 100755 (executable)
--- 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 919dc524a7035863833963b38ccdba68ce3b9b30..1f6299aa932feaf4a73eef334ea55f06b14f237e 100755 (executable)
--- 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 7a764af5be0e8b3fac805c934ccc9da843d67e7a..3ce48e0676d79d2309768256b782e8e83565f4b9 100755 (executable)
--- 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 dbf6bfc9b7e546c73e03b98f25024e1d217da1f8..41bf161419e397756f35401eda818ad0cb754200 100755 (executable)
--- 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 8015df79cd7cb1476f711a5f5d999e6eea6cf397..80b5f4794f9f3014af5d4621a40c2722f931ba61 100755 (executable)
--- 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 09159d3b10d21fc376670a2b7eb544159b0ef12d..7978163ee8d683291d4088e07671e45bdd36568f 100755 (executable)
--- 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 0614b9b8553a803f4f616ffa30247e6646143e0b..735711c37fa2be782976c594d57f7dd4e4f917fc 100755 (executable)
--- 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 f7ac60121105f2f98316de9e85a7dbffa9d8a783..69047dc0a714a348bfb0c54e204d5bc54d094bea 100755 (executable)
--- 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 ad5d40a82bc360df7c24fc7fc5b1f5a3ecf9853c..9d6ab050fde217db979de2c5ed5e562fb0cbf7c4 100755 (executable)
--- 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 15b1fe4d616b3e7db38932df6ede3d71d40664f1..dd01c2ce4fadc12168aa7c3007d672ee0273d7cd 100755 (executable)
--- 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 0cb95c1dd1ed52a375551ebf052a8db2cc30e5ec..6d9258db66e7e50b5272153b0f0c5d888e14c57e 100755 (executable)
--- 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 629b8f842105314f3abf00465ce353dc304e1d73..6ce2a1345c336634a5d15b30050ff1768076dab2 100755 (executable)
--- 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 57c0e588ea81a46e26ba41f1e6e1b424878f09b9..096aa9e1f136b31a72b23d6bd3be45393663b98a 100755 (executable)
--- 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 c4264d6b2ab77d94802e0c0426dbd89acc5ea1f7..77ee3f585a120550d1cbd8ca454baaaac62ce3ed 100755 (executable)
--- 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 02b11a21bc10cf60cfe2f06ebc3b3063ad2a63c2..891d31b0d60e8e7c691476900e1acb6add9e2ac2 100644 (file)
--- 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();