r95: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 180a6423867dbaf6a2d54f0d48e4640b89dc387d..cca97b6f2cacb6da1fe4fc7aa8a5aed7ff703f0d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (0.98) unstable; urgency=low
+
+  * dh_lib: isnative: pass -l<changelog> to dpkg-parsechangelog, to support
+    odd packages with multiple different debian changelogs.
+  * doc/PROGRAMMING: cleaned up the docs on DH_EXCLUDE_FIND.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon,  6 Jul 1998 12:45:13 -0700
+
 debhelper (0.97) unstable; urgency=low
 
   * doc/from-debstd: fixed a typo.

diff --git a/dh_compress b/dh_compress
index d24a561aec7b7a97c15e704995743908c673c57f..1b58f70a19f85a7a6cbb268f634487d3cd4e6cc3 100755 (executable)
--- a/dh_compress
+++ b/dh_compress
@@ -28,8 +28,8 @@ filelist () {
 # Call only if DH_EXCLUDE_GREP is non-empty.
 filelist_excluded () {
        # Use grep -F so we don't have to worry about regexp's.
-       filelist | grep -v -F \
-               "`echo "$DH_EXCLUDE_GREP" | tr "|" "\n"`"
+       (filelist | grep -v -F \
+               "`echo "$DH_EXCLUDE_GREP" | tr "|" "\n"`") || true
 }
 
 for PACKAGE in $DH_DOPACKAGES; do

diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index faaa9360b54c5a98022307c443f55a0f8e725548..402d5e782387a32be6df7551a8bba3832bdb05f2 100644 (file)
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -81,8 +81,10 @@ switch               variable        description
                DH_EXCLUDE_GREP same as DH_EXCLUDE, except all items are
                                separated by '|' characters, instead of spaces,
                                handy for egrep -v
-                DH_EXCLUDE_FIND same as DH_EXCLUDE, except all items are
-                                separated by " -or " 
+                DH_EXCLUDE_FIND same as DH_EXCLUDE, except all items are put
+                               into a string in a way that they will make
+                               find find them. (Use ! in front to negate
+                               that, of course)
 -x             DH_INCLUDE_CONFFILES
                                include conffiles. It's -x for obscure
                                historical reasons.