r171: Initial Import

diff --git a/autoscripts/postinst-menu-method b/autoscripts/postinst-menu-method
index 6ab538cb60f61df9f6c9adbe9de39d26c5d20be0..03acde7f692ad5f4ab0ab3e76c406afe3001225f 100644 (file)
--- a/autoscripts/postinst-menu-method
+++ b/autoscripts/postinst-menu-method
@@ -1,5 +1,5 @@
 inst=/etc/menu-methods/#PACKAGE#
-if [ -x /usr/bin/update-menus && -f $inst ] ; then
+if [ -x /usr/bin/update-menus -a -f $inst ] ; then
        chmod a+x $inst
        update-menus
 fi

diff --git a/debian/changelog b/debian/changelog
index cf51a7cac6888d68051b44763b3214e4b1d60b83..5a4fe4e46436bdd286a5e0eb9a5df0f1ff02aa91 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (1.2.35) unstable; urgency=low
+
+  * Dh_Lib.pm filearray(): Deal with multiple spaces and spaces at the 
+    beginning of lines in files. (closes: #33161)
+
+ -- Joey Hess <joeyh@master.debian.org>  Tue,  9 Feb 1999 21:01:07 -0800
+
 debhelper (1.2.34) unstable; urgency=low
 
   * dh_clean: added -d flag (also --dirs-only) that will make it clean only

diff --git a/dh_compress.1 b/dh_compress.1
index 4d1fa1f72236d1975ea1aa3397dbc7b2e831fc03..8fa2d80273d63cee6d90f77a0e9b7b0395e0b2cd 100644 (file)
--- a/dh_compress.1
+++ b/dh_compress.1
@@ -38,7 +38,7 @@ 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
-compressed. For example, -X=.jpeg will exclude jpeg's from compression.
+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
 exclude. You can accomplish the same thing by using a debian/compress file,
 but this is easier.