r49: Initial Import

diff --git a/debian/changelog b/debian/changelog
index ea45ec9dc690cacd78ff3b4ea5d6f851efbfd828..3a5a920000e62dff948cbb7d42f888a07257ab36 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+debhelper (0.54) unstable; urgency=low
+
+  * dh_lib: no longer call getopt(1) to parse options. I wrote my own
+    argument processor in perl.
+  * Added long versions of all arguments. TODO: document them.
+  * All parameters may now be passed values that include whitespace (ie,
+    dh_installinit -u"defaults 10")
+  * Now depends on perl (needs Getopt::Long).
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat, 10 Jan 1998 15:44:09 -0500
+
 debhelper (0.53) unstable; urgency=low
 
   * dh_installmanpages: ignore all man pages installed into debian/tmp

diff --git a/dh_clean b/dh_clean
index ba20e3ea8ad9e4c67d6edeaae1c7622142787397..73fb88f05bdfb114484b784db5eebda8eae6cea6 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -10,7 +10,7 @@ for PACKAGE in $DH_DOPACKAGES; do
        TMP=`tmpdir $PACKAGE`
        substvars=`pkgfile $PACKAGE substvars`
        if [ "$substvars" ]; then
-               doit "rm -f debian/$substvars"
+               doit "rm -f $substvars"
        fi
        doit "rm -rf $TMP"
 done

diff --git a/dh_clean.1 b/dh_clean.1
index 5d9180a962372058359864f5c61664dc4795ef21..f4f14c5af7c678ed785c7e27adf17b2cbdf5af23 100644 (file)
--- a/dh_clean.1
+++ b/dh_clean.1
@@ -11,22 +11,22 @@ other files, such as debian/substvars, debian/files, DEADJOE, emacs backup
 files, etc.
 .SH OPTIONS
 .TP
-.B \-v
+.B \-v, \--verbose
 Verbose mode; show all commands that modify the package build directory.
 .TP
-.B \-a
+.B \-a, \--arch
 Clean up the package build directory for all architecture dependent packages.
 .TP
-.B \-i
+.B \-i, \--indep
 Clean up the package build directory for all architecture independent packages.
 .TP
-.B \-ppackage
+.B \-ppackage, \--package=package
 Clean up the package build directory for the package named "package".
 .TP
-.B \-Ptmpdir
+.B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory.
 .TP
-.B \-k
+.B \-k, \--keep
 Do not delete debian/files. When do you want to use this? Anytime you have a
 debian/rules that has 2 binary targets that build different .deb packages;
 for example, one target is binary-arch, and the other is binary-indep, or

diff --git a/dh_compress.1 b/dh_compress.1
index ce8f539a0aedcbca56df57266493f400b1be7894..9e23a8f0784642b7f97712b81e80c96f605a2a48 100644 (file)
--- a/dh_compress.1
+++ b/dh_compress.1
@@ -31,19 +31,19 @@ customization of what files are compressed:
        ! -name "copyright"
 .SH OPTIONS
 .TP
-.B \-v
+.B \-v, \--verbose
 Verbose mode; show all commands that modify the package build directory.
 .TP
-.B \-a
+.B \-a, \--arch
 Compress files for all architecture dependent packages.
 .TP
-.B \-i
+.B \-i, \--indep
 Compress files for all architecture independent packages.
 .TP
-.B \-ppackage
+.B \-ppackage, \--package=package
 Compress files for the package named "package".
 .TP
-.B \-Ptmpdir
+.B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
 .SH NOTES
 The

diff --git a/dh_du.1 b/dh_du.1
index 315d0b98728585ebabf6c321df45035885c64d48..41bd1c4362a1ba43d8209a43640f62279c207e37 100644 (file)
--- a/dh_du.1
+++ b/dh_du.1
@@ -13,19 +13,19 @@ debian installer program.
 The du file is installed with proper permissions and ownerships.
 .SH OPTIONS
 .TP
-.B \-v
+.B \-v, \--verbose
 Verbose mode; show all commands that modify the package build directory.
 .TP
-.B \-a
+.B \-a, \--arch
 Generate du files for all architecture dependent packages.
 .TP
-.B \-i
+.B \-i, \--indep
 Generate du files for all architecture independent packages.
 .TP
-.B \-ppackage
+.B \-ppackage, \--package=package
 Generate du file for the package named "package".
 .TP
-.B \-Ptmpdir
+.B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
 .SH NOTES
 The

diff --git a/dh_fixperms.1 b/dh_fixperms.1
index 1fac26c3630c3f5610862ed9cb23b9318e0d8fb2..316644d6b79ba94ba2c3633713d86d8a217ba06a 100644 (file)
--- a/dh_fixperms.1
+++ b/dh_fixperms.1
@@ -15,19 +15,19 @@ root, and it removes group and other write permission from all files.
 Finally, it removes execute permissions from any libraries that have it set.
 .SH OPTIONS
 .TP
-.B \-v
+.B \-v, \--verbose
 Verbose mode; show all commands that modify the package build directory.
 .TP
-.B \-a
+.B \-a, \--arch
 Fix permissions for all architecture dependent packages.
 .TP
-.B \-i
+.B \-i, \--indep
 Fix permissions for all architecture independent packages.
 .TP
-.B \-ppackage
+.B \-ppackage, \--package=package
 Fix permissions for the package named "package".
 .TP
-.B \-Ptmpdir
+.B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
 .SH NOTES
 The

diff --git a/dh_installdirs.1 b/dh_installdirs.1
index 56c641b39190c60e992bb66e7a7ed34015cac1dc..0c6aaa54a17fed888b812707c3f29d57fed73e69 100644 (file)
--- a/dh_installdirs.1
+++ b/dh_installdirs.1
@@ -21,22 +21,22 @@ Be sure to only use directory names relative to the package build
 directory. Ie, "/usr/bin" should not be used, use "usr/bin" instead.
 .SH OPTIONS
 .TP
-.B \-v
+.B \-v, \--verbose
 Verbose mode; show all commands that modify the package build directory.
 .TP
-.B \-a
+.B \-a, \--arch
 Create directories for all architecture dependent packages.
 .TP
-.B \-i
+.B \-i, \--indep
 Create directories for all architecture independent packages.
 .TP
-.B \-ppackage
+.B \-ppackage, \--package=package
 Create directories for the package named "package".
 .TP
-.B \-Ptmpdir
+.B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
 .TP
-.B \-A
+.B \-A, \--all
 Create any directories specified by command line parameters in ALL packages
 acted on.
 .TP

diff --git a/dh_installdocs.1 b/dh_installdocs.1
index 6a0290a45f1ef65724e3cfbbdc5fac12d426306f..6b8b33a6863e7475cc0dddfe0e36b58af686984d 100644 (file)
--- a/dh_installdocs.1
+++ b/dh_installdocs.1
@@ -27,22 +27,22 @@ A file named debian/package.docs (debian/docs may be used for the first
 binary package in debian/control) can list other files to be installed.
 .SH OPTIONS
 .TP
-.B \-v
+.B \-v, \--verbose
 Verbose mode; show all commands that modify the package build directory.
 .TP
-.B \-a
+.B \-a, \--arch
 Install files for all architecture dependent packages.
 .TP
-.B \-i
+.B \-i, \--indep
 Install files for all architecture independent packages.
 .TP
-.B \-ppackage
+.B \-ppackage, \--package=package
 Install files for the package named "package".
 .TP
-.B \-Ptmpdir
+.B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
 .TP
-.B \-A
+.B \-A, \--all
 Install all files specified by command line parameters in ALL packages
 acted on.
 .TP

diff --git a/dh_installexamples.1 b/dh_installexamples.1
index e038faf7881d9697306141877e8ac97831b129f3..c2997d95df88976a0ea15c206e20eb6805c9d167 100644 (file)
--- a/dh_installexamples.1
+++ b/dh_installexamples.1
@@ -17,22 +17,22 @@ A file named debian/package.examples (debian/examples may be used for the
 first binary package in debian/control) can list other files to be installed.
 .SH OPTIONS
 .TP
-.B \-v
+.B \-v, \--verbose
 Verbose mode; show all commands that modify the package build directory.
 .TP
-.B \-a
+.B \-a, \--arch
 Install files for all architecture dependent packages.
 .TP
-.B \-i
+.B \-i, \--indep
 Install files for all architecture independent packages.
 .TP
-.B \-ppackage
+.B \-ppackage, \--package=package
 Install files for the package named "package".
 .TP
-.B \-Ptmpdir
+.B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
 .TP
-.B \-A
+.B \-A, \--all
 Install any files specified by command line parameters in ALL packages
 acted on.
 .TP
@@ -48,7 +48,7 @@ and
 arguments are cumulative. If none are specified, then all packages listed in
 the control file will be effected.
 .P
-Note that dh_examples will happily copy entire directory hierarchies if
+Note that dh_installexamples will happily copy entire directory hierarchies if
 you ask it to (it uses cp -a internally). If it is asked to install a
 directory, it will install the complete contents of the directory.
 .SH ENVIRONMENT

diff --git a/dh_installinit.1 b/dh_installinit.1
index 6a2ab3211dadbea94b67ed624b59e6162cda9f11..29bb867a027bda1119d724366b47399e897e2005 100644 (file)
--- a/dh_installinit.1
+++ b/dh_installinit.1
@@ -18,33 +18,33 @@ by the packagename. (You may use debian/init for the first binary package
 listed in the control file.)
 .SH OPTIONS
 .TP
-.B \-v
+.B \-v, \--verbose
 Verbose mode; show all commands that modify the package build directory.
 .TP
-.B \-a
+.B \-a, \--arch
 Install init scripts into all architecture dependent packages.
 .TP
-.B \-i
+.B \-i, \--indep
 Install init scripts into all architecture independent packages.
 .TP
-.B \-ppackage
+.B \-ppackage, \--package=package
 Install init scripts into the package named "package".
 .TP
-.B \-Ptmpdir
+.B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
 .TP
-.B \-n
+.B \-n, \--noscripts
 Do not modify postinst/postrm/prerm scripts.
 .TP
-.B \-r
+.B \-r, \--no-restart-on-upgrade
 Do not restart daemon on upgrade.
 .TP
-.B \-d
+.B \-d, \--remove-d
 Remove trailing "d" from the name of the package, and use the result for the
 filename the init script is installed as in etc/init.d/ . This may be useful
 for daemons with named ending in "d".
 .TP
-.B \-uparams
+.B \-uparams, \--update-rcd-params=params
 Pass "params" to 
 .BR update-rc.d (8)
 If not specified, "default" will be passed to
@@ -57,13 +57,6 @@ and
 .B \-p
 arguments are cumulative. If none are specified, then all packages listed in
 the control file will be effected.
-.P
-Due to a bug in
-.BR getopt (1)
-, you cannot really text with spaces in it to the -u flag. However, this bug
-has been worked around, and it should appear to work. What it's really doing
-is looking at any parameters passed that are not known flags, and appending
-that text onto the end of the text specified by the -u flag.
 .SH ENVIRONMENT
 .TP
 .I DH_VERBOSE

diff --git a/dh_installmanpages.1 b/dh_installmanpages.1
index b8b580e1dc35acd233f15653c857e82068bb2779..e44eaf22f2dc00ddce3e81e64bc4c744b56e8a56 100644 (file)
--- a/dh_installmanpages.1
+++ b/dh_installmanpages.1
@@ -20,19 +20,19 @@ This is useful if by default it installs some man pages that you do not want
 to be installed.
 .SH OPTIONS
 .TP
-.B \-v
+.B \-v, \--verbose
 Verbose mode; show all commands that modify the package build directory.
 .TP
-.B \-a
+.B \-a, \--arch
 Install man pages into all architecture dependent packages.
 .TP
-.B \-i
+.B \-i, \--indep
 Install man pages into all architecture independent packages.
 .TP
-.B \-ppackage
+.B \-ppackage, \--package=package
 Install man pages into the package named "package".
 .TP
-.B \-Ptmpdir
+.B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
 .TP
 .B file ...

diff --git a/dh_installmenu.1 b/dh_installmenu.1
index 320e1005cf4cb621640d72cb73a24f2608893b46..cf54949c68f509c201c6dfdebdfa290773b8a46e 100644 (file)
--- a/dh_installmenu.1
+++ b/dh_installmenu.1
@@ -25,22 +25,22 @@ For the first first binary package listed in the control file, you may use
 debian/menu and debian/menu-method instead.
 .SH OPTIONS
 .TP
-.B \-v
+.B \-v, \--verbose
 Verbose mode; show all commands that modify the package build directory.
 .TP
-.B \-a
+.B \-a, \--arch
 Install menu files into all architecture dependent packages.
 .TP
-.B \-i
+.B \-i, \--indep
 Install menu files into all architecture independent packages.
 .TP
-.B \-ppackage
+.B \-ppackage, \--package=package
 Install menu files into the package named "package".
 .TP
-.B \-Ptmpdir
+.B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
 .TP
-.B \-n
+.B \-n, \--noscripts
 Do not modify postinst/postrm scripts.
 .SH NOTES
 The

diff --git a/dh_makeshlibs b/dh_makeshlibs
index f96c327f7e80550aa989ea2b77ecc32b542b68d6..d595c3b5417556cd9565265c06eaca5caf013b04 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -24,9 +24,9 @@ for PACKAGE in $DH_DOPACKAGES; do
                if [ ! -d "$TMP/DEBIAN" ] ; then
                        doit "install -d $TMP/DEBIAN"
                fi
-               if [ "$DH_V_FLAG" ]; then
-                       if [ "$*" ]; then
-                               PACKAGE="$*"
+               if [ "$DH_V_FLAG_SET" ]; then
+                       if [ "$DH_V_FLAG" ]; then
+                               PACKAGE="$DH_V_FLAG"
                        else
                                # Call isnative becuase it sets $VERSION
                                # as a side effect.

diff --git a/dh_makeshlibs.1 b/dh_makeshlibs.1
index 056cc0f2f339f39c2d4fe7b28c01ff19a3a622fd..cb2703f4f49d8c8e2c832bb9a5921963aac980cf 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] [-mmajor] [-Ptmpdir] [-ppackage] [-mmajor] [-V [dependancies]]"
+.I "[-v] [-a] [-i] [-mmajor] [-Ptmpdir] [-ppackage] [-mmajor] [-V[dependancies]]"
 .SH "DESCRIPTION"
 dh_makeshlibs is a debhelper program that automatically scans for shared
 libraries, and generates a shlibs file for the libraries it finds.
@@ -12,26 +12,26 @@ For this program to work, you cannot have already installed a DEBIAN/shlibs
 file. If such a file exits, the program will exit with an error.
 .SH OPTIONS
 .TP
-.B \-v
+.B \-v, \--verbose
 Verbose mode; show all commands that modify the package build directory.
 .TP
-.B \-a
+.B \-a, \--arch
 Generate shlibs files for all architecture dependent packages.
 .TP
-.B \-i
+.B \-i, \--indep
 Generate shlibs files for all architecture independent packages.
 .TP
-.B \-ppackage
+.B \-ppackage, \--package=package
 Generate shlibs file for the package named "package".
 .TP
-.B \-Ptmpdir
+.B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
 .TP
-.B \-mmajor
+.B \-mmajor, \--major=major
 Instead of trying to guess the major number of the library from the filename
 of the library, use the major number specified after the -m parameter.
 .TP
-.B \-V [dependancies]
+.B \-V[dependancies], \--version-info, \--version-info=dependancies
 By default, the shlibs file generated by this program does not make packages
 depend on any particular version of the package containing the shared
 library. It may be necessary for you to add some version dependancy
@@ -70,14 +70,6 @@ Enables verbose mode
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH BUGS
-Due to limitations in
-.BR getopt (1)
-, I had to fudge a bit on how the -V parameter really works. When -V is
-specified, it's really examining the rest of the command line for any text
-that isn't a switch, and using that for the dependancy information. This
-means that the -V switch and any dependancy parameters should come last on
-the command line.
-.P
 There is no guarantee that the program will get the shlibs file right. For
 example, it may not correctly guess the major number of your package. In
 cases like these (and perhaps in general, just to be safe), it is better to

diff --git a/dh_suidregister.1 b/dh_suidregister.1
index 29fc504b8a380ad15f490e3c3ee0145cf2b94ade..51e08fe5c5f20108d658c628e11b4535abed9b7f 100644 (file)
--- a/dh_suidregister.1
+++ b/dh_suidregister.1
@@ -28,22 +28,22 @@ Note that this package modifies your postinst and postrm files. See
 for an explanation of how this works.
 .SH OPTIONS
 .TP
-.B \-v
+.B \-v, \--verbose
 Verbose mode; show all commands that modify the package build directory.
 .TP
-.B \-a
+.B \-a, \--arch
 Register files for all architecture dependent packages.
 .TP
-.B \-i
+.B \-i, \--indep
 Register files for all architecture independent packages.
 .TP
-.B \-ppackage
+.B \-ppackage, \--package=package
 Register files for the package named "package".
 .TP
-.B \-Ptmpdir
+.B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
 .TP
-.B \-A
+.B \-A, \--all
 Register any files specified by command line parameters in ALL packages
 acted on. I doubt anyone will find this useful, it's here for consitency
 with other debhelper programs.

diff --git a/dh_undocumented.1 b/dh_undocumented.1
index 677c90f8c2a137db8ca3dc82a7a943d48217e442..26498934042f06d0dbcac52cd6b8108dec4d0a3b 100644 (file)
--- a/dh_undocumented.1
+++ b/dh_undocumented.1
@@ -32,22 +32,22 @@ the first binary package in debian/control) can list other man page names to
 set up.
 .SH OPTIONS
 .TP
-.B \-v
+.B \-v, \--verbose
 Verbose mode; show all commands that modify the package build directory.
 .TP
-.B \-a
+.B \-a, \--arch
 Install undocumented man page symlinks for all architecture dependent packages.
 .TP
-.B \-i
+.B \-i, \--indep
 Install undocumented man page symlinks for all architecture independent packages.
 .TP
-.B \-ppackage
+.B \-ppackage, \--package=package
 Install undocumented man page symlinks for the package named "package".
 .TP
-.B \-Ptmpdir
+.B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
 .TP
-.B \-A
+.B \-A, \--all
 Install undocumented man page symlinks for any man pages specified by 
 command line parameters in ALL packages acted on. I doubt anyone will find
 this useful, it's here for consitency with other debhelper programs.

diff --git a/examples/rules b/examples/rules
index 29c79dee5d021a919da86f507481b69a65d4abed..8e6683c1723968e494f5ff9a9cb2f308fde3517f 100755 (executable)
--- a/examples/rules
+++ b/examples/rules
@@ -7,16 +7,20 @@
 build: build-stamp
 build-stamp:
        dh_testdir
+
        # Add here commands to compile the package.
        #$(MAKE)
+
        touch build-stamp
 
 clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp
+
        # Add here commands to clean up after the build process.
        #-$(MAKE) distclean
+
        dh_clean
 
 # Build architecture-independent files here.
@@ -25,12 +29,15 @@ binary-indep: build
 
 # Build architecture-dependent files here.
 binary-arch: build
+#      dh_testversion
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
+
        # Add here commands to install the files into debian/tmp
        #$(MAKE) prefix=`pwd`/debian/tmp install
+
        dh_installdocs
        dh_installexamples
        dh_installmenu

diff --git a/examples/rules.indep b/examples/rules.indep
index fb46c6234772d9d7f324f4533f4c7b5017cfb3e5..601c5e3eeee5f1c1fa5d5adb9d3f975ffceb7a13 100755 (executable)
--- a/examples/rules.indep
+++ b/examples/rules.indep
@@ -8,26 +8,33 @@
 build: build-stamp
 build-stamp:
        dh_testdir
+
        # Add here commands to compile the package.
        #$(MAKE)
+
        touch build-stamp
 
 clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp
+
        # Add here commands to clean up after the build process.
        #-$(MAKE) distclean
+
        dh_clean
 
 # Build architecture-independent files here.
 binary-indep: build
+#      dh_testversion
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
+
         # Add here commands to install the files into debian/tmp
         #$(MAKE) prefix=`pwd`/debian/tmp install
+
        dh_installdocs
        dh_installexamples
        dh_installmenu

diff --git a/examples/rules.multi b/examples/rules.multi
index 205ed4c8e584add167c8380f8af7ec6a9a9dda4d..a5be1efe49d87ab6c5458976c41e02250bf8c09b 100755 (executable)
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -10,26 +10,34 @@
 build: build-stamp
 build-stamp:
        dh_testdir
+
        # Add here commands to compile the package.
        #$(MAKE)
+
        touch build-stamp
 
 clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp
+
        # Add here commands to clean up after the build process.
        #-$(MAKE) distclean
+
        dh_clean
 
 # Build architecture-independent files here.
 binary-indep: build
+#      dh_testversion
        dh_testdir -i
        dh_testroot -i
        dh_clean -i -k
        dh_installdirs -i
+
         # Add here commands to install the files into debian/tmp
         #$(MAKE) prefix=`pwd`/debian/tmp install
+
+       dh_movefiles -i
        dh_installdocs -i
        dh_installexamples -i
        dh_installmenu -i
@@ -49,12 +57,16 @@ binary-indep: build
 
 # Build architecture-dependent files here.
 binary-arch: build
+#      dh_testversion
        dh_testdir -a
        dh_testroot -a
        dh_clean -a -k
        dh_installdirs -a
+
        # Add here commands to install the files into debian/tmp
        #$(MAKE) prefix=`pwd`/debian/tmp install
+
+       dh_movefiles -a
        dh_installdocs -a
        dh_installexamples -a
        dh_installmenu -a