Author: adconrad Date: 2012-04-18 11:32:53 +0000 (Wed, 18 Apr 2012) New Revision: 5191
Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/debhelper.in/libc.postinst glibc-package/trunk/debian/debhelper.in/libc.preinst Log: Guard DPKG_MAINTSCRIPT_ARCH usage with dpkg --assert-multi-arch, since squeeze's dpkg has a half-implementation (closes: #669172) Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2012-04-18 00:54:11 UTC (rev 5190) +++ glibc-package/trunk/debian/changelog 2012-04-18 11:32:53 UTC (rev 5191) @@ -1,3 +1,10 @@ +eglibc (2.13-30) unstable; urgency=low + + * Guard DPKG_MAINTSCRIPT_ARCH usage with dpkg --assert-multi-arch, + since squeeze's dpkg has a half-implementation (closes: #669172) + + -- Adam Conrad <adcon...@0c3.net> Wed, 18 Apr 2012 05:08:21 -0600 + eglibc (2.13-29) unstable; urgency=low * debian/debhelper.in/libc.{preinst,postinst}: Make use of dpkg's Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst =================================================================== --- glibc-package/trunk/debian/debhelper.in/libc.postinst 2012-04-18 00:54:11 UTC (rev 5190) +++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2012-04-18 11:32:53 UTC (rev 5191) @@ -7,7 +7,11 @@ package_name() { - echo LIBC${DPKG_MAINTSCRIPT_ARCH:+:$DPKG_MAINTSCRIPT_ARCH} + if dpkg --assert-multi-arch 2>/dev/null; then + echo LIBC:${DPKG_MAINTSCRIPT_ARCH} + else + echo LIBC + fi } # 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-18 00:54:11 UTC (rev 5190) +++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2012-04-18 11:32:53 UTC (rev 5191) @@ -7,7 +7,11 @@ package_name() { - echo LIBC${DPKG_MAINTSCRIPT_ARCH:+:$DPKG_MAINTSCRIPT_ARCH} + if dpkg --assert-multi-arch 2>/dev/null; then + echo LIBC:${DPKG_MAINTSCRIPT_ARCH} + else + echo LIBC + fi } rm_conffile() { -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1skt82-0001ee...@vasks.debian.org