From: joey <joey>
Date: Sun, 11 Jul 2004 22:21:54 +0000 (+0000)
Subject: r1700:    * Make dh_gconf postinst more portable.
X-Git-Tag: 4.2.14^0
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=924b0fd26426745e6c689bc15c0b7dd48b10bc86;p=debhelper.git

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 6ccd096..c64f643 100644
--- 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 f4a7c82..a0674bf 100644
--- 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