From 592ce7d8660a0aab5870916d6916894266632488 Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 17 Aug 1999 04:49:27 +0000 Subject: [PATCH] r77: Initial Import --- debian/changelog | 7 +++++++ dh_gencontrol | 7 ++++++- dh_gencontrol.1 | 3 --- dh_installchangelogs | 7 ++++++- dh_installchangelogs.1 | 4 +++- dh_lib | 6 +++--- dh_movefiles | 21 +++++++++++++++++++-- dh_movefiles.1 | 7 ++++++- 8 files changed, 50 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index de0c2d9..30e24c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (0.79) frozen; urgency=low + + * Reupload to get it into frozen. No changes since version 0.75 + except bugfixes. + + -- Joey Hess Thu, 2 Apr 1998 16:10:55 -0800 + debhelper (0.78) frozen unstable; urgency=low * More spelling fixes from Christian T. Steigies. (I ignored the spelling diff --git a/dh_gencontrol b/dh_gencontrol index f30b410..2babfec 100755 --- a/dh_gencontrol +++ b/dh_gencontrol @@ -9,12 +9,17 @@ for PACKAGE in $DH_DOPACKAGES; do TMP=`tmpdir $PACKAGE` EXT=`pkgext $PACKAGE` + changelog=`pkgfile $PACKAGE changelog` + if [ ! "$changelog" ]; then + changelog=debian/changelog + fi + if [ ! -d $TMP/DEBIAN ]; then doit "install -o root -g root -d $TMP/DEBIAN" fi # Generate and install control file. - doit "dpkg-gencontrol -p$PACKAGE -Tdebian/${EXT}substvars -P$TMP $DH_U_PARAMS" + doit "dpkg-gencontrol -l$changelog -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" diff --git a/dh_gencontrol.1 b/dh_gencontrol.1 index 70486a9..b0cc783 100644 --- a/dh_gencontrol.1 +++ b/dh_gencontrol.1 @@ -11,9 +11,6 @@ the proper permissions. .P This program is merely a wrapper around .BR dpkg-gencontrol (1) -You may prefer to simply run -.BR dpkg-gencontrol (1) -by hand. .SH OPTIONS .TP .B \-v, \--verbose diff --git a/dh_installchangelogs b/dh_installchangelogs index 0dd0991..15a42c0 100755 --- a/dh_installchangelogs +++ b/dh_installchangelogs @@ -25,10 +25,15 @@ fi for PACKAGE in $DH_DOPACKAGES; do TMP=`tmpdir $PACKAGE` + changelog=`pkgfile $PACKAGE changelog` + if [ ! "$changelog" ]; then + changelog=debian/changelog + fi + if [ ! -d $TMP/usr/doc/$PACKAGE ]; then doit "install -d $TMP/usr/doc/$PACKAGE" fi - doit "install -p -m644 debian/changelog $TMP/usr/doc/$PACKAGE/$CHANGELOG_NAME" + doit "install -p -m644 $changelog $TMP/usr/doc/$PACKAGE/$CHANGELOG_NAME" if [ "$UPSTREAM" ]; then doit "install -p -m644 $UPSTREAM $TMP/usr/doc/$PACKAGE/changelog" diff --git a/dh_installchangelogs.1 b/dh_installchangelogs.1 index 7b9f230..84fb6b4 100644 --- a/dh_installchangelogs.1 +++ b/dh_installchangelogs.1 @@ -11,7 +11,9 @@ changelogs into package build directories. dh_installchangelogs determines if the package is a debian native package, and if so, it installs debian/changelog into usr/doc/package/changelog in the package build directory. Otherwise, it installs debian/changelog into -usr/doc/package/changelog.Debian in the package build directory. +usr/doc/package/changelog.Debian in the package build directory. (If files +named debian/package.changelog exist, they will be used in preference to +debian/changelog.) .P If an upstream changelog file is specified as an option, and the package is not a native debian package, then this upstream changelog will be installed diff --git a/dh_lib b/dh_lib index 2e11695..38f6734 100644 --- a/dh_lib +++ b/dh_lib @@ -53,9 +53,9 @@ tmpdir() { # Pass this the name of a binary package, and the name of the file wanted # for the package, and it will return the actual filename to use. For # example if the package is foo, and the file is somefile, it will look for -# debian/somefile, and if found return that, otherwise, it will look for -# debian/foo, and if found, return that. Failing that, it will return -# nothing. +# debian/somefile, and if found return that, otherwise, if the package is +# the main package, it will look for debian/foo, and if found, return that. +# Failing that, it will return nothing. pkgfile() { if [ -e "debian/$1.$2" ]; then echo "debian/$1.$2" diff --git a/dh_movefiles b/dh_movefiles index 939f38c..5d8dd90 100755 --- a/dh_movefiles +++ b/dh_movefiles @@ -9,7 +9,9 @@ for PACKAGE in $DH_DOPACKAGES; do TMP=`tmpdir $PACKAGE` files=`pkgfile $PACKAGE files` - move="" + if [ ! -d "debian/tmp" ]; then + error "debian/tmp does not exist" + fi # debian/files has a different purpose, so ignore it. if [ "$files" -a "$files" != "debian/files" ]; then @@ -22,6 +24,21 @@ for PACKAGE in $DH_DOPACKAGES; do fi files=`pwd`/$files - complex_doit "(cd debian/tmp;tar --create --remove-files --file - "`cat $files`") | (cd $TMP;tar xpf -)" + + # Order the files. First all real files, then symlinks. + # Putting symlinks last is a nice thing to do for library + # packages and doesn't affect much of anything else. + # + # (The echo is in here to expand wildcards. Note that ls + # won't work properly.) + for i in `(cd debian/tmp ; echo \`cat $files\`)`; do + tomove="`(cd debian/tmp ; \ + find $i ! -type d -and ! -type l -print)` \ + $tomove \ + `(cd debian/tmp ; \ + find $i ! -type d -and -type l -print)`" + done + + complex_doit "(cd debian/tmp;tar --create --remove-files --file - "$tomove") | (cd $TMP;tar xpf -)" fi done diff --git a/dh_movefiles.1 b/dh_movefiles.1 index c7e8183..4243758 100644 --- a/dh_movefiles.1 +++ b/dh_movefiles.1 @@ -12,7 +12,12 @@ you need to break that up into subpackages. .P Files named debian/package.files list the files to be moved, separated by whitespace. The filenames listed should be relative to debian/tmp/. You can -also list directory names, and the whole directory will be moved. +also list directory names, and the whole directory will be moved. You can +even use wildcards if you like. +.P +The files will be moved in a special order: first all normal files, then all +symlinks. This is done becuase it tends to be a good thing to have symlinks +last in debian packages, particularly in shared library packages. .SH OPTIONS .TP .B \-v, \--verbose -- 2.39.5