From 30dd5e818aa3d41683f3d20815ed0ad41ca1f469 Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 17 Aug 1999 04:52:23 +0000 Subject: [PATCH] r87: Initial Import --- debian/changelog | 35 ++++++++++++++++++++++++++++++++++- debian/control | 2 +- dh_compress.1 | 4 ++-- dh_fixperms.1 | 7 ++++++- dh_installdirs | 7 +++++-- dh_installdocs | 30 +++++++++++++++--------------- dh_installdocs.1 | 5 +++-- dh_installinit.1 | 5 +++-- dh_makeshlibs.1 | 2 +- 9 files changed, 70 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0b443a1..7eb8f5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,36 @@ +debhelper (0.90) unstable; urgency=low + + * I'd like to thank Len Pikulski and Igor Grobman at nothinbut.net for + providing me with free internet access on a moment's notice, so I could + get this package to you after hacking on it all over New England for the + past week. Thanks, guys! + . + * Added dh_debstd, which mimics the functionality of the debstd command. + It's not a complete nor an exact copy, and it's not so much intended to + be used in a debian/rules file, as it is to be run by hand when you are + converting a package from debstd to debhelper. "dh_debstd -v" will + output the sequence of debhelper commands that approximate what debstd + would do in the same situation. + * dh_debstd is completly untested, I don't have the source to any packages + that use debstd available. Once this is tested, I plan to release + debhelper 1.0! + * Added a from-debstd document that gives a recipe to convert from debstd + to debhelper. + * dh_fixperms: can now use -X to exclude files from having their + permissions changed. + * dh_testroot: test for uid == 0, instead of username == root, becuase + some people enjoy changing root's name. + * dh_installinit: handle debian/init.d as well as debian/init files, + for backwards compatability with debstd. Unlike with debstd, the two + files are treated identically. + * dh_lib, PROGRAMMING: added "warning" function. + * Minor man page fixes. + * dh_compress: don't bomb out if usr/doc/ is empty. (#23054) + * dh_compress, dh_installdirs: always cd into $TMP and back out, even if + --no-act is on. (#23054) + + -- Joey Hess Mon, 1 Jun 1998 21:57:45 -0400 + debhelper (0.88) unstable; urgency=low * I had many hours on a train to hack on debhelper... enjoy! @@ -66,7 +99,7 @@ debhelper (0.80) unstable; urgency=low Thanks to Bdale Garbee and Adam Heath for help on the implementation. * dh_installchangelogs: use debian/package.changelog files if they exist - rather than debian.changelog. It appears some people do need per-package + rather than debian/changelog. It appears some people do need per-package changelogs. * dh_gencontrol: if debian/package.changelogs files exist, use them. * Above 2 changes close #20442. diff --git a/debian/control b/debian/control index 4ec15b0..4d25b67 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: debhelper Section: devel Priority: optional Maintainer: Joey Hess -Standards-Version: 2.4.1.0 +Standards-Version: 2.4.1.1 Package: debhelper Architecture: all diff --git a/dh_compress.1 b/dh_compress.1 index 4f2d2d0..c78291e 100644 --- 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] [-X] [--no-act] [-ppackage] [-Ptmpdir]" +.I "[-v] [-a] [-i] [-Xitem] [--no-act] [-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 @@ -50,7 +50,7 @@ Compress files for the package named "package". .B \-Ptmpdir, \--tmpdir=tmpdir Use "tmpdir" for package build directory. .TP -.B \-X=item, \--exclude=item +.B \-Xitem, \--exclude=item Exclude files that contain "item" anywhere in their filename from being compressed. For example, -X=.jpeg will exclude jpeg's from compression. You may use this option multiple times to build up a list of things to diff --git a/dh_fixperms.1 b/dh_fixperms.1 index 913a8c7..19f89d1 100644 --- 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] [--no-act] [-ppackage] [-Ptmpdir]" +.I "[-v] [-a] [-i] [-Xitem] [--no-act] [-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. @@ -33,6 +33,11 @@ Fix permissions for the package named "package". .TP .B \-Ptmpdir, \--tmpdir=tmpdir Use "tmpdir" for package build directory. +.TP +.B \-Xitem, \--exclude=item +Exclude files that contain "item" anywhere in their filename from having +their permissions changed. You may use this option multiple times to build +up a list of things to exclude. .SH NOTES The .B \-a diff --git a/dh_installdirs b/dh_installdirs index e733e7c..725cdb2 100755 --- a/dh_installdirs +++ b/dh_installdirs @@ -33,8 +33,11 @@ for PACKAGE in $DH_DOPACKAGES; do done # Create dirs. olddir=`pwd` - doit "cd $TMP" + verbose_echo "cd $TMP" + cd "$TMP" doit "install -d $dirs" - doit "cd $olddir" + verbose_echo "cd $olddir" + cd "$olddir" fi done + diff --git a/dh_installdocs b/dh_installdocs index 1b3a95c..fcdedc5 100755 --- a/dh_installdocs +++ b/dh_installdocs @@ -29,21 +29,21 @@ for PACKAGE in $DH_DOPACKAGES; do 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 - # .Debian is correct according to policy. - doit "install -m 644 -p debian/README.debian $TMP/usr/doc/$PACKAGE/README.Debian" - fi - if [ -f debian/README.Debian ]; then - doit "install -m 644 -p debian/README.Debian $TMP/usr/doc/$PACKAGE/" - fi - if [ -f debian/TODO ]; then - if isnative; then - doit "install -m 655 -p debian/TODO $TMP/usr/doc/$PACKAGE/TODO" - else - doit "install -m 644 -p debian/TODO $TMP/usr/doc/$PACKAGE/TODO.Debian" - fi + # .Debian is correct, according to policy. + readme_debian=`pkgfile $PACKAGE README.Debian` + if [ -z "$readme_debian" ]; then + readme_debian=`pkgfile $PACKAGE README.debian` + fi + if [ "$readme_debian" ]; then + doit "install -m 644 -p $readme_debian $TMP/usr/doc/$PACKAGE/README.Debian" + fi + + todo=`pkgfile $PACKAGE TODO` + if [ "$todo" ]; then + if isnative; then + doit "install -m 655 -p $todo $TMP/usr/doc/$PACKAGE/TODO" + else + doit "install -m 644 -p $todo $TMP/usr/doc/$PACKAGE/TODO.Debian" fi fi diff --git a/dh_installdocs.1 b/dh_installdocs.1 index 95d9df5..9873760 100644 --- a/dh_installdocs.1 +++ b/dh_installdocs.1 @@ -19,12 +19,13 @@ 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 +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. Also note that README.debian is installed as -README.Debian, for consitency. +README.Debian, for consitency. Note that debian/package.README.Debian and +debian/package.TODO can be used to specify files for subpackages. .P 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. diff --git a/dh_installinit.1 b/dh_installinit.1 index 156867e..99222bc 100644 --- a/dh_installinit.1 +++ b/dh_installinit.1 @@ -12,7 +12,8 @@ It also automatically generates the postinst and postrm and prerm commands needed to set up the symlinks in /etc/rc*.d/ and to start and stop the init scripts. .P -If a file named debian/package.init exists, then it is installed into +If a file named debian/package.init (or debian/package.init.d for backwards +compatability with debstd) exists, then it is installed into etc/init.d/package in the package build directory, with "package" replaced by the packagename. (You may use debian/init for the first binary package listed in the control file.) @@ -46,7 +47,7 @@ Do not restart daemon on upgrade. .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". (Note: this takes precidence over +for daemons with names ending in "d". (Note: this takes precidence over the --init-script parameter described below.) .TP .B \-uparams, \--update-rcd-params=params diff --git a/dh_makeshlibs.1 b/dh_makeshlibs.1 index c39eb04..bad72c4 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] [--no-act] [-mmajor] [-Ptmpdir] [-ppackage] [-mmajor] [-V[dependancies]]" +.I "[-v] [-a] [-i] [--no-act] [-mmajor] [-Ptmpdir] [-ppackage] [-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. -- 2.39.5