r206: Initial Import

diff --git a/debian/changelog b/debian/changelog
index dce70aa263b6bb6fcfb18579a9f652f81facf291..d019946492d241608ec1915025489c1ddeb4a0d0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (1.2.67) unstable; urgency=low
+
+  * dh_installmodules: fixed type that made the program not work.
+
+ -- Joey Hess <joeyh@master.debian.org>  Wed, 12 May 1999 00:25:05 -0700
+
 debhelper (1.2.66) unstable; urgency=low
 
   * examples/rules.multi: dh_shlibdeps must be run before dh_gencontrol

diff --git a/debian/control b/debian/control
index 7254be98f111e9fbd4824d184c8f8a4238c1fe47..3f546b8ec3440527e0f9a4428391c22c416b13ce 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debhelper
 Section: devel
 Priority: optional
 Maintainer: Joey Hess <joeyh@master.debian.org>
-Standards-Version: 2.5.0.0
+Standards-Version: 2.5.1.0
 
 Package: debhelper
 Architecture: all

diff --git a/dh_installchangelogs b/dh_installchangelogs
index 40a68f3d30cfd06de4bc23f90aeaa46ce9671e77..877aa822c906b43d93dfeaa2479695153e297669 100755 (executable)
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -39,15 +39,18 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        if (! -d "$TMP/usr/doc/$PACKAGE") {
                doit("install","-d","$TMP/usr/doc/$PACKAGE");
        }
-       doit("install","-p","-m644",$changelog,"$TMP/usr/doc/$PACKAGE/$changelog_name");
+       doit("install","-o","root","-g","root","-p","-m644",$changelog,
+               "$TMP/usr/doc/$PACKAGE/$changelog_name");
 
        if ($upstream) {
                if ($upstream=~m/\.html?$/i) {
                        # HTML changelog
-                       doit("install","-p","-m644",$upstream,"$TMP/usr/doc/$PACKAGE/changelog.html");
+                       doit("install","-o","root","-g","root","-p","-m644",
+                               $upstream,"$TMP/usr/doc/$PACKAGE/changelog.html");
                }
                else {
-                       doit("install","-p","-m644",$upstream,"$TMP/usr/doc/$PACKAGE/changelog");
+                       doit("install","-o","root","-g","root","-p","-m644",
+                               $upstream,"$TMP/usr/doc/$PACKAGE/changelog");
                }
                if ($dh{K_FLAG}) {
                        # Install symlink to original name of the upstream changelog file.

diff --git a/dh_installmodules b/dh_installmodules
index 264ae9c0afdfa29322f9a88288e1bcfceab5fe8c..1e111e5abc5810ff7c91470ded46413387bbfcd0 100755 (executable)
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -17,7 +17,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        if ($file) {
                if (! -e "$TMP/etc/modutils") {
                        doit("install","-d","$TMP/etc/modutils");
-                       doit("cp","-m0644",$file,"$TMP/etc/modutils/$PACKAGE");
+                       doit("install","-m","0644",$file,"$TMP/etc/modutils/$PACKAGE");
                }
                
                if (! $dh{NOSCRIPTS}) {

diff --git a/doc/README b/doc/README
index c292c2baafd3ec8046adc592d4606725d609b5e5..77362d3ffa4ebbbc40a67b38381e1095ffbb14a8 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -42,10 +42,11 @@ Note that it will be shell code, so you cannot directly use it in a perl
 script. If you would like to embed it into a perl script, here is one way to
 do that (note that I made sure that $1, $2, etc are set with the set command):
 
-my $temp="set -- @ARGV\n" . << `EOF`;
+my $temp="set -e\nset -- @ARGV\n" . << 'EOF';
 #DEBHELPER#
 EOF
-system $temp;
+system ($temp) / 256 == 0
+       or die "Problem with debhelper scripts: $!\n";
 
 Other notes:
 -----------