r21: Initial Import

diff --git a/README b/README
index d84add45e96ec6c70bc1b896d4d018eb4ce3887d..2f2e7c2c8a485d21e148bbb2ae9226f75c67dae5 100644 (file)
--- a/README
+++ b/README
@@ -102,4 +102,27 @@ effecting all packages.
 
 See examples/rules.multi for an example of how to use this.
 
+
+Package build directories -- debian/tmp, etc:
+--------------------------------------------
+
+By default, all debhelper programs assume that the temporary directory used
+for assembling the tree of files in a package is debian/tmp for the first
+package listed in debian/control, and debian/<packagename> for each
+additional package.
+
+Sometimes, you might want to use some other temporary directory. This is
+supported by the -P flag. The direcotry to use is specified after -P, for
+example, "dh_installdocs -Pdebian/tmp", will use debian/tmp as the temporary
+directory. Note that if you use -P, the debhelper programs can only be
+acting on a single package at a time. So if you have a package that builds
+many binary packages, you will need to use the -p flag to specify which
+binary package the debhelper program will act on. For example:
+
+       dh_installdocs -pfoolib1 -Pdebian/tmp-foolib1
+       dh_installdocs -pfoolib1-dev -Pdebian/tmp-foolib1-dev
+       dh_installdocs -pfoolib-bin -Pdebian/tmp-foolib-bin
+
+This uses debian/tmp-<package> as the package build directory.
+
 -- Joey Hess <joeyh@master.debian.org>

diff --git a/debian/changelog b/debian/changelog
index a33224d9401f8d0931fa9a8c89dfa9c2fb6b97c8..f7d47b1774125b8303118ba7fbbac1159ea0636e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debhelper (0.15) unstable; urgency=low
+
+  * README: documented what temporary directories are used by default for 
+    installing package files into.
+  * dh_*: added -P flag, to let a different package build directory be
+    specified.
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu,  6 Nov 1997 15:51:22 -0500
+
 debhelper (0.14) unstable; urgency=low
 
   * dh_fixperms: leave permissions on files in /usr/doc/packages/examples

diff --git a/dh_builddeb b/dh_builddeb
index aea8a1b12e1bcf2f1d5163584ec57c037b39bd41..9ddd21dc848b6ae927a0bdf8f7ae92c014652ada 100755 (executable)
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -7,5 +7,5 @@ PATH=debian:$PATH:/usr/lib/debhelper
 
 for PACKAGE in $DH_DOPACKAGES; do
        TMP=`tmpdir $PACKAGE`
-       doit "dpkg --build debian/$TMP .."
+       doit "dpkg --build $TMP .."
 done

diff --git a/dh_builddeb.1 b/dh_builddeb.1
index bfe72e7283f90df420bb59b8ea49c2eb91360beb..8a51a8f4f8797f77a09347bc3fd1b06fffe01f2d 100644 (file)
--- a/dh_builddeb.1
+++ b/dh_builddeb.1
@@ -3,7 +3,7 @@
 dh_builddeb \- build debian packages
 .SH SYNOPSIS
 .B dh_builddeb
-.I "[-v] [-a] [-i] [-ppackage]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_builddeb simply calls
 .BR dpkg (8)
@@ -21,6 +21,9 @@ Build all architecture independent packages.
 .TP
 .B \-ppackage
 Build the package named "package".
+.TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory.
 .SH NOTES
 The
 .B \-a

diff --git a/dh_clean b/dh_clean
index 76522ddab0766028d6151d355dbe1155a6523917..874604ed24b04142723f5c0e661de0cc6417da79 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Clean up debian/$TMP and other tepmorary files generated by the 
+# Clean up $TMP and other tepmorary files generated by the 
 # build process.
 
 PATH=debian:$PATH:/usr/lib/debhelper
@@ -9,7 +9,7 @@ PATH=debian:$PATH:/usr/lib/debhelper
 for PACKAGE in $DH_DOPACKAGES; do
        TMP=`tmpdir $PACKAGE`
        EXT=`pkgext $PACKAGE`
-       doit "rm -rf debian/$TMP"
+       doit "rm -rf $TMP"
        doit "rm -f debian/${EXT}substvars"
 done
 doit "rm -f debian/files* debian/*.debhelper $*"

diff --git a/dh_clean.1 b/dh_clean.1
index e387c4eb2bbdf8016db93c478af54281ec1cac38..651b5b084a88cf411de7074f957f8fb1ced65ec9 100644 (file)
--- a/dh_clean.1
+++ b/dh_clean.1
@@ -3,7 +3,7 @@
 dh_clean \- clean up package build directories
 .SH SYNOPSIS
 .B dh_clean
-.I "[-v] [-a] [-i] [-ppackage] [file ...]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [file ...]"
 .SH "DESCRIPTION"
 dh_clean is a debhelper program that is responsible for cleaning up after a
 package is built. It removes the package build directories, and removes some
@@ -23,6 +23,9 @@ Clean up the package build directory for all architecture independent packages.
 .B \-ppackage
 Clean up the package build directory for the package named "package".
 .TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory.
+.TP
 .B file ...
 Delete these files too.
 .SH NOTES

diff --git a/dh_compress b/dh_compress
index 347f0f5fbd0e05cfec318569a9e230046c029e2e..86ab8373f70574746e6046e744d7c68da26e1aaa 100755 (executable)
--- a/dh_compress
+++ b/dh_compress
@@ -13,7 +13,7 @@ for PACKAGE in $DH_DOPACKAGES; do
        # Run the file name gatering commands from within the directory
        # structure that will be effected.
        olddir=`pwd`
-       cd debian/$TMP
+       cd $TMP
 
        if [ -f debian/${EXT}compress ]; then
                # The config file is a sh script that outputs the files to be compressed
@@ -40,7 +40,7 @@ for PACKAGE in $DH_DOPACKAGES; do
        cd $olddir
 
        # Fix up symlinks that were pointing to the uncompressed files.
-       for file in `find debian/$TMP -type l`; do
+       for file in `find $TMP -type l`; do
                DIRECTORY=`expr $file : "\(.*\)/[^/]*"`
                NAME=`expr $file : ".*/\([^/]*\)"`
                LINKVAL=`ls -l $DIRECTORY/$NAME | awk '{ print $11;}'`

diff --git a/dh_compress.1 b/dh_compress.1
index 06087b8edcf7a903b1300022ea3480d51ffeb8e9..d7e8dc5ca2e03401f19fef9454f8fbd13ce4139f 100644 (file)
--- a/dh_compress.1
+++ b/dh_compress.1
@@ -3,7 +3,7 @@
 dh_compress \- compress files and fix symlinks in package build directories
 .SH SYNOPSIS
 .B dh_compress
-.I "[-v] [-a] [-i] [-ppackage]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_compress is a debhelper program that is responsible for compressing
 the files in package build directories, and makes sure that any symlinks
@@ -41,6 +41,9 @@ Compress files for all architecture independent packages.
 .TP
 .B \-ppackage
 Compress files for the package named "package".
+.TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
 .SH NOTES
 The
 .B \-a

diff --git a/dh_du b/dh_du
index a7ec6f489bd1b55d03213bcb97da9dfbb9c5b4e8..5fcb141804ea718deef9939af4f4a4bb43ad5ebf 100755 (executable)
--- a/dh_du
+++ b/dh_du
@@ -9,11 +9,11 @@ PATH=debian:$PATH:/usr/lib/debhelper
 for PACKAGE in $DH_DOPACKAGES; do
        TMP=`tmpdir $PACKAGE`
 
-       if [ ! -d "debian/$TMP/DEBIAN" ]; then
-               doit "install -d debian/$TMP/DEBIAN"
+       if [ ! -d "$TMP/DEBIAN" ]; then
+               doit "install -d $TMP/DEBIAN"
        fi
 
-       verbose_echo "du -k debian/$TMP | sed \"s:      debian/$TMP/:   :\" | grep -v \"        DEBIAN$\" | grep -v \"  debian/$TMP$\" > debian/$TMP/DEBIAN/du"
-       du -k debian/$TMP | sed "s:     debian/$TMP/:   :" | grep -v "  DEBIAN$" | grep -v "    debian/$TMP$" >debian/$TMP/DEBIAN/du
+       verbose_echo "du -k $TMP | sed \"s:     $TMP/:  :\" | grep -v \"        DEBIAN$\" | grep -v \"  $TMP$\" > $TMP/DEBIAN/du"
+       du -k $TMP | sed "s:    $TMP/:  :" | grep -v "  DEBIAN$" | grep -v "    $TMP$" >$TMP/DEBIAN/du
        doit "chown root.root debian/tmp/DEBIAN/du"
 done

diff --git a/dh_du.1 b/dh_du.1
index 98a9c80a0d516adbac5381a12f9b61d8821aed8b..42509a504e4d52b99c87e57a95d3df7bbaaeb3db 100644 (file)
--- a/dh_du.1
+++ b/dh_du.1
@@ -3,7 +3,7 @@
 dh_du \- generate DEBIAN/du file
 .SH SYNOPSIS
 .B dh_md5sums
-.I "[-v] [-a] [-i] [-ppackage]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_du is a debhelper program that is responsible for generating
 a DEBIAN/du file, which lists the disk usage of directories in the package.
@@ -24,6 +24,9 @@ Generate du files for all architecture independent packages.
 .TP
 .B \-ppackage
 Generate du file for the package named "package".
+.TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
 .SH NOTES
 The
 .B \-a

diff --git a/dh_fixperms b/dh_fixperms
index 1c4fef7cccc2379c7ea04b11bd9164b973e5a777..0534549ccd8299d8a84db6a01c1ae130a435e0ac 100755 (executable)
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -10,24 +10,24 @@ for PACKAGE in $DH_DOPACKAGES; do
        EXT=`pkgext $PACKAGE`
 
        # General things..
-       if [ -d debian/$TMP ]; then
-               doit "chown -R root.root debian/$TMP"
-               doit "chmod -R go=rX debian/$TMP"
+       if [ -d $TMP ]; then
+               doit "chown -R root.root $TMP"
+               doit "chmod -R go=rX $TMP"
        fi
 
        # Fix up premissions in usr/doc, setting everything to not exectable
        # by default, but leave examples directories alone.
-       files=`find debian/$TMP/usr/doc -type f 2>/dev/null | grep -v /examples/ | tr "\n" " "` || true
+       files=`find $TMP/usr/doc -type f 2>/dev/null | grep -v /examples/ | tr "\n" " "` || true
        if [ "$files" ]; then
                doit "chmod 644 $files"
        fi
-       files=`find debian/$TMP/usr/doc -type d 2>/dev/null | tr "\n" " "` || true
+       files=`find $TMP/usr/doc -type d 2>/dev/null | tr "\n" " "` || true
        if [ "$files" ]; then
                doit "chmod 755 $files"
        fi
 
        # Executable man pages are a bad thing.
-       files=`find debian/$TMP/usr/man/ debian/$TMP/usr/X11*/man/ -type f 2>/dev/null | tr "\n" " "` || true
+       files=`find $TMP/usr/man/ $TMP/usr/X11*/man/ -type f 2>/dev/null | tr "\n" " "` || true
        if [ "$files" ]; then
                doit "chmod 644 $files"
        fi

diff --git a/dh_fixperms.1 b/dh_fixperms.1
index cfba6481eac7769a8af8cd4e3307fc78067b7f72..8ae36def8de904ebe0c233219759fef21823d32a 100644 (file)
--- a/dh_fixperms.1
+++ b/dh_fixperms.1
@@ -3,7 +3,7 @@
 dh_fixperms \- fix permissions of files in package build directories
 .SH SYNOPSIS
 .B dh_fixperms
-.I "[-v] [-a] [-i] [-ppackage]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_fixperms is a debhelper program that is responsible for setting the
 permissions of files in package build directories to a sane state.
@@ -25,6 +25,9 @@ Fix permissions for all architecture independent packages.
 .TP
 .B \-ppackage
 Fix permissions for the package named "package".
+.TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
 .SH NOTES
 The
 .B \-a

diff --git a/dh_installchangelogs b/dh_installchangelogs
index 17ff73121b5a5fca442cc67e094b8c7e93b6cfe1..7405daae6d2c97915b36e456ec15b8dc0dc02a2e 100755 (executable)
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -25,12 +25,12 @@ fi
 for PACKAGE in $DH_DOPACKAGES; do
        TMP=`tmpdir $PACKAGE`
 
-       if [ ! -d debian/$TMP/usr/doc/$PACKAGE ]; then
-               doit "install -d debian/$TMP/usr/doc/$PACKAGE"
+       if [ ! -d $TMP/usr/doc/$PACKAGE ]; then
+               doit "install -d $TMP/usr/doc/$PACKAGE"
        fi
-       doit "install -p -m644 debian/changelog debian/$TMP/usr/doc/$PACKAGE/$CHANGELOG_NAME"
+       doit "install -p -m644 debian/changelog $TMP/usr/doc/$PACKAGE/$CHANGELOG_NAME"
 
        if [ "$UPSTREAM" ]; then
-               doit "install -p -m644 $UPSTREAM debian/$TMP/usr/doc/$PACKAGE/changelog"
+               doit "install -p -m644 $UPSTREAM $TMP/usr/doc/$PACKAGE/changelog"
        fi
 done

diff --git a/dh_installchangelogs.1 b/dh_installchangelogs.1
index 2371af17a847b79ecf5e1659379e5f94f5fc669b..8c42a0111070e36e1248344755666405e77057e0 100644 (file)
--- 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 "[-v] [-a] [-i] [-ppackage] upstream"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] upstream"
 .SH "DESCRIPTION"
 dh_installchangelogs is a debhelper program that is responsible for installing
 changelogs into package build directories.
@@ -29,6 +29,9 @@ Install changelogs for all architecture independent packages.
 .TP
 .B \-ppackage
 Install changelogs for the package named "package".
+.TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
 .SH NOTES
 The
 .B \-a

diff --git a/dh_installcron b/dh_installcron
index f5c4f8b8bb1cf6160347996327079e7a9f901dd3..6ea5daa399520ecb492f920eaf2031880058843f 100755 (executable)
--- a/dh_installcron
+++ b/dh_installcron
@@ -11,10 +11,10 @@ for PACKAGE in $DH_DOPACKAGES; do
 
        for type in daily weekly monthly; do
                if [ -e debian/${EXT}cron.$type ]; then
-                       if [ ! -d debian/$TMP/etc/cron.$type ]; then
-                               doit "install -o root -g root -d debian/$TMP/etc/cron.$type"
+                       if [ ! -d $TMP/etc/cron.$type ]; then
+                               doit "install -o root -g root -d $TMP/etc/cron.$type"
                        fi
-                       doit "install debian/${EXT}cron.$type debian/$TMP/etc/cron.$type/$PACKAGE"
+                       doit "install debian/${EXT}cron.$type $TMP/etc/cron.$type/$PACKAGE"
                fi
        done
 done

diff --git a/dh_installcron.1 b/dh_installcron.1
index 2819958b2cdcdc4c194e597f3a697335056c1466..ff76760bb9759d0921b7d17a84e32a013cc78808 100644 (file)
--- a/dh_installcron.1
+++ b/dh_installcron.1
@@ -3,7 +3,7 @@
 dh_installcron \- install cron scripts into etc/cron.*
 .SH SYNOPSIS
 .B dh_installcron
-.I "[-v] [-a] [-i] [-ppackage]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_installcron is a debhelper program that is responsible for installing
 cron scripts into etc/cron.* in package build directories. The files 
@@ -24,6 +24,9 @@ Install cron files for all architecture independent packages.
 .TP
 .B \-ppackage
 Install cron files for the package named "package".
+.TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
 .SH NOTES
 The
 .B \-a

diff --git a/dh_installdebfiles b/dh_installdebfiles
index 403375f43970cea5615c49e28b5bb67e5be56c13..ad08f8d3a6e475961139b0ba3050993e21e339ae 100755 (executable)
--- a/dh_installdebfiles
+++ b/dh_installdebfiles
@@ -10,8 +10,8 @@ for PACKAGE in $DH_DOPACKAGES; do
        TMP=`tmpdir $PACKAGE`
        EXT=`pkgext $PACKAGE`
 
-       if [ ! -d debian/$TMP/DEBIAN ]; then
-               doit "install -o root -g root -d debian/$TMP/DEBIAN"
+       if [ ! -d $TMP/DEBIAN ]; then
+               doit "install -o root -g root -d $TMP/DEBIAN"
        fi
 
        # Install debian install scripts.
@@ -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/$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"
+                               verbose_echo "perl -pe \"s~#DEBHELPER#~qx{cat debian/$EXT$file.debhelper}~eg\" < debian/$EXT$file > $TMP/DEBIAN/$file"
+                               perl -pe "s~#DEBHELPER#~qx{cat debian/$EXT$file.debhelper}~eg" < debian/$EXT$file > $TMP/DEBIAN/$file
+                               doit "chown root.root $TMP/DEBIAN/$file"
+                               doit "chmod 755 $TMP/DEBIAN/$file"
                        else
-                               doit "install -o root -g root -p debian/$EXT$file debian/$TMP/DEBIAN/$file"
+                               doit "install -o root -g root -p debian/$EXT$file $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/$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"
+                               verbose_echo "echo '#!/bin/sh -e' > $TMP/DEBIAN/$file"
+                               echo '#!/bin/sh -e' > $TMP/DEBIAN/$file
+                               verbose_echo "cat debian/$EXT$file.debhelper >> $TMP/DEBIAN/$file"
+                               cat debian/$EXT$file.debhelper >> $TMP/DEBIAN/$file
+                               doit "chown root.root $TMP/DEBIAN/$file"
+                               doit "chmod 755 $TMP/DEBIAN/$file"
                        fi
                fi
        done
@@ -44,13 +44,13 @@ 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/$file"
+                       doit "install -o root -g root -m 644 -p debian/$EXT$file $TMP/DEBIAN/$file"
                fi                                               
        done
 
        # Run dpkg-shlibdeps to generate dependancies.
        filelist=""
-       for file in `find debian/$TMP -type f \( -perm +111 -or -name "*.so*" \) | tr "\n" " "` ; do
+       for file in `find $TMP -type f \( -perm +111 -or -name "*.so*" \) | tr "\n" " "` ; do
                case "`file $file`" in
                        *ELF*)
                                filelist="$file $filelist"
@@ -62,6 +62,6 @@ for PACKAGE in $DH_DOPACKAGES; do
        fi
 
        # Generate and install control file.
-       doit "dpkg-gencontrol -p$PACKAGE -Tdebian/${EXT}substvars -Pdebian/$TMP"
-       doit "chown root.root debian/$TMP/DEBIAN/control"
+       doit "dpkg-gencontrol -p$PACKAGE -Tdebian/${EXT}substvars -P$TMP"
+       doit "chown root.root $TMP/DEBIAN/control"
 done

diff --git a/dh_installdebfiles.1 b/dh_installdebfiles.1
index 924e04b4d682f03c86f11aeea6da37cf4c466a25..429481f402dd776a01a3334b8f7778decb49f16d 100644 (file)
--- a/dh_installdebfiles.1
+++ b/dh_installdebfiles.1
@@ -3,7 +3,7 @@
 dh_installdebfiles \- install files into the DEBIAN directory
 .SH SYNOPSIS
 .B dh_installdebfils
-.I "[-v] [-a] [-i] [-ppackage]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_installdebfiles is a debhelper program that is responsible for installing
 files into the DEBIAN directory in package build directories with the
@@ -49,6 +49,9 @@ Install files for all architecture independent packages.
 .TP
 .B \-ppackage
 Install files for the package named "package".
+.TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
 .SH NOTES
 The
 .B \-a

diff --git a/dh_installdocs b/dh_installdocs
index 3859d34bed62c0290b3e74fafe6a63a521af9d3c..bcc263421d283849a8939938402f4a77a849a241 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -10,8 +10,8 @@ for PACKAGE in $DH_DOPACKAGES; do
        TMP=`tmpdir $PACKAGE`
        EXT=`pkgext $PACKAGE`
 
-       if [ ! -d debian/$TMP/usr/doc/$PACKAGE ]; then
-               doit "install -d debian/$TMP/usr/doc/$PACKAGE"
+       if [ ! -d $TMP/usr/doc/$PACKAGE ]; then
+               doit "install -d $TMP/usr/doc/$PACKAGE"
        fi
 
        docs=""
@@ -25,27 +25,27 @@ for PACKAGE in $DH_DOPACKAGES; do
        fi
 
        if [ "$docs" ]; then
-               doit "cp -a $docs debian/$TMP/usr/doc/$PACKAGE/"
+               doit "cp -a $docs $TMP/usr/doc/$PACKAGE/"
        fi
 
        # Install these files only into the main package by default.
        if [ "$PACKAGE" = "$MAINPACKAGE" ]; then
                if [ -f debian/README.debian ]; then
-                       doit "install -m 644 -p debian/README.debian debian/$TMP/usr/doc/$PACKAGE/"
+                       doit "install -m 644 -p debian/README.debian $TMP/usr/doc/$PACKAGE/"
                fi
                if [ -f debian/README.Debian ]; then
-                       doit "install -m 644 -p debian/README.Debian debian/$TMP/usr/doc/$PACKAGE/"
+                       doit "install -m 644 -p debian/README.Debian $TMP/usr/doc/$PACKAGE/"
                fi
                if [ -f debian/TODO ]; then
                        if [ "$NATIVE" ]; then
-                               doit "install -m 655 -p debian/TODO debian/$TMP/usr/doc/$PACKAGE/TODO"
+                               doit "install -m 655 -p debian/TODO $TMP/usr/doc/$PACKAGE/TODO"
                        else
-                               doit "install -m 644 -p debian/TODO debian/$TMP/usr/doc/$PACKAGE/TODO.Debian"
+                               doit "install -m 644 -p debian/TODO $TMP/usr/doc/$PACKAGE/TODO.Debian"
                        fi
                fi
        fi
 
        if [ -f debian/copyright ]; then
-                       doit "install -m 644 -p debian/copyright debian/$TMP/usr/doc/$PACKAGE/"
+                       doit "install -m 644 -p debian/copyright $TMP/usr/doc/$PACKAGE/"
        fi
 done

diff --git a/dh_installdocs.1 b/dh_installdocs.1
index 4b5f068e23dbd882ff0d7966bd72d83b11c4e496..fc001130e20f7698dd9a8b756ecfdf968656a782 100644 (file)
--- a/dh_installdocs.1
+++ b/dh_installdocs.1
@@ -3,7 +3,7 @@
 dh_installdocs \- install documentation into package build directories
 .SH SYNOPSIS
 .B dh_installdocs
-.I "[-v] [-a] [-i] [-ppackage] [file ...]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [file ...]"
 .SH "DESCRIPTION"
 dh_installdocs is a debhelper program that is responsible for installing
 documentation into usr/doc/package in package build directories.
@@ -35,6 +35,9 @@ Install files for all architecture independent packages.
 .B \-ppackage
 Install files for the package named "package".
 .TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
+.TP
 .B file ...
 Install these files as documentation into the first binary package listed in
 debian/control, if we are acting on that package.

diff --git a/dh_installexamples b/dh_installexamples
index 61ceae20992a775bbe5c34dc1eed073d16a554bf..bc16991aae9808974e5aa33389f31ff1a3ba1ca4 100755 (executable)
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -21,10 +21,10 @@ for PACKAGE in $DH_DOPACKAGES; do
        fi
 
        if [ "$examples" ]; then
-               if [ ! -d debian/$TMP/usr/doc/$PACKAGE/examples ]; then
-                       doit "install -d debian/$TMP/usr/doc/$PACKAGE/examples"
+               if [ ! -d $TMP/usr/doc/$PACKAGE/examples ]; then
+                       doit "install -d $TMP/usr/doc/$PACKAGE/examples"
                fi
 
-               doit "cp -a $examples debian/$TMP/usr/doc/$PACKAGE/examples/"
+               doit "cp -a $examples $TMP/usr/doc/$PACKAGE/examples/"
        fi
 done

diff --git a/dh_installexamples.1 b/dh_installexamples.1
index e7ad6c620e3e35923bf8c9fea289c310d543dccc..5c8ce8c0335bf4fe602b625f5b3c040c5b2ee8bd 100644 (file)
--- a/dh_installexamples.1
+++ b/dh_installexamples.1
@@ -3,7 +3,7 @@
 dh_installexamples \- install example files into package build directories
 .SH SYNOPSIS
 .B dh_installexamples
-.I "[-v] [-a] [-i] [-ppackage] [file ...]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [file ...]"
 .SH "DESCRIPTION"
 dh_installexamples is a debhelper program that is responsible for installing
 examples into usr/doc/package/examples in package build directories.
@@ -29,6 +29,9 @@ Install files for all architecture independent packages.
 .B \-ppackage
 Install files for the package named "package".
 .TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
+.TP
 .B file ...
 Install these files as documentation into the first binary package listed in
 debian/control, if we are acting on that package.

diff --git a/dh_installmanpages b/dh_installmanpages
index 304c3b12110661cfbc936777977aa49f5a17296e..4a0ffb47e49a724263e14ff608ee48b53b24424d 100755 (executable)
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -13,7 +13,7 @@ for PACKAGE in $DH_DOPACKAGES; do
        # Find all filenames that look like man pages.
        # .ex files are examples installed by deb-make, we don't want those, or
        # .in files, which are from configure.
-       for file in `find * -name "*.[1-9]*" ! -name "*.ex" ! -name "*.in" | grep -v ^debian/$TMP`; do
+       for file in `find * -name "*.[1-9]*" ! -name "*.ex" ! -name "*.in" | grep -v ^$TMP`; do
                # Make sure file thinks they are man pages.
                if file $file|grep -q roff; then
                        if echo $file|grep -q /; then
@@ -32,12 +32,12 @@ for PACKAGE in $DH_DOPACKAGES; do
                        done
                        if [ "$install" ]; then
                                SECTION=man`expr $NAME : '.*\.\([123456789]\)'`
-                               if [ ! -e debian/$TMP/usr/man/$SECTION/$NAME -a \
-                                    ! -e debian/$TMP/usr/X11*/man/$SECTION/$NAME ]; then
-                                       if [ ! -d debian/$TMP/usr/man/$SECTION ]; then
-                                               doit "install -d debian/$TMP/usr/man/$SECTION"
+                               if [ ! -e $TMP/usr/man/$SECTION/$NAME -a \
+                                    ! -e $TMP/usr/X11*/man/$SECTION/$NAME ]; then
+                                       if [ ! -d $TMP/usr/man/$SECTION ]; then
+                                               doit "install -d $TMP/usr/man/$SECTION"
                                        fi
-                                       doit "install -p -m644 $file debian/$TMP/usr/man/$SECTION/$NAME"
+                                       doit "install -p -m644 $file $TMP/usr/man/$SECTION/$NAME"
                                fi
                        fi
                fi

diff --git a/dh_installmanpages.1 b/dh_installmanpages.1
index bb08181bcf20b85dc091a84f07dadf432a68b116..067940446349b8d24c80914241be211596776431 100644 (file)
--- a/dh_installmanpages.1
+++ b/dh_installmanpages.1
@@ -3,7 +3,7 @@
 dh_installmanpages \- install man pages into package build directories
 .SH SYNOPSIS
 .B dh_installmanpages
-.I "[-v] [-a] [-i] [-ppackage] [file ...]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [file ...]"
 .SH "DESCRIPTION"
 dh_installmanpages is a debhelper program that is responsible for
 automatically installing man pages into usr/man/ and usr/X11R6/man/ in
@@ -32,6 +32,9 @@ Install man pages into all architecture independent packages.
 .B \-ppackage
 Install man pages into the package named "package".
 .TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
+.TP
 .B file ...
 Do not install these files as man pages, even if they look like valid man
 pages.

diff --git a/dh_installmenu b/dh_installmenu
index c837e04f5d4f3953d591bdfd84f9b134483f16c3..5071a2f3a2760d7e3e142a7e4f64012831b550cb 100755 (executable)
--- a/dh_installmenu
+++ b/dh_installmenu
@@ -2,9 +2,9 @@
 #
 # Integration with debian menu system:
 #
-# If debian/menu file exists, save it to debian/$TMP/usr/lib/menu/$PACKAGE
+# If debian/menu file exists, save it to $TMP/usr/lib/menu/$PACKAGE
 # If debian/menu-method file exists, save it to 
-# debian/$TMP/etc/menu-methods/$PACKAGE
+# $TMP/etc/menu-methods/$PACKAGE
 #
 # Also, add to postinst and postrm.
 
@@ -16,10 +16,10 @@ for PACKAGE in $DH_DOPACKAGES; do
        EXT=`pkgext $PACKAGE`
 
        if [ -e debian/${EXT}menu ]; then
-               if [ ! -d debian/$TMP/usr/lib/menu ]; then
-                       doit "install -d debian/$TMP/usr/lib/menu"
+               if [ ! -d $TMP/usr/lib/menu ]; then
+                       doit "install -d $TMP/usr/lib/menu"
                fi
-               doit "install -p -m644 debian/${EXT}menu debian/$TMP/usr/lib/menu/$PACKAGE"
+               doit "install -p -m644 debian/${EXT}menu $TMP/usr/lib/menu/$PACKAGE"
 
                # Add the scripts if a menu-method file doesn't exist.
                # The scripts for menu-method handle everything these do, too.
@@ -30,10 +30,10 @@ for PACKAGE in $DH_DOPACKAGES; do
        fi
 
        if [ -e debian/${EXT}menu-method ]; then
-               if [ ! -d debian/$TMP/etc/menu-methods ]; then
-                       doit "install -d debian/$TMP/etc/menu-methods"
+               if [ ! -d $TMP/etc/menu-methods ]; then
+                       doit "install -d $TMP/etc/menu-methods"
                fi
-               doit "install -p debian/${EXT}menu-method debian/$TMP/etc/menu-methods/$PACKAGE"
+               doit "install -p debian/${EXT}menu-method $TMP/etc/menu-methods/$PACKAGE"
 
                if [ ! "$DH_NOSCRIPTS" ]; then
                        autoscript "postinst" "postinst-menu-method" "s/#PACKAGE#/$PACKAGE/"

diff --git a/dh_installmenu.1 b/dh_installmenu.1
index e26c84e58ad6f014981a007db6d15cb5bcbf0a82..b5337f3004a910fdf8169f6c663aec58b55b9da3 100644 (file)
--- a/dh_installmenu.1
+++ b/dh_installmenu.1
@@ -3,7 +3,7 @@
 dh_installmenu \- install debian menu files into package build directories
 .SH SYNOPSIS
 .B dh_installmenu
-.I "[-v] [-a] [-i] [-ppackage]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_installmenu is a debhelper program that is responsible for installing
 fils used by the debian menu package into package build directories. 
@@ -40,6 +40,9 @@ Install menu files into the package named "package".
 .TP
 .B \-n
 Do not automatically generate code.
+.TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
 .SH NOTES
 The
 .B \-a

diff --git a/dh_lib b/dh_lib
index 1cc7e308a7e3c11ab2b1ae0bc51ddb754f2b7291..c2dd9777b8ee76d0ce53931429378bdf448e76c0 100644 (file)
--- a/dh_lib
+++ b/dh_lib
@@ -1,7 +1,7 @@
 # Library functions for debhelper programs.
 
 # Run a command, and display the command to stdout if verbose mode is on.
-# All commands that modifiy files in debian/$TMP should be ran via this 
+# All commands that modifiy files in $TMP should be ran via this 
 # function.
 # Unfortunatly, this function doesn't work if your command uses redirection,
 # you will have to call verbose_echo by hand then.
@@ -24,13 +24,15 @@ error() {
 }
 
 # Pass it a name of a binary package, it returns the name of the tmp dir to
-# use, for that package, relative to debian/
+# use, for that package.
 # This is for back-compatability with the debian/tmp tradition.
 tmpdir() {
-       if [ "$1" = "$MAINPACKAGE" ]; then
-               echo tmp
+       if [ "$DH_TMPDIR" ]; then
+               echo "$DH_TMPDIR"
+       elif [ "$1" = "$MAINPACKAGE" ]; then
+               echo debian/tmp
        else
-               echo "$PACKAGE"
+               echo "debian/$PACKAGE"
        fi
 }
 
@@ -77,7 +79,7 @@ autoscript() {
 # Argument processing and global variable initialization is below.
 
 # Parse command line.
-set -- `getopt xvianp: $*`
+set -- `getopt xvianp:P: $*`
 
 for i; do
        case "$i"
@@ -107,6 +109,11 @@ for i; do
                        DH_EXCLUDE=1
                        shift
                        ;;
+               -P)
+                       DH_TMPDIR="$2"
+                       shift
+                       shift
+                       ;;
                --)
                        shift
                        break
@@ -172,3 +179,9 @@ if [ ! "$DH_DOPACKAGES" -o "$DH_DOPACKAGES" = " " ]; then
        fi
        DH_DOPACKAGES=`grep ^Package: debian/control | cut -d " " -f 2`
 fi
+
+# Check to see if -P was specified. If so, we can only act on a single
+# package.
+if [ "$DH_TMPDIR" ] && echo "$DH_DOPACKAGES" | grep -q " "; then
+       error "-P was specified, but multiple packages would be acted on."
+fi

diff --git a/dh_makeshlibs b/dh_makeshlibs
index a09e26f69f2dcb9c414e5092e0b9152c6409071f..f1ab8899f3712b1cf99a5fcd781501e2bed7fac4 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -8,23 +8,23 @@ PATH=debian:$PATH:/usr/lib/debhelper
 for PACKAGE in $DH_DOPACKAGES; do
        TMP=`tmpdir $PACKAGE`
 
-       if [ -e "debian/$TMP/DEBIAN/shlibs" ]; then
-               error "debian/$TMP/DEBIAN/shlibs already exists."
+       if [ -e "$TMP/DEBIAN/shlibs" ]; then
+               error "$TMP/DEBIAN/shlibs already exists."
        fi
 
-       for file in `find debian/$TMP -type f -name "*.so*" | tr "\n" " "` ; do
+       for file in `find $TMP -type f -name "*.so*" | tr "\n" " "` ; do
                LIBRARY=`expr $file : ".*/\(.*\)\.so\..*"` || true
                VERSION=`expr $file : ".*/.*\.so\.\(.*\)"` || true
                MAJOR=`expr $VERSION : "\([0-9]*\)\."` || true
                LIBSTUB=`expr $file : "\(.*\/.*\.so\)\..*"` || true
-               if [ ! -d "debian/$TMP/DEBIAN" ] ; then
-                       doit "install -d debian/$TMP/DEBIAN"
+               if [ ! -d "$TMP/DEBIAN" ] ; then
+                       doit "install -d $TMP/DEBIAN"
                fi
-               verbose_echo "echo \"$LIBRARY $MAJOR $PACKAGE\" >>debian/$TMP/DEBIAN/shlibs"
-               echo "$LIBRARY $MAJOR $PACKAGE" >>debian/$TMP/DEBIAN/shlibs
+               verbose_echo "echo \"$LIBRARY $MAJOR $PACKAGE\" >>$TMP/DEBIAN/shlibs"
+               echo "$LIBRARY $MAJOR $PACKAGE" >>$TMP/DEBIAN/shlibs
        done
 
-       if [ -e "debian/$TMP/DEBIAN/shlibs" ]; then
-               doit "chown root.root debian/$TMP/DEBIAN/shlibs"
+       if [ -e "$TMP/DEBIAN/shlibs" ]; then
+               doit "chown root.root $TMP/DEBIAN/shlibs"
        fi
 done

diff --git a/dh_makeshlibs.1 b/dh_makeshlibs.1
index 51ba8feeed2b9a12d13640f71d773383781b7328..e4296e47dd3c1be7b14f6c160056ac3c5916b0a5 100644 (file)
--- a/dh_makeshlibs.1
+++ b/dh_makeshlibs.1
@@ -3,7 +3,7 @@
 dh_makeshlibs \- automatically create shlibs file
 .SH SYNOPSIS
 .B dh_makeshlibs
-.I "[-v] [-a] [-i] [-ppackage]"
+.I "[-v] [-a] [-i] [-Ptmpdir] [-ppackage]"
 .SH "DESCRIPTION"
 dh_makeshlibs is a debhelper program that automatically scans for shared
 libraries, and generates a shlibs file for the libraries it finds.
@@ -23,6 +23,9 @@ Generate shlibs files for all architecture independent packages.
 .TP
 .B \-ppackage
 Generate shlibs file for the package named "package".
+.TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
 .SH NOTES
 The
 .B \-a

diff --git a/dh_md5sums b/dh_md5sums
index 5400bad97c8a08e69b1de0f3fb462174dd8ec65e..f71ab5294b12b632b5b8e44c025589f4b96a2305 100755 (executable)
--- a/dh_md5sums
+++ b/dh_md5sums
@@ -9,21 +9,21 @@ PATH=debian:$PATH:/usr/lib/debhelper
 for PACKAGE in $DH_DOPACKAGES; do
        TMP=`tmpdir $PACKAGE`
 
-       if [ ! -d "debian/$TMP/DEBIAN" ]; then
-               doit "install -d debian/$TMP/DEBIAN"
+       if [ ! -d "$TMP/DEBIAN" ]; then
+               doit "install -d $TMP/DEBIAN"
        fi
 
        # Doit isn't smart enough to hande this next command so echo by hand. (sigh)
-       verbose_echo 'find debian/$TMP/* -type f ! -regex "^debian/$TMP/DEBIAN/.*" | sed s:debian/$TMP/:: | sort > debian/$TMP/DEBIAN/allfiles'
-       find debian/$TMP/* -type f ! -regex "^debian/$TMP/DEBIAN/.*" | sed s:debian/$TMP:: | sort > debian/$TMP/DEBIAN/allfiles
+       verbose_echo 'find $TMP/* -type f ! -regex "^$TMP/DEBIAN/.*" | sed s:$TMP/:: | sort > $TMP/DEBIAN/allfiles'
+       find $TMP/* -type f ! -regex "^$TMP/DEBIAN/.*" | sed s:$TMP:: | sort > $TMP/DEBIAN/allfiles
        # Check if we should exclude conffiles.
-       if [ ! "$DH_EXCLUDE" -a -r debian/$TMP/DEBIAN/conffiles ]; then
-               verbose_echo "sort debian/$TMP/DEBIAN/conffiles | comm -13 - debian/$TMP/DEBIAN/allfiles > debian/$TMP/DEBIAN/allfiles.new"
-               sort debian/$TMP/DEBIAN/conffiles | comm -13 - debian/$TMP/DEBIAN/allfiles > debian/$TMP/DEBIAN/allfiles.new
-               doit "mv debian/$TMP/DEBIAN/allfiles.new debian/$TMP/DEBIAN/allfiles"
+       if [ ! "$DH_EXCLUDE" -a -r $TMP/DEBIAN/conffiles ]; then
+               verbose_echo "sort $TMP/DEBIAN/conffiles | comm -13 - $TMP/DEBIAN/allfiles > $TMP/DEBIAN/allfiles.new"
+               sort $TMP/DEBIAN/conffiles | comm -13 - $TMP/DEBIAN/allfiles > $TMP/DEBIAN/allfiles.new
+               doit "mv $TMP/DEBIAN/allfiles.new $TMP/DEBIAN/allfiles"
        fi
-       verbose_echo "cd debian/$TMP ; sed 's:^/::' < DEBIAN/allfiles | xargs md5sum > DEBIAN/md5sums ; cd ../.."
-       cd debian/$TMP ; sed 's:^/::' < DEBIAN/allfiles | xargs md5sum > DEBIAN/md5sums ; cd ../..
-       doit "chown root.root debian/$TMP/DEBIAN/md5sums"
-       doit "rm -f debian/$TMP/DEBIAN/allfiles"
+       verbose_echo "cd $TMP ; sed 's:^/::' < DEBIAN/allfiles | xargs md5sum > DEBIAN/md5sums ; cd ../.."
+       cd $TMP ; sed 's:^/::' < DEBIAN/allfiles | xargs md5sum > DEBIAN/md5sums ; cd ../..
+       doit "chown root.root $TMP/DEBIAN/md5sums"
+       doit "rm -f $TMP/DEBIAN/allfiles"
 done

diff --git a/dh_md5sums.1 b/dh_md5sums.1
index a54c1c15a5319b797865031be825e1d5eda288dd..28f7fe4528df900ee521c3de9e15ec5fb28471e2 100644 (file)
--- a/dh_md5sums.1
+++ b/dh_md5sums.1
@@ -3,7 +3,7 @@
 dh_md5sums \- generate DEBIAN/md5sums file
 .SH SYNOPSIS
 .B dh_md5sums
-.I "[-x] [-v] [-a] [-i] [-ppackage]"
+.I "[-x] [-v] [-a] [-i] [-Ptmpdir] [-ppackage]"
 .SH "DESCRIPTION"
 dh_md5sums is a debhelper program that is responsible for generating
 a DEBIAN/md5sums file, which lists the md5sums of each file in the package.
@@ -29,6 +29,9 @@ Generate md5sums file for the package named "package".
 .B \-x
 Include conffiles in the md5sums list. Note that this is redundant, and
 included elsewhere in debian packages.
+.TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
 .SH NOTES
 The
 .B \-a

diff --git a/dh_strip b/dh_strip
index 77d670a6ad9af7517eeb2ff00ceddede6996109e..57725d7015fff9ddf48d7dbf169ca6b107ea2fdc 100755 (executable)
--- a/dh_strip
+++ b/dh_strip
@@ -9,7 +9,7 @@ for PACKAGE in $DH_DOPACKAGES; do
        TMP=`tmpdir $PACKAGE`
        
        # Handle executables and shared libraries.
-       for file in `find debian/$TMP -type f \( -perm +111 -or -name "*.so*" \) 2>/dev/null` ; do
+       for file in `find $TMP -type f \( -perm +111 -or -name "*.so*" \) 2>/dev/null` ; do
                case "`file $file`" in
                        *ELF*shared*)
                                doit "strip --strip-unneeded $file"
@@ -21,7 +21,7 @@ for PACKAGE in $DH_DOPACKAGES; do
        done
 
        # Handle static libraries.
-       for file in `find debian/$TMP -type f -name "lib*.a" 2>/dev/null` ; do
+       for file in `find $TMP -type f -name "lib*.a" 2>/dev/null` ; do
                # Don't strip debug libraries.
                if ! expr "$file" : ".*_g\.a" >/dev/null ; then
                        doit "strip --strip-debug $file"

diff --git a/dh_strip.1 b/dh_strip.1
index 2eba991498693a793b718113a5cfbfc4ef8565c9..fa3c76943447de49db306fc70aae1239db3566e2 100644 (file)
--- a/dh_strip.1
+++ b/dh_strip.1
@@ -3,7 +3,7 @@
 dh_strip \- strip executables, shared libraries, and some static libraries.
 .SH SYNOPSIS
 .B dh_strip
-.I "[-v] [-a] [-i] [-ppackage]"
+.I "[-v] [-a] [-i] [-Ptmpdir] [-ppackage]"
 .SH "DESCRIPTION"
 dh_strip is a debhelper program that is responsible for stripping
 executables, shared libraries, and static libraries that are not used for
@@ -25,6 +25,9 @@ pointless :-).
 .TP
 .B \-ppackage
 Strip files for the package named "package".
+.TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
 .SH NOTES
 The
 .B \-a

diff --git a/dh_suidregister b/dh_suidregister
index 4ca72a1cf0ab97491720ec8bad1c048cc3fa7936..e03379f661ab985f62c5451995150b28181c64ce 100755 (executable)
--- a/dh_suidregister
+++ b/dh_suidregister
@@ -26,11 +26,11 @@ for PACKAGE in $DH_DOPACKAGES; do
        if [ ! "$files" -a ! -e debian/${EXT}suid ]; then
                # No files specified (and no empty debian/suid file), so
                # guess what files to process.
-               files=`find debian/$TMP -type f -perm +6000`
+               files=`find $TMP -type f -perm +6000`
 
                # We will strip the debian working directory off of the
                # filenames.
-               tostrip="debian/$TMP/"
+               tostrip="$TMP/"
        else
                # We will strip leading /'s, so the user can feed this
                # program either absolute filenames, or relative filenames,
@@ -49,7 +49,7 @@ for PACKAGE in $DH_DOPACKAGES; do
                        # Create the sed string that will be used to 
                        # fill in the blanks in the autoscript files.
                        # Fill with the owner, group, and perms of the file.
-                       sedstr=`find debian/$TMP/$file -printf "s:#FILE#:$file:;s/#PACKAGE#/$PACKAGE/;s/#OWNER#/%u/;s/#GROUP#/%g/;s/#PERMS#/%m/"`
+                       sedstr=`find $TMP/$file -printf "s:#FILE#:$file:;s/#PACKAGE#/$PACKAGE/;s/#OWNER#/%u/;s/#GROUP#/%g/;s/#PERMS#/%m/"`
                        
                        autoscript "postinst" "postinst-suid" "$sedstr"
                        autoscript "postrm" "postrm-suid" "$sedstr"

diff --git a/dh_suidregister.1 b/dh_suidregister.1
index e15e6d5f49fa406ac05d7fc221a18ce927d1548b..97dcb24be620284a383ff52ae54263fec4367dfa 100644 (file)
--- a/dh_suidregister.1
+++ b/dh_suidregister.1
@@ -3,7 +3,7 @@
 dh_suidregister \- set up package to register files with suidregister
 .SH SYNOPSIS
 .B dh_suidregister
-.I "[-v] [-a] [-i] [-ppackage] [file ...]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [file ...]"
 .SH "DESCRIPTION"
 dh_suidregister is a debhelper program that is responsible for modifying the
 postinst and postrm scripts of a package so the package will register files
@@ -39,6 +39,9 @@ Register files for all architecture independent packages.
 .B \-ppackage
 Register files for the package named "package".
 .TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
+.TP
 .B file ...
 Register these files in the first binary package listed in debian/control, 
 if we are acting on that package.

diff --git a/dh_undocumented b/dh_undocumented
index ebde890499f98455cb835893e8fa921c97a92478..fe1dbf2d7102dcf380a7f80d25d9a211899929b6 100755 (executable)
--- a/dh_undocumented
+++ b/dh_undocumented
@@ -41,11 +41,11 @@ for PACKAGE in $DH_DOPACKAGES; do
                                reldir=..
                        fi
 
-                       if [ ! -d debian/$TMP/$dir ]; then
-                               doit "install -d debian/$TMP/$dir"
+                       if [ ! -d $TMP/$dir ]; then
+                               doit "install -d $TMP/$dir"
                        fi
 
-                       doit ln -s $reldir/man7/undocumented.7.gz debian/$TMP/$dir/$file.gz
+                       doit ln -s $reldir/man7/undocumented.7.gz $TMP/$dir/$file.gz
                done
        fi
 done

diff --git a/dh_undocumented.1 b/dh_undocumented.1
index ab45baad0ac60083a1e4b6537dd19c856e3d8464..d6ec21bf9d0c7c2b8cebc72a98a60c656ec9aa15 100644 (file)
--- a/dh_undocumented.1
+++ b/dh_undocumented.1
@@ -3,7 +3,7 @@
 dh_undocumented \- make symlinks to undocumented.7 man page
 .SH SYNOPSIS
 .B dh_undocumented
-.I "[-v] [-a] [-i] [-ppackage] [manpage ...]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [manpage ...]"
 .SH "DESCRIPTION"
 dh_undocumented is a debhelper program that is responsible for making
 symlinks to the
@@ -42,6 +42,9 @@ Install undocumented man page symlinks for all architecture independent packages
 .B \-ppackage
 Install undocumented man page symlinks for the package named "package".
 .TP
+.B \-Ptmpdir
+Use "tmpdir" for package build directory. 
+.TP
 .B manpage ...
 Install undocumented man page symlinks for each of these man pages
 into the first binary package listed in debian/control, if we are acting on