r106: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 38ae77710d295e0ba627ba2f351945c5f1f501d0..63e04237bbcbbf759ab42d0d3aeb7e7040ab533a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+debhelper (1.1.1) unstable; urgency=low
+
+  * dh_movefiles: try to move all files specified, and only then bomb out if
+    some of the file could not be found. Makes it easier for some packages
+    that don't always have the same files in them.
+  * dh_compress: any parameters passed to it on the command line specify
+    additional files to be compressed in the first package acted on.
+  * dh_compress: recognize standard -A parameter.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat,  8 Aug 1998 22:48:01 -0700
+
 debhelper (1.1.0) unstable; urgency=low
 
   * New unstable branch of debhelper.

diff --git a/dh_clean.1 b/dh_clean.1
index 333fa1743db20555644f16bef9599ef1a8dc8143..3c1d2795df56262b0e34bf0540f7a1d66d85b7da 100644 (file)
--- a/dh_clean.1
+++ b/dh_clean.1
@@ -8,7 +8,7 @@ dh_clean \- clean up package build directories
 dh_clean is a debhelper program that is responsible for cleaning up after a
 package is built. It removes the package build directories, and removes some
 other files, such as debian/substvars, debian/files, DEADJOE, emacs backup 
-files, etc.
+files, any detritus left behind by other debhelper commands, etc.
 .SH OPTIONS
 .TP
 .B debhelper options

diff --git a/dh_strip b/dh_strip
index daea754c16ceff4859319b0d576abe4dbd2ab62c..385efeff005096f86a730d8f86a972e9618f4aaa 100755 (executable)
--- a/dh_strip
+++ b/dh_strip
@@ -5,26 +5,38 @@
 PATH=debian:$PATH:/usr/lib/debhelper
 . dh_lib
 
+# This reads in a list of files, and excludes any that match what's in
+# DH_EXCLUDE_GREP.
+filelist_excluded () {
+       if [ "$DH_EXCLUDE_GREP" ]; then
+               # Use grep -F so we don't have to worry about regexp's.
+               grep -v -F "`(cd $TMP; echo "$DH_EXCLUDE_GREP" | tr "|" "\n")`"
+       else
+               # Just pass all files through.
+               cat
+       fi
+}
+
 for PACKAGE in $DH_DOPACKAGES; do
        TMP=`tmpdir $PACKAGE`
-       
+
        # Handle executables and shared libraries.
-       for file in `find $TMP -type f \( -perm +111 -or -name "*.so*" \) 2>/dev/null` ; do
-               case "`file $file`" in
+       for file in `(cd $TMP; find -type f \( -perm +111 -or -name "*.so*" \) 2>/dev/null) | filelist_excluded` ; do
+               case "`file $TMP/$file`" in
                        *ELF*shared*)
-                               doit "strip --strip-unneeded $file"
+                               doit "strip --strip-unneeded $TMP/$file"
                        ;;
                        *ELF*executable*)
-                               doit "strip --remove-section=.comment --remove-section=.note $file"
+                               doit "strip --remove-section=.comment --remove-section=.note $TMP/$file"
                        ;;
                esac
        done
 
        # Handle static libraries.
-       for file in `find $TMP -type f -name "lib*.a" 2>/dev/null` ; do
+       for file in `(cd $TMP; find -type f -name "lib*.a" 2>/dev/null) | filelist_excluded` ; do
                # Don't strip debug libraries.
                if ! expr "$file" : ".*_g\.a" >/dev/null ; then
-                       doit "strip --strip-debug $file"
+                       doit "strip --strip-debug $TMP/$file"
                fi
        done
 done

diff --git a/dh_strip.1 b/dh_strip.1
index 960dc72e9f9ab4c5e9dd19da45b3177b21e1f353..6ddcde135056b14d78904c5870f7c6e076bafc26 100644 (file)
--- a/dh_strip.1
+++ b/dh_strip.1
@@ -3,7 +3,7 @@
 dh_strip \- strip executables, shared libraries, and some static libraries.
 .SH SYNOPSIS
 .B dh_strip
-.I "[debhelper options]"
+.I "[debhelper options] [-Xitem]"
 .SH "DESCRIPTION"
 dh_strip is a debhelper program that is responsible for stripping
 executables, shared libraries, and static libraries that are not used for
@@ -17,6 +17,11 @@ used in debugging, and will not strip them.
 See
 .BR debhelper (1)
 for a list of options common to all debhelper commands.
+.TP
+.B \-Xitem, \--exclude=item
+Exclude files that contain "item" anywhere in their filename from being
+stripped. You may use this option multiple times to build up a list of
+things to exclude.
 .SH ENVIRONMENT
 See
 .BR debhelper (1)

diff --git a/doc/TODO b/doc/TODO
index 0a2a5bdeed1a674e7425ed7192696b779cddc71b..83f38659445349769680ac0480f6c479cd2e782f 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -11,7 +11,6 @@ Bugs:
 
 Wishlist items:
 
-* Add emacsen support to debhelper. (#21401)
 * Make dh_movefiles remove emptied directories after it's moved all the
   files out of them (#17111).
 * info support for debhelper (currently implemented, but I hate how I did it,
@@ -59,3 +58,22 @@ Depricated:
 * remove dh_installdebfiles, dh_du.
        - need to wait a reasonable length of time. I'm currently planning
          on doing this after slink is released.
+
+Long term goals:
+
+Convert selected and then selected debhelper commands (dh_installmanpages?)
+to be perl programs, for speed, ease of maintainence, and 8-bit cleanness.
+Tricky, because of the -v option -- they'd have to call external commands
+like install and cp, and log such calls if verbose was on. Maybe something
+like:
+
+doit {
+       system @_;
+       if ($DH_VERBOSE) {
+               print join " ", @_;
+       }
+}
+
+However, this will output commands that are incorrect if the filenames in
+them contain spaces or other weird characters. Hmm, maybe such things should
+just be escaped with \'s in the output?

diff --git a/examples/rules b/examples/rules
index e3e6c3b5de62f1faea43863d3900d0a47b5f39c9..8756505e5cc97b85e2552f94bd7c144a7f87dc3e 100755 (executable)
--- a/examples/rules
+++ b/examples/rules
@@ -48,6 +48,7 @@ binary-arch: build install
        dh_installdocs
        dh_installexamples
        dh_installmenu
+#      dh_installemacsen
 #      dh_installinit
        dh_installcron
        dh_installmanpages

diff --git a/examples/rules.indep b/examples/rules.indep
index bb2e00badcd6196b1f699fa7109f76f30de626dc..eabd48407c1d1e59769042efd1418c24b061d7e7 100755 (executable)
--- a/examples/rules.indep
+++ b/examples/rules.indep
@@ -45,6 +45,7 @@ binary-indep: build install
        dh_installdocs
        dh_installexamples
        dh_installmenu
+#      dh_installemacsen
 #      dh_installinit
        dh_installcron
 #      dh_installmanpages

diff --git a/examples/rules.multi b/examples/rules.multi
index 42e4052aa5761c30ebcd819e808fb4ea041b9f8f..5852751ec3cca9f7e5948ddfffb65eb22b7cb1ce 100755 (executable)
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -48,6 +48,7 @@ binary-indep: build install
        dh_installdocs -i
        dh_installexamples -i
        dh_installmenu -i
+#      dh_installemacsen -i
 #      dh_installinit -i
        dh_installcron -i
 #      dh_installmanpages -i
@@ -70,6 +71,7 @@ binary-arch: build install
        dh_installdocs -a
        dh_installexamples -a
        dh_installmenu -a
+#      dh_installemacsen -a
 #      dh_installinit -a
        dh_installcron -a
        dh_installmanpages -a