dh_installinit: Fix installation of defaults file when an upstart job is installed...

diff --git a/debian/changelog b/debian/changelog
index 5afde2ef33faae590880dbab1c1a2e10b04dd7ea..b100e08e46db6d6eec6b2617dfae438213ee703f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 debhelper (7.4.9) UNRELEASED; urgency=low
 
   * Typo. Closes: #558654
+  * dh_installinit: Fix installation of defaults file when an upstart job is
+    installed. Closes: #558782
 
  -- Joey Hess <joeyh@debian.org>  Sun, 29 Nov 2009 14:06:48 -0500
 

diff --git a/dh_installinit b/dh_installinit
index 7b1d2e201dfa4c6d24fb65253dea4b63701ac010..c053132ed10ba6fb5d56525c8151ac79ff81307c 100755 (executable)
--- a/dh_installinit
+++ b/dh_installinit
@@ -177,7 +177,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        }       
        
        my $job=pkgfile($package,"upstart");
-       my ($init,$default) = ('','');
+       my $init='';
 
        if ($job ne '' || ($dh{ONLYSCRIPTS} && -e "$tmp/etc/init/$jobfile.conf")) {
                if (! $dh{ONLYSCRIPTS}) {
@@ -200,9 +200,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        else {
                $init=pkgfile($package,$script) || pkgfile($package,"init") ||
                        pkgfile($package,"init.d");
-               $default=pkgfile($package,'default');
        }
 
+       my $default=pkgfile($package,'default');
        if ($default ne '' && ! $dh{ONLYSCRIPTS}) {
                if (! -d "$tmp/etc/default") {
                        doit("install","-d","$tmp/etc/default");
@@ -218,8 +218,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                doit("install","-p","-m755",$init,"$tmp/etc/init.d/$script");
        }
 
-       if ($job ne '' || $init ne '' || $dh{ONLYSCRIPTS})
-       {
+       if ($job ne '' || $init ne '' || $dh{ONLYSCRIPTS}) {
                if (-e "$tmp/etc/init/$jobfile.conf") {
                        $script=$jobfile;
                }