summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey>2004-07-11 22:21:54 +0000
committerjoey <joey>2004-07-11 22:21:54 +0000
commit924b0fd26426745e6c689bc15c0b7dd48b10bc86 (patch)
tree600049304c945c72a57e392b9e9ceb9f19696742
parent157b82c1b581cca45c560e47bbd9c4af9531543e (diff)
r1700: * Make dh_gconf postinst more portable.
* Strip spoch when generating udeb filenames. Closes: #258864
-rw-r--r--Debian/Debhelper/Dh_Lib.pm4
-rw-r--r--autoscripts/postinst-gconf2
2 files changed, 4 insertions, 2 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 6ccd0966..c64f6433 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 f4a7c82d..a0674bfd 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