r38: Initial Import

diff --git a/TODO b/TODO
index 5ed6f9bbb5dab0b3b84ccd74e7d9e35794a0b6e0..3118ab951b8877211f1b9663ddf6eb6009464cc7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,3 +4,5 @@
 * add a dh_debstd, which mimics debstd, but uses debhelper tools internally.
 * dh_du: change it so it doesn't grep for things with tabs in them. That's
   nasty. (and makes cut-and-paste from dh_du -v not work).
+* dh_compress: add --exclude "*.conf" type-thingy
+* info support for debhelper

diff --git a/debian/changelog b/debian/changelog
index 96c4971bf79cbffe6605de2d375d9e6364327e25..f739f89b65dff5950e5b8639a186c3aa7c2302da 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debhelper (0.32) unstable; urgency=low
+
+  * Split dh_installdebfiles into 3 programs (dh_installdeb, dh_shlibdeps,
+    and dh_gencontrol). dh_installdebfiles still works, but is depricated.
+  * Added an examples/rules.indep file.
+  * examples/rules.multi: changed dh_du -a to dh_du -i in binary-indep
+    section.
+
+ -- Joey Hess <joeyh@master.debian.org>  Wed, 10 Dec 1997 19:53:13 -0500
+
 debhelper (0.31) unstable; urgency=low
 
   * Fixed man page typos #15685.

diff --git a/debian/rules b/debian/rules
index e2d4da03074aec910c6fc941b8e1dff4d0b178c9..8a240f9b5b1418a4ecda94838b5b997eca1d2920 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,9 @@ binary-indep: build
        ./dh_compress
        ./dh_fixperms
        ./dh_suidregister
-       ./dh_installdebfiles
+       ./dh_installdeb
+       ./dh_shlibdeps
+       ./dh_gencontrol
        ./dh_du
        ./dh_md5sums
        ./dh_builddeb

diff --git a/dh_clean b/dh_clean
index b170494b530740219f0989fa8c723c106f90447d..6306adda1c9ba34be40a8206337f7ee582cd0046 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -12,11 +12,15 @@ for PACKAGE in $DH_DOPACKAGES; do
        doit "rm -rf $TMP"
        doit "rm -f debian/${EXT}substvars"
 done
-doit "rm -f debian/files* debian/*.debhelper $*"
+doit "rm -f debian/*.debhelper $*"
+if [ ! "$DH_K_FLAG" ]; then
+       doit "rm -f debian/files*"
+fi
 
 # Remove other temp files.
 # Use complex_doit so we can properly escape things.
-complex_doit "find . \( -name '#*#' -o -name '*~' -o -name DEADJOE -o -name '*.orig' \
-       -o -name '*.rej' -o -name '*.bak' -o -name '.*.orig' \
-       -o -name '.*.rej' -o -name .SUMS -o -name TAGS -o -name core \
+complex_doit "find . \( -name '#*#' -o -name '*~' -o -name DEADJOE \
+       -o -name '*.orig' -o -name '*.rej' -o -name '*.bak' \
+       -o -name '.*.orig' -o -name '.*.rej' -o -name .SUMS \
+       -o -name TAGS -o -name core \
        \) -exec rm -f {} \;"

diff --git a/dh_installdeb b/dh_installdeb
index 43aca90273e14f2d536ce0275012542082a54495..d9e1e7b37ee65a5fc8f38aa83299b3032abb4d43 100755 (executable)
--- a/dh_installdeb
+++ b/dh_installdeb
@@ -17,14 +17,17 @@ for PACKAGE in $DH_DOPACKAGES; do
        # If any .debhelper files exist, add them into the scripts.
        for file in postinst preinst prerm postrm; do
                if [ -f debian/$EXT$file ]; then
-                       # Add this into the script, where it has #DEBHELPER#
                        if [ -f debian/$EXT$file.debhelper ]; then
+                               # Add this into the script, where it has
+                               # #DEBHELPER#
                                complex_doit "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 $TMP/DEBIAN/$file"
+                               # Just get rid of any #DEBHELOPER# in the 
+                               # script.
+                               complex_doit "sed s/#DEBHELPER#// < debian/$EXT$file > $TMP/DEBIAN/$file"
                        fi
+                       doit "chown root.root $TMP/DEBIAN/$file"
+                       doit "chmod 755 $TMP/DEBIAN/$file"
                else
                        # Auto-generate script header and add .debhelper
                        # content to it.

diff --git a/dh_installdebfiles.1 b/dh_installdebfiles.1
index 8b34b910de96af09cd9a8031fae45dc268e442b6..0240f9383f9ce417ed83f3a7ad36109aba00503d 100644 (file)
--- a/dh_installdebfiles.1
+++ b/dh_installdebfiles.1
@@ -3,70 +3,27 @@
 dh_installdebfiles \- install files into the DEBIAN directory
 .SH SYNOPSIS
 .B dh_installdebfiles
-.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
-correct permissions.
+correct permissions, canculating shared library dependancies, and creating a
+control file.
 .P
-dh_installdocs automatically installs the following files from debian/ into
-the DEBIAN directory:
-.IP postinst
-.IP preinst
-.IP postrm
-.IP prerm
-.IP shlibs
-.IP conffiles
+This program is depricated. It is now merely a wrapper around three other
+programs, and you may replace any calls to this program by:
 .P
-(For packages other than the first binary package listed in debian/control,
-prefix these filenames with then name of the "package.", for example, 
-"foo.postinst".)
-.P
-The files postinst, preinst, postrm, and prerm are handled specially: If a
-corresponding file named debian/script.debhelper exists, the contents of that 
-file are merged into the script as follows: If the script exists, then 
-anywhere in it that "#DEBHELPER#" appears, the text of the .debhelper file is
-inserted. If the script does not exist, then a script is generated from 
-the .debhelper file. The .debhelper files are created by other debhelper 
-programs, such as 
-.BR dh_installmenu (1)
-, and are shell scripts.
-.P
-In addition, it will generate a DEBIAN/control file, by running
-.BR dpkg-shlibdeps (1)
-and
-.BR dpkg-gencontrol (1)
+  dh_installdeb
+  dh_shlibdeps
+  dh_gencontrol
+.SH WARNING
+This program will be removed at some time in the furture.
 .SH OPTIONS
-.TP
-.B \-v
-Verbose mode; show all commands that modify the package build directory.
-.TP
-.B \-a
-Install files for all architecture dependent packages.
-.TP
-.B \-i
-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
-.B \-i
-and
-.B \-p
-arguments are cumulative. If none are specified, then all packages listed in
-the control file will be effected.
-.SH ENVIRONMENT
-.TP
-.I DH_VERBOSE
-Enables verbose mode
+Any options passed to this program will be sent to each of the 3 programs
+listed above.
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
-.SH "CONFORMS TO"
-Debian policy, version 2.3.0.0
+.BR dh_installdeb (1)
+.BR dh_shlibdeps (1)
+.BR dh_gencontrol (1)
 .SH AUTHOR
 Joey Hess <joeyh@master.debian.org>

diff --git a/dh_installmenu.1 b/dh_installmenu.1
index abbff8defe8b66e5d5dd1f8f24766b35868be702..11bc71b8f52ce8e3567ea9271991b3af4391d40b 100644 (file)
--- a/dh_installmenu.1
+++ b/dh_installmenu.1
@@ -10,7 +10,7 @@ files used by the debian menu package into package build directories.
 .P
 It also automatically generates the postinst and postrm commands needed to 
 interface with the debian menu package. See 
-.BR dh_installdebfiles (1)
+.BR dh_installdeb (1)
 for an explanation of how this works.
 .P
 If a file named debian/menu exists, then it is installed into

diff --git a/dh_lib b/dh_lib
index 4c8c68c6f95588e4862e57c1ebb86765936940f9..388b7f72dbb9da5b6f23ed4db8cd57ff7f430361 100644 (file)
--- a/dh_lib
+++ b/dh_lib
@@ -82,7 +82,7 @@ autoscript() {
 # Argument processing and global variable initialization is below.
 
 # Parse command line.
-set -- `getopt xvidrnap:P:u: $*`
+set -- `getopt xvidrnakp:P:u: $*`
 
 for i; do
        case "$i"
@@ -120,6 +120,10 @@ for i; do
                        DH_R_FLAG=1
                        shift
                        ;;
+               -k)
+                       DH_K_FLAG=1
+                       shift
+                       ;;
                -P)
                        DH_TMPDIR="$2"
                        shift

diff --git a/dh_suidregister.1 b/dh_suidregister.1
index c69f61285be75fe7b3824c4165e7bac39e2dac7e..b66c21405f0f299d6bdbe9b258784cb12065d774 100644 (file)
--- a/dh_suidregister.1
+++ b/dh_suidregister.1
@@ -23,7 +23,7 @@ scan the package build directory for files that have suid permissions, and
 will automatically register all files it finds.
 .P
 Note that this package modifies your postinst and postrm files. See
-.BR dh_installdebfiles (1)
+.BR dh_installdeb (1)
 for an explanation of how this works.
 .SH OPTIONS
 .TP

diff --git a/examples/rules b/examples/rules
index 87692ccde317bb026bf4d9f6618009b9107ee4c5..105d91c03ddb74af81f308111ecc689229131a99 100755 (executable)
--- a/examples/rules
+++ b/examples/rules
@@ -27,10 +27,10 @@ binary-indep: build
 binary-arch: build
        dh_testdir
        dh_testroot
-       dh_clean
+       dh_clean -k
        dh_installdirs
        # Add here commands to install the files into debian/tmp
-       #$(MAKE) PREFIX=debian/tmp install
+       #$(MAKE) prefix=`pwd`/debian/tmp install
        dh_installdocs
        dh_installexamples
        dh_installmenu

diff --git a/examples/rules.indep b/examples/rules.indep
index a257a1971a33d44b1414d746208279a24727fcf1..5bd756dece32f4ff564deb35cef0994cfd04ef25 100755 (executable)
--- a/examples/rules.indep
+++ b/examples/rules.indep
@@ -24,10 +24,10 @@ clean:
 binary-indep: build
        dh_testdir
        dh_testroot
-       dh_clean
+       dh_clean -k
        dh_installdirs
         # Add here commands to install the files into debian/tmp
-        #$(MAKE) PREFIX=debian/tmp install
+        #$(MAKE) prefix=`pwd`/debian/tmp install
        dh_installdocs
        dh_installexamples
        dh_installmenu

diff --git a/examples/rules.multi b/examples/rules.multi
index f0bd78a667084fef9e149eea0a11cbeb18e932fd..eceee3508057597e64ecb8be7a961385872aa76a 100755 (executable)
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -26,10 +26,10 @@ clean:
 binary-indep: build
        dh_testdir -i
        dh_testroot -i
-       dh_clean -i
+       dh_clean -i -k
        dh_installdirs -i
         # Add here commands to install the files into debian/tmp
-        #$(MAKE) PREFIX=debian/tmp install
+        #$(MAKE) prefix=`pwd`/debian/tmp install
        dh_installdocs -i
        dh_installexamples -i
        dh_installmenu -i
@@ -51,10 +51,10 @@ binary-indep: build
 binary-arch: build
        dh_testdir -a
        dh_testroot -a
-       dh_clean -a
+       dh_clean -a -k
        dh_installdirs -a
        # Add here commands to install the files into debian/tmp
-       #$(MAKE) PREFIX=debian/tmp install
+       #$(MAKE) prefix=`pwd`/debian/tmp install
        dh_installdocs -a
        dh_installexamples -a
        dh_installmenu -a