r1700: * Make dh_gconf postinst more portable.

   * Strip spoch when generating udeb filenames. Closes: #258864

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 6ccd096639219f6325aab1ec3c3f64efe0a1172a..c64f6433e42922f4a15a200f8a848a9561543b8c 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -623,7 +623,9 @@ sub udeb_filename {
        
        my $filearch=$package_arches{$package} eq 'all' ? "all" : buildarch();
        isnative($package); # side effect
-       return "${package}_$dh{VERSION}_$filearch.udeb";
+       my $version=$dh{VERSION};
+       $version=~s/^[0-9]+://; # strip any epoch
+       return "${package}_${version}_$filearch.udeb";
 }
 
 1

diff --git a/autoscripts/postinst-gconf b/autoscripts/postinst-gconf
index f4a7c82d7f13ec55ad8ee49e14b7af5d9099f041..a0674bfd31f56ba525c13c9843100ff96c7cbf3e 100644 (file)
--- a/autoscripts/postinst-gconf
+++ b/autoscripts/postinst-gconf
@@ -9,5 +9,5 @@ if [ "$1" = "configure" ]; then
                fi
        done
 
-       kill -HUP `pidof gconfd-2` >/dev/null 2>&1 || true
+       kill -s HUP `pidof gconfd-2` >/dev/null 2>&1 || true
 fi