r213: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 9ea49a2e377212364340e4f3dfd95116b7219b82..03df5b3b18fc92524c60f627c523ef2c93c80c3b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (1.2.73) unstable; urgency=low
+
+  * dh_installemacsen: make sure files are installed mode 0644. Not strictly
+    necessary since dh_fixperms fixes them if you have a wacky umask, but oh
+    well. (Closes: 38900)
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu,  3 Jun 1999 14:50:42 -0700
+
 debhelper (1.2.72) unstable; urgency=low
 
   * dh_installemacsen: use debian/package.emacsen-startup, not

diff --git a/dh_installemacsen b/dh_installemacsen
index 778720a14b6b9617bd7bbcdbadd99221c400e24d..f271338f873148055e1cdffa9157b0643002f919 100755 (executable)
--- a/dh_installemacsen
+++ b/dh_installemacsen
@@ -24,21 +24,21 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                if (! -d "$TMP/usr/lib/emacsen-common/packages/install") {
                        doit("install","-d","$TMP/usr/lib/emacsen-common/packages/install");
                }
-               doit("install",$emacsen_install,"$TMP/usr/lib/emacsen-common/packages/install/$PACKAGE");
+               doit("install","-m0644",$emacsen_install,"$TMP/usr/lib/emacsen-common/packages/install/$PACKAGE");
        }
 
        if ($emacsen_remove ne '') {
                if (! -d "$TMP/usr/lib/emacsen-common/packages/remove") {
                        doit("install","-d","$TMP/usr/lib/emacsen-common/packages/remove");
                }
-               doit("install","$emacsen_remove","$TMP/usr/lib/emacsen-common/packages/remove/$PACKAGE");
+               doit("install","-m0644","$emacsen_remove","$TMP/usr/lib/emacsen-common/packages/remove/$PACKAGE");
        }
        
        if ($emacsen_startup ne '') {
                if (! -d "$TMP/etc/$dh{flavor}/site-start.d/") {
                        doit("install","-d","$TMP/etc/$dh{flavor}/site-start.d/");
                }
-               doit("install",$emacsen_startup,"$TMP/etc/$dh{flavor}/site-start.d/$dh{number}$PACKAGE.el");
+               doit("install","-m0644",$emacsen_startup,"$TMP/etc/$dh{flavor}/site-start.d/$dh{number}$PACKAGE.el");
        }
 
        if ($emacsen_install ne '' || $emacsen_remove ne '') {

diff --git a/dh_installmanpages b/dh_installmanpages
index 98386254905b407c00a58b473f2e757273096feb..f4dca9a3d9be9754f9ba4f43d3d0066d8965a5ee 100755 (executable)
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -34,7 +34,7 @@ sub find_man {
        }
        
        # And file does think it's a real man page?
-       my $type=`file $_`;
+       my $type=`file -z $_`;
        if ($type !~ m/:.*roff/) {
                return;
        }