r16: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 112147c81a8a7b9f404dfca2798f919beffe5db8..e70ccf07d1979cadf7da9bdf2b3f1ec368f0003a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+debhelper (0.10) unstable; urgency=medium
+
+  * dh_installdebfiles: fixed *bad* bug that messed up the names of all
+    files installed into DEBIAN/ for multiple binary packages.
+  * dh_md5sums: fixed another serious bug if dh_md5sums was used for
+    multiple binary packages.
+  * If you have made any multiple binary packages using debhelper, you
+    should rebuild them with this version.
+  * dh_md5sums: show cd commands in verbose mode.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon, 20 Oct 1997 14:44:30 -0400
+
 debhelper (0.9) unstable; urgency=low
 
   * Added dh_suidregister, interfaces to to the suidmanager package.

diff --git a/dh_installdebfiles b/dh_installdebfiles
index 58aed3b337ebe16599b3df962f11bd35a6035b2e..403375f43970cea5615c49e28b5bb67e5be56c13 100755 (executable)
--- a/dh_installdebfiles
+++ b/dh_installdebfiles
@@ -20,23 +20,23 @@ for PACKAGE in $DH_DOPACKAGES; do
                if [ -f debian/$EXT$file ]; then
                        # Add this into the script, where it has #DEBHELPER#
                        if [ -f debian/$EXT$file.debhelper ]; then
-                               verbose_echo "perl -pe \"s~#DEBHELPER#~qx{cat debian/$EXT$file.debhelper}~eg\" < debian/$EXT$file > debian/$TMP/DEBIAN/$EXT$file"
-                               perl -pe "s~#DEBHELPER#~qx{cat debian/$EXT$file.debhelper}~eg" < debian/$EXT$file > debian/$TMP/DEBIAN/$EXT$file
-                               doit "chown root.root debian/$TMP/DEBIAN/$EXT$file"
-                               doit "chmod 755 debian/$TMP/DEBIAN/$EXT$file"
+                               verbose_echo "perl -pe \"s~#DEBHELPER#~qx{cat debian/$EXT$file.debhelper}~eg\" < debian/$EXT$file > debian/$TMP/DEBIAN/$file"
+                               perl -pe "s~#DEBHELPER#~qx{cat debian/$EXT$file.debhelper}~eg" < debian/$EXT$file > debian/$TMP/DEBIAN/$file
+                               doit "chown root.root debian/$TMP/DEBIAN/$file"
+                               doit "chmod 755 debian/$TMP/DEBIAN/$file"
                        else
-                               doit "install -o root -g root -p debian/$EXT$file debian/$TMP/DEBIAN/"
+                               doit "install -o root -g root -p debian/$EXT$file debian/$TMP/DEBIAN/$file"
                        fi
                else
                        # Auto-generate script header and add .debhelper
                        # content to it.
                        if [ -f debian/$EXT$file.debhelper ]; then
-                               verbose_echo "echo '#!/bin/sh -e' > debian/$TMP/DEBIAN/$EXT$file"
-                               echo '#!/bin/sh -e' > debian/$TMP/DEBIAN/$EXT$file
-                               verbose_echo "cat debian/$EXT$file.debhelper >> debian/$TMP/DEBIAN/$EXT$file"
-                               cat debian/$EXT$file.debhelper >> debian/$TMP/DEBIAN/$EXT$file
-                               doit "chown root.root debian/$TMP/DEBIAN/$EXT$file"
-                               doit "chmod 755 debian/$TMP/DEBIAN/$EXT$file"
+                               verbose_echo "echo '#!/bin/sh -e' > debian/$TMP/DEBIAN/$file"
+                               echo '#!/bin/sh -e' > debian/$TMP/DEBIAN/$file
+                               verbose_echo "cat debian/$EXT$file.debhelper >> debian/$TMP/DEBIAN/$file"
+                               cat debian/$EXT$file.debhelper >> debian/$TMP/DEBIAN/$file
+                               doit "chown root.root debian/$TMP/DEBIAN/$file"
+                               doit "chmod 755 debian/$TMP/DEBIAN/$file"
                        fi
                fi
        done
@@ -44,7 +44,7 @@ for PACKAGE in $DH_DOPACKAGES; do
        # Install non-executable files
        for file in shlibs conffiles; do
                if [ -f debian/$EXT$file ]; then
-                       doit "install -o root -g root -m 644 -p debian/$EXT$file debian/$TMP/DEBIAN"
+                       doit "install -o root -g root -m 644 -p debian/$EXT$file debian/$TMP/DEBIAN/$file"
                fi                                               
        done
 

diff --git a/dh_md5sums b/dh_md5sums
index 8b37bc293a2379ea3a10786cb3d1726666fa5348..273faf347338e48f7c84f68abf32c8a630c463fc 100755 (executable)
--- a/dh_md5sums
+++ b/dh_md5sums
@@ -13,10 +13,10 @@ for PACKAGE in $DH_DOPACKAGES; do
                doit "install -d debian/$TMP/DEBIAN"
        fi
 
-       doit "pushd debian/$TMP" >/dev/null
+       doit "cd debian/$TMP"
        # Doit isn't smart enough to hande this next command so echo by hand. (sigh)
        verbose_echo 'md5sum `find * -type f ! -regex "^DEBIAN/.*"` > DEBIAN/md5sums </dev/null'
        md5sum `find * -type f ! -regex "^DEBIAN/.*"` >DEBIAN/md5sums </dev/null
        doit "chown root.root DEBIAN/md5sums"
-       doit "popd 2>/dev/null" >/dev/null 
+       doit "cd ../.."
 done