r159: Initial Import

diff --git a/autoscripts/postrm-wm b/autoscripts/postrm-wm
index 8345aa97b9ca5877078de385d890d2d038f88079..6a7eb47a6e77c2b7e350edc2986ffcb03220e4cc 100644 (file)
--- a/autoscripts/postrm-wm
+++ b/autoscripts/postrm-wm
@@ -1,4 +1,4 @@
-if [ "$1" == "purge" ] && command -v register-window-manager >/dev/null 2>&1
+if [ "$1" = "purge" ] && command -v register-window-manager >/dev/null 2>&1
 then
        register-window-manager --remove #WM#
 fi

diff --git a/debian/changelog b/debian/changelog
index 2a15b97ab4a30eec9761ccd4f910d6b10fff5130..f15c8dd6c27a322bf20b401f4b98b549bef8679b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (1.2.23) unstable; urgency=low
+
+  * autoscripts/postrm-wm: use "=", not "==" (#31727).
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon, 11 Jan 1999 13:35:00 -0800
+
 debhelper (1.2.22) unstable; urgency=low
 
   * Reversed change in last version; don't clobber mode (#31628).

diff --git a/dh_fixperms b/dh_fixperms
index 7f047fbdb7b2469db08ebba0de0b649721b55fb2..10baaa0141d5ed9c327abffb52c1546bce4c341b 100755 (executable)
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -17,6 +17,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                        doit("chown","-R","root.root",$TMP);
                        doit("chmod","-R","go=rX",$TMP);
                        doit("chmod","-R","u+rw",$TMP);
+                       doit("chmod","-R","a-s",$TMP);
                }
 
                $find_options="";
@@ -29,6 +30,8 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                        2>/dev/null | xargs -0r chmod go=rX");
                complex_doit("find $TMP ! \\( $dh{EXCLUDE_FIND} \\) -print0 \
                        2>/dev/null | xargs -0r chmod u+rw");
+               complex_doit("find $TMP ! \\( $dh{EXCLUDE_FIND} \\) -print0 \
+                       2>/dev/null | xargs -0r chmod a-s");
 
                $find_options="! \\( $dh{EXCLUDE_FIND} \\)";
        }

diff --git a/dh_fixperms.1 b/dh_fixperms.1
index 9e016d17225bb6321f3e01388b9485cc34997bff..f45f0c3c5213532512e5bf5f8ac61a9933424da3 100644 (file)
--- a/dh_fixperms.1
+++ b/dh_fixperms.1
@@ -12,7 +12,8 @@ dh_fixperms makes all files in usr/doc in the package build directory
 (excluding files in the examples/ directory) be mode 644. It also changes 
 the permissions of all man pages to mode 644. It makes all files be owned by 
 root, and it removes group and other write permission from all files.
-Finally, it removes execute permissions from any libraries that have it set.
+It removes execute permissions from any libraries that have it set. Finally,
+it removes the setuid and setgid bits from all files in the package.
 .SH OPTIONS
 .TP
 .B debhelper options

diff --git a/examples/rules.indep b/examples/rules.indep
index 142b99fe7699c70d4870bc96b2f3b4fb6dc3f126..34b78d89a4d620aaf58a3345ce774a313f6a8a04 100755 (executable)
--- a/examples/rules.indep
+++ b/examples/rules.indep
@@ -54,6 +54,7 @@ binary-indep: build install
        dh_link
        dh_compress
        dh_fixperms
+       # You may want to make some executables suid here.
        dh_suidregister
        dh_installdeb
        dh_gencontrol