r4921 - in glibc-package/trunk/debian: . control.in debhelper.in
Author: aurel32
Date: 2011-08-24 07:59:53 +0000 (Wed, 24 Aug 2011)
New Revision: 4921
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/libc
glibc-package/trunk/debian/debhelper.in/libc.preinst
glibc-package/trunk/debian/debhelper.in/libc.prerm
Log:
* On s390x the PI is /lib/ld64.so.1, so we don't need to move
ld64.so.1 from /lib to /lib64.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-08-23 05:03:08 UTC (rev 4920)
+++ glibc-package/trunk/debian/changelog 2011-08-24 07:59:53 UTC (rev 4921)
@@ -1,8 +1,9 @@
eglibc (2.13-18) UNRELEASED; urgency=low
- *
+ * On s390x the PI is /lib/ld64.so.1, so we don't need to move
+ ld64.so.1 from /lib to /lib64.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 23 Aug 2011 07:02:45 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 24 Aug 2011 08:45:54 +0200
eglibc (2.13-17) unstable; urgency=low
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2011-08-23 05:03:08 UTC (rev 4920)
+++ glibc-package/trunk/debian/control 2011-08-24 07:59:53 UTC (rev 4921)
@@ -141,7 +141,7 @@
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
-Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2), lsb-core (<= 3.2-27) [amd64 ppc64 s390x sparc64]
+Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64]
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i386 [kfreebsd-i386],
@@ -227,7 +227,7 @@
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
-Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2), lsb-core (<= 3.2-27) [amd64 ppc64 s390x sparc64]
+Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64]
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i386 [kfreebsd-i386],
@@ -313,7 +313,7 @@
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
-Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2), lsb-core (<= 3.2-27) [amd64 ppc64 s390x sparc64]
+Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64]
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i386 [kfreebsd-i386],
@@ -399,7 +399,7 @@
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
-Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2), lsb-core (<= 3.2-27) [amd64 ppc64 s390x sparc64]
+Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64]
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i386 [kfreebsd-i386],
Modified: glibc-package/trunk/debian/control.in/libc
===================================================================
--- glibc-package/trunk/debian/control.in/libc 2011-08-23 05:03:08 UTC (rev 4920)
+++ glibc-package/trunk/debian/control.in/libc 2011-08-24 07:59:53 UTC (rev 4921)
@@ -8,7 +8,7 @@
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
-Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2), lsb-core (<= 3.2-27) [amd64 ppc64 s390x sparc64]
+Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64]
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i386 [kfreebsd-i386],
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2011-08-23 05:03:08 UTC (rev 4920)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2011-08-24 07:59:53 UTC (rev 4921)
@@ -412,7 +412,7 @@
upgrade|abort-upgrade)
if test -L /lib64 && dpkg --compare-versions "$2" lt 2.13-17; then
case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
- amd64 | ppc64 | sparc64 | s390x)
+ amd64 | ppc64 | sparc64)
remove_lib64_symlink
;;
esac
Modified: glibc-package/trunk/debian/debhelper.in/libc.prerm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.prerm 2011-08-23 05:03:08 UTC (rev 4920)
+++ glibc-package/trunk/debian/debhelper.in/libc.prerm 2011-08-24 07:59:53 UTC (rev 4921)
@@ -50,7 +50,7 @@
if dpkg --compare-versions "$preversion" lt 2.13-17; then
if ! test -L /lib64; then
case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
- amd64 | ppc64 | sparc64 | s390x)
+ amd64 | ppc64 | sparc64)
restore_lib64_symlink ;;
esac
fi
Reply to: