r5188 - in glibc-package/trunk/debian: . debhelper.in
Author: adconrad
Date: 2012-04-18 00:52:21 +0000 (Wed, 18 Apr 2012)
New Revision: 5188
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.postinst
glibc-package/trunk/debian/debhelper.in/libc.preinst
Log:
debian/debhelper.in/libc.{preinst,postinst}: Make use of dpkg's
DPKG_MAINTSCRIPT_ARCH variable and guard it so it doesn't make
older non-multi-arch dpkg versions have a sad (closes: #669172)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-04-17 04:28:59 UTC (rev 5187)
+++ glibc-package/trunk/debian/changelog 2012-04-18 00:52:21 UTC (rev 5188)
@@ -1,6 +1,8 @@
eglibc (2.13-29) UNRELEASED; urgency=low
- *
+ * debian/debhelper.in/libc.{preinst,postinst}: Make use of dpkg's
+ DPKG_MAINTSCRIPT_ARCH variable and guard it so it doesn't make
+ older non-multi-arch dpkg versions have a sad (closes: #669172)
-- Adam Conrad <adconrad@0c3.net> Mon, 16 Apr 2012 22:28:06 -0600
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2012-04-17 04:28:59 UTC (rev 5187)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2012-04-18 00:52:21 UTC (rev 5188)
@@ -7,7 +7,7 @@
package_name()
{
- echo LIBC
+ echo LIBC${DPKG_MAINTSCRIPT_ARCH:+:$DPKG_MAINTSCRIPT_ARCH}
}
# element() is a helper function for file-rc:
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2012-04-17 04:28:59 UTC (rev 5187)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2012-04-18 00:52:21 UTC (rev 5188)
@@ -5,6 +5,11 @@
type=$1
preversion=$2
+package_name()
+{
+ echo LIBC${DPKG_MAINTSCRIPT_ARCH:+:$DPKG_MAINTSCRIPT_ARCH}
+}
+
rm_conffile() {
local PKGNAME="$1"
local CONFFILE="$2"
@@ -147,7 +152,7 @@
then
# Remove old /etc/init.d/glibc.sh init script
if dpkg --compare-versions "$preversion" le "2.9-22"; then
- rm_conffile LIBC "/etc/init.d/glibc.sh"
+ rm_conffile $(package_name) "/etc/init.d/glibc.sh"
update-rc.d glibc.sh remove >/dev/null
fi
@@ -255,7 +260,7 @@
# the dynamic linker uses.
ldfile=$(readlink -e RTLD_SO)
ldbytes=$(head -c 20 RTLD_SO | od -c)
- libcfiles=$(dpkg-query -L LIBC 2>/dev/null)
+ libcfiles=$(dpkg-query -L $(package_name) 2>/dev/null)
dirs="SLIBDIR /lib /lib/tls /lib32 /lib64 /usr/local/lib /usr/local/lib32 /usr/local/lib64"
for dir in $dirs ; do
Reply to: