diff options
| -rw-r--r-- | debian/changelog | 29 | ||||
| -rwxr-xr-x | dh_installdirs | 2 | ||||
| -rwxr-xr-x | dh_installdocs | 2 | ||||
| -rw-r--r-- | dh_installdocs.1 | 20 | ||||
| -rwxr-xr-x | dh_installexamples | 2 | ||||
| -rw-r--r-- | dh_installexamples.1 | 10 | ||||
| -rw-r--r-- | dh_installinit.1 | 7 | ||||
| -rwxr-xr-x | dh_makeshlibs | 8 | ||||
| -rw-r--r-- | dh_makeshlibs.1 | 10 | ||||
| -rw-r--r-- | dh_suidregister.1 | 9 | ||||
| -rwxr-xr-x | dh_undocumented | 2 | ||||
| -rw-r--r-- | dh_undocumented.1 | 13 |
12 files changed, 82 insertions, 32 deletions
diff --git a/debian/changelog b/debian/changelog index a1139e5b..75e03dae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,35 @@ +debhelper (0.50) unstable; urgency=low + + * dh_makeshlibs: added -m parameter, which can force the major number + of the shared library if it is guessed incorrectly. + * Added dh_testversion to let your package depend on a certian version of + debhelper to build. + * dh_{installdirs,installdocs,installexamples,suidregieter,undocumented}: + behavior modification - any files/directories specified on the command + line now apply to the first package acted on. This may not be the + first package listed in debian/control, if you use -p to make it act on + a given package, or -i or -a. + * If you take advantage of the above new behavior, I suggest you add + "dh_testversion 0.50" to your debian/rules. + * Display a warning message in cases where the above behavior is triggered, + and debhelper's behavior has altered. + * I have grepped debian's source packages, and I'm quite sure this + is not going to affect any packages currently in debian. + * dh_lib: isnative() now caches its return value, which should optimize + away several more calls to dpkg-parsechangelog. + * README: explain a way to embed debhelper generated shell script into a + perl script. + * dh_installinit: A hack to work around the problem in getopt(1) that + led to bug report #16229: Any text specified on the command line that is + not a flag will be presumed to be part of the -u flag. Yuck. + + -- Joey Hess <joeyh@master.debian.org> Sat, 3 Jan 1998 14:36:15 -0500 + debhelper (0.37) unstable; urgency=low * dh_du: Fixed hardcoded debian/tmp. * This change got lost by accident, redid it: Optimized out most of the - slowdown caused byusing dpkg-parsechangelog - now it's only called by + slowdown caused by using dpkg-parsechangelog - now it's only called by 2 dh_* programs. -- Joey Hess <joeyh@master.debian.org> Sun, 28 Dec 1997 20:45:22 -0500 diff --git a/dh_installdirs b/dh_installdirs index b5480851..51ef2ce7 100755 --- a/dh_installdirs +++ b/dh_installdirs @@ -19,7 +19,7 @@ for PACKAGE in $DH_DOPACKAGES; do dirs=`tr "\n" " " < debian/${EXT}dirs` fi - if [ "$PACKAGE" = "$MAINPACKAGE" -a "$*" ]; then + if [ "$PACKAGE" = "$DH_FIRSTPACKAGE" -a "$*" ]; then dirs="$* $dirs" fi diff --git a/dh_installdocs b/dh_installdocs index a1da8aa9..11014229 100755 --- a/dh_installdocs +++ b/dh_installdocs @@ -20,7 +20,7 @@ for PACKAGE in $DH_DOPACKAGES; do docs=`tr "\n" " " < debian/${EXT}docs` fi - if [ "$PACKAGE" = "$MAINPACKAGE" -a "$*" ]; then + if [ "$PACKAGE" = "$DH_FIRSTPACKAGE" -a "$*" ]; then docs="$* $docs" fi diff --git a/dh_installdocs.1 b/dh_installdocs.1 index 9724635e..86195b79 100644 --- a/dh_installdocs.1 +++ b/dh_installdocs.1 @@ -9,14 +9,19 @@ dh_installdocs is a debhelper program that is responsible for installing documentation into usr/doc/package in package build directories. .P dh_installdocs automatically installs debian/copyright if it exists. If -dh_installdocs is acting on multiple packages, debian/copyright files will be +dh_installdocs is acting on multiple packages, debian/copyright files will be installed into all packages. .P -Any filenames specified as parameters, as well as debian/README.Debian (or -debian/README.debian) and debian/TODO, if they exist, will be installed into -the first binary package listed in debian/control, if dh_installdocs is acting -on that package. Note that debian/TODO will be installed named TODO.Debian, -if the package is not a debian native package. +Any filenames specified as parameters will be installed into the first +package dh_installdocs is told to act on. By default, this is the first +binary package in debian/control, but if you use -p, -i, or -a flags, it +will be the first package specified by those flags. +.P +Also, debian/README.Debian (or debian/README.debian) and debian/TODO, if +they exist, will be installed into the first binary package listed in +debian/control, if dh_installdocs is acting on that package. Note that +debian/TODO will be installed named TODO.Debian, if the package is not a +debian native package. .P A file named debian/docs (for the first binary package in debian/control), or debian/package.docs (for each additional package in debian/control) can @@ -39,8 +44,7 @@ Install files for the package named "package". 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. +Install these files as documentation into the first package acted on. .SH NOTES The .B \-a diff --git a/dh_installexamples b/dh_installexamples index bc16991a..98a752df 100755 --- a/dh_installexamples +++ b/dh_installexamples @@ -16,7 +16,7 @@ for PACKAGE in $DH_DOPACKAGES; do examples=`tr "\n" " " < debian/${EXT}examples` fi - if [ "$PACKAGE" = "$MAINPACKAGE" -a "$*" ]; then + if [ "$PACKAGE" = "$DH_FIRSTPACKAGE" -a "$*" ]; then examples="$* $examples" fi diff --git a/dh_installexamples.1 b/dh_installexamples.1 index c940d256..f70b98ce 100644 --- a/dh_installexamples.1 +++ b/dh_installexamples.1 @@ -8,9 +8,10 @@ dh_installexamples \- install example files into package build directories dh_installexamples is a debhelper program that is responsible for installing examples into usr/doc/package/examples in package build directories. .P -Any filenames specified as parameters will be installed into the first -binary package listed in debian/control, if dh_installexamples is acting on -that package. +Any file names specified as parameters will be installed into the first +package dh_installdirs is told to act on. By default, this is the first +binary package in debian/control, but if you use -p, -i, or -a flags, it +will be the first package specified by those flags. .P A file named debian/examples (for the first binary package in debian/control), or debian/package.examples (for each additional package in debian/control) can @@ -33,8 +34,7 @@ Install files for the package named "package". 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. +Install these files as examples into the first package acted on. .SH NOTES The .B \-a diff --git a/dh_installinit.1 b/dh_installinit.1 index e0daac42..13f87549 100644 --- a/dh_installinit.1 +++ b/dh_installinit.1 @@ -60,6 +60,13 @@ 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_makeshlibs b/dh_makeshlibs index 0943ba57..6cf9c803 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -15,8 +15,12 @@ for PACKAGE in $DH_DOPACKAGES; 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 [ -z "$DH_M_PARAMS" ]; then + MAJOR=`expr $VERSION : "\([0-9]*\)\."` || true + else + MAJOR="$DH_M_PARAMS" + fi +# LIBSTUB=`expr $file : "\(.*\/.*\.so\)\..*"` || true if [ ! -d "$TMP/DEBIAN" ] ; then doit "install -d $TMP/DEBIAN" fi diff --git a/dh_makeshlibs.1 b/dh_makeshlibs.1 index 0b7df353..02c7ea8a 100644 --- 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] [-Ptmpdir] [-ppackage]" +.I "[-v] [-a] [-i] [-mmajor] [-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. @@ -26,6 +26,10 @@ Generate shlibs file for the package named "package". .TP .B \-Ptmpdir Use "tmpdir" for package build directory. +.TP +.B \-mmajor +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. .SH NOTES The .B \-a @@ -44,7 +48,9 @@ Enables verbose mode 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 -create a debian/shlibs file by hand. +create a debian/shlibs file by hand, or force it to use the correct major +number by specifying the -m parameter. +.P This is a "do what I Mean" type program - you have been warned! .SH AUTHOR Joey Hess <joeyh@master.debian.org> diff --git a/dh_suidregister.1 b/dh_suidregister.1 index b66c2140..d374a4c1 100644 --- a/dh_suidregister.1 +++ b/dh_suidregister.1 @@ -11,8 +11,10 @@ with .BR suidregister (1) when it is installed. .P -Any files specified as parameters will be registered, if dh_suidregister is -acting on the first binary package listed in debian/control. +Any filenames specified as parameters will be registered in the first +package dh_installdocs is told to act on. By default, this is the first +binary package in debian/control, but if you use -p, -i, or -a flags, +it will be the first package specified by those flags. .P The files debian/suid (for the first binary package in debian/control) or debian/package.suid (for each additional package in debian/control) can @@ -43,8 +45,7 @@ Register files for the package named "package". 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. +Register these files in the first package acted on. .SH NOTES The .B \-a diff --git a/dh_undocumented b/dh_undocumented index d0a8febd..e8ca0e01 100755 --- a/dh_undocumented +++ b/dh_undocumented @@ -19,7 +19,7 @@ for PACKAGE in $DH_DOPACKAGES; do undoc=`tr "\n" " " < debian/${EXT}undocumented` fi - if [ "$PACKAGE" = "$MAINPACKAGE" -a "$*" ]; then + if [ "$PACKAGE" = "$DH_FIRSTPACKAGE" -a "$*" ]; then undoc="$* $undoc" fi diff --git a/dh_undocumented.1 b/dh_undocumented.1 index 3f554989..2bbf24a1 100644 --- a/dh_undocumented.1 +++ b/dh_undocumented.1 @@ -22,10 +22,12 @@ generates the necessary symlinks to .P The lists of man pages that need .BR undocumented (7) -symlinks can be specified in two ways. Any man page names specified as -parameters will be set up in the first binary package listed in -debian/control, if dh_installdocs is acting on that package. -Also, if a file named debian/undocumented (for the first binary package in +symlinks can be specified in two ways. Any man page names specified as +parameters will be set up in the first package dh_undocumented is told +to act on. By default, this is the first binary package in debian/control, +but if you use -p, -i, or -a flags, it will be the first package specified +by those flags. +Also, a file named debian/undocumented (for the first binary package in debian/control), or debian/package.undocumented (for each additional package in debian/control) can list other man page names to set up. .SH OPTIONS @@ -47,8 +49,7 @@ 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 -that package. +into the first package acted on. .SH NOTES The .B \-a |