From: joey Date: Tue, 17 Aug 1999 04:45:57 +0000 (+0000) Subject: r59: Initial Import X-Git-Tag: debian_version_0_1~171 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=220da53f5dda9555b3c1ab4cf494ec539d458a9f;p=debhelper.git r59: Initial Import --- diff --git a/TODO b/TODO index 6683d0d..3e34c07 100644 --- a/TODO +++ b/TODO @@ -23,3 +23,10 @@ * maybe make dh_installmanpages look at the .TH line of man pages whose filenames end in .man, to figure out what section they go it. This would require a switch to turn on, for backwards compatability. +* All debhelper programs should be checked that they output files with the + correct permissions no matter what the umask is set to. Currently, only + those programs that run after dh_fixperms have been so checked. (Checking + the rest is low priority, since dh_fixperms fixes any incorrect permissions + they might have; still it would be nice to check them too, just to make + debhelper more flexible.) One easy fix is to add umask 022 to dh_lib, + however, there may be unforseen ramifications of such a change. diff --git a/debian/changelog b/debian/changelog index 8d2df4b..df4abff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +debhelper (0.63) unstable; urgency=low + + * Removed some debugging output from dh_installmanpages. + * du_du: no longer does anything, becuase it has been decided on + debian-policy that du control files are bad. + * examples/*: removed dh_du calls. + * debian/rules: removed dh_du call. + * Modified dh_gencontrol, dh_makeshlibs, and dh_md5sums to generate files + with the correct permissions even if the umask is set to unusual + values. (#18283) + + -- Joey Hess Mon, 16 Feb 1998 23:34:36 -0800 + debhelper (0.62) unstable; urgency=low * dh_installmanpages: if the man page filename ends in 'x', install it in diff --git a/debian/rules b/debian/rules index 892f7e6..13aaea5 100755 --- a/debian/rules +++ b/debian/rules @@ -53,7 +53,6 @@ binary-indep: build ./dh_suidregister ./dh_installdeb ./dh_gencontrol - ./dh_du ./dh_md5sums ./dh_builddeb diff --git a/dh_du b/dh_du index 71ce2b1..73df2a0 100755 --- a/dh_du +++ b/dh_du @@ -2,18 +2,22 @@ # # Generate a DEBIAN/du file, that lists the disk usage of the directories in # the package. +# +# No longer - it was decided these files are a bad idea. PATH=debian:$PATH:/usr/lib/debhelper . dh_lib -for PACKAGE in $DH_DOPACKAGES; do - TMP=`tmpdir $PACKAGE` - - if [ ! -d "$TMP/DEBIAN" ]; then - doit "install -d $TMP/DEBIAN" - fi +echo "* Note: dh_du does nothing and is deprecated. Remove it from debian/rules." >&2 - # Note that the tabs in this next line are important. - complex_doit "du -k $TMP | sed 's: $TMP/: :' | grep -v ' DEBIAN$' | grep -v ' $TMP$' >$TMP/DEBIAN/du" - doit "chown root.root $TMP/DEBIAN/du" -done +#for PACKAGE in $DH_DOPACKAGES; do +# TMP=`tmpdir $PACKAGE` +# +# if [ ! -d "$TMP/DEBIAN" ]; then +# doit "install -d $TMP/DEBIAN" +# fi +# +# # Note that the tabs in this next line are important. +# complex_doit "du -k $TMP | sed 's: $TMP/: :' | grep -v ' DEBIAN$' | grep -v ' $TMP$' >$TMP/DEBIAN/du" +# doit "chown root.root $TMP/DEBIAN/du" +#done diff --git a/dh_du.1 b/dh_du.1 index 9c04106..9497a61 100644 --- a/dh_du.1 +++ b/dh_du.1 @@ -3,49 +3,13 @@ dh_du \- generate DEBIAN/du file .SH SYNOPSIS .B dh_du -.I "[-v] [-a] [-i] [--no-act] [-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. -This file isn't used by anything yet, but it could be helpful for a future -debian installer program. +dh_du is a debhelper program that was responsible for generating +a DEBIAN/du file, which listed the disk usage of directories in the package. .P -The du file is installed with proper permissions and ownerships. -.SH OPTIONS -.TP -.B \-v, \--verbose -Verbose mode; show all commands that modify the package build directory. -.TP -.B \-a, \--arch -Generate du files for all architecture dependent packages. -.TP -.B \-i, \--indep -Generate du files for all architecture independent packages. -.TP -.B \--no-act -Do not really do anything. If used with -v, the result is that this command -will output a list of what it would have done. -.TP -.B \-ppackage, \--package=package -Generate du file for the package named "package". -.TP -.B \-Ptmpdir, \--tmpdir=tmpdir -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 -.TP -.I DH_NO_ACT -Enables no-act mode (see above). +This program is now depricated, and does nothing, after a decision by the +debian developers that du control files should not exit. It will simply +output a warning message now. .SH "SEE ALSO" .BR /usr/doc/debhelper/README .SH AUTHOR diff --git a/dh_gencontrol b/dh_gencontrol index e2a4e70..f30b410 100755 --- a/dh_gencontrol +++ b/dh_gencontrol @@ -15,5 +15,7 @@ for PACKAGE in $DH_DOPACKAGES; do # Generate and install control file. doit "dpkg-gencontrol -p$PACKAGE -Tdebian/${EXT}substvars -P$TMP $DH_U_PARAMS" + # This chmod is only necessary if the user sets the umask to something odd. + doit "chmod 644 $TMP/DEBIAN/control" doit "chown root.root $TMP/DEBIAN/control" done diff --git a/dh_installmanpages b/dh_installmanpages index 0c968a3..fe61138 100755 --- a/dh_installmanpages +++ b/dh_installmanpages @@ -39,7 +39,6 @@ for PACKAGE in $DH_DOPACKAGES; do SECTION=man`expr $NAME : '.*\.\([123456789]\)'` # Test to see if the filename ends with 'x', # if so, this is an X man page. - echo $NAME if expr $NAME : '.*\.[123456789]x' >/dev/null; then EXTDIR="X11R6" else diff --git a/dh_makeshlibs b/dh_makeshlibs index d595c3b..2869555 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -38,6 +38,7 @@ for PACKAGE in $DH_DOPACKAGES; do done if [ -e "$TMP/DEBIAN/shlibs" ]; then + doit "chmod 644 $TMP/DEBIAN/shlibs" doit "chown root.root $TMP/DEBIAN/shlibs" fi done diff --git a/dh_md5sums b/dh_md5sums index ae47092..8db0176 100755 --- a/dh_md5sums +++ b/dh_md5sums @@ -21,6 +21,7 @@ for PACKAGE in $DH_DOPACKAGES; do fi olddir=`pwd` complex_doit "cd $TMP ; sed 's:^/::' < DEBIAN/allfiles | xargs md5sum > DEBIAN/md5sums ; cd $olddir" + doit "chmod 644 $TMP/DEBIAN/md5sums" doit "chown root.root $TMP/DEBIAN/md5sums" doit "rm -f $TMP/DEBIAN/allfiles" done diff --git a/examples/rules b/examples/rules index 8e6683c..7fbd9d9 100755 --- a/examples/rules +++ b/examples/rules @@ -54,7 +54,6 @@ binary-arch: build dh_shlibdeps dh_gencontrol # dh_makeshlibs - dh_du dh_md5sums dh_builddeb diff --git a/examples/rules.indep b/examples/rules.indep index 601c5e3..2e74e85 100755 --- a/examples/rules.indep +++ b/examples/rules.indep @@ -48,7 +48,6 @@ binary-indep: build dh_suidregister dh_installdeb dh_gencontrol - dh_du dh_md5sums dh_builddeb diff --git a/examples/rules.multi b/examples/rules.multi index a5be1ef..1cfeb42 100755 --- a/examples/rules.multi +++ b/examples/rules.multi @@ -51,7 +51,6 @@ binary-indep: build dh_suidregister -i dh_installdeb -i dh_gencontrol -i - dh_du -i dh_md5sums -i dh_builddeb -i @@ -83,7 +82,6 @@ binary-arch: build dh_shlibdeps -a dh_gencontrol -a # dh_makeshlibs -a - dh_du -a dh_md5sums -a dh_builddeb -a