[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r894 - in glibc-package/branches/glibc-2.3.4/debian: . debhelper.in



Author: gotom
Date: 2005-04-16 16:17:22 +0000 (Sat, 16 Apr 2005)
New Revision: 894

Modified:
   glibc-package/branches/glibc-2.3.4/debian/changelog
   glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc.postinst
   glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc.postrm
Log:
    * Fix more libc6 upgrade problem from old <= 2.3.4-1:
      - debian/debhelper.in/libc.postinst: Don't use uname -m, use
        dpkg --print-installation-architecture.  Hwcappkgs mechanism does not
        work on (ex:) install architecture: i386, kernel architecture: amd64.
      - debian/debhelper.in/libc.postrm: Likewise.


Modified: glibc-package/branches/glibc-2.3.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/changelog	2005-04-16 16:16:09 UTC (rev 893)
+++ glibc-package/branches/glibc-2.3.4/debian/changelog	2005-04-16 16:17:22 UTC (rev 894)
@@ -26,6 +26,12 @@
       amd64, i386, powerpc, s390, sh and sparc.
       - debian/patches/linuxthreads-sizefix.dpatch: Update.
 
+    * Fix more libc6 upgrade problem from old <= 2.3.4-1:
+      - debian/debhelper.in/libc.postinst: Don't use uname -m, use
+        dpkg --print-installation-architecture.  Hwcappkgs mechanism does not
+        work on (ex:) install architecture: i386, kernel architecture: amd64.
+      - debian/debhelper.in/libc.postrm: Likewise.
+
  -- GOTO Masanori <gotom@debian.org>  Sun, 10 Apr 2005 14:02:19 +0900
 
 glibc (2.3.4-3) experimental; urgency=low

Modified: glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc.postinst	2005-04-16 16:16:09 UTC (rev 893)
+++ glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc.postinst	2005-04-16 16:17:22 UTC (rev 894)
@@ -193,11 +193,11 @@
 	# it's first time to install ld.so.hwcappkgs aware packages.  We record
 	# all current hwcap package status.
 	if [ ! -f /etc/ld.so.hwcappkgs ]; then
-	    case "`uname -m`" in
-		i?86)
+	    case $(dpkg --print-installation-architecture) in
+		i386)
 		    hwcappkgs="libc6 libc6-i686"
 		    ;;
-		sparc*)
+		sparc)
 		    hwcappkgs="libc6 libc6-sparcv9 libc6-sparcv9b"
 		    ;;
 	    esac

Modified: glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc.postrm
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc.postrm	2005-04-16 16:16:09 UTC (rev 893)
+++ glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc.postrm	2005-04-16 16:17:22 UTC (rev 894)
@@ -12,8 +12,8 @@
 fi
 
 if [ "$1" = upgrade ]; then
-    case "`uname -m`" in
-	i?86|sparc*)
+    case $(dpkg --print-installation-architecture) in
+	i386|sparc)
 	    if dpkg --compare-versions "$2" lt 2.3.4-3; then
 		hwcappkgs=remove
 	    fi



Reply to: