r4855 - in glibc-package/trunk/debian: . control.in
Author: aurel32
Date: 2011-08-08 08:46:51 +0000 (Mon, 08 Aug 2011)
New Revision: 4855
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/libc
Log:
* Add a Breaks: perl (<< 5.12.4-2) to libc0.1/6/6.1. Closes: #636686.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-08-08 08:46:12 UTC (rev 4854)
+++ glibc-package/trunk/debian/changelog 2011-08-08 08:46:51 UTC (rev 4855)
@@ -3,6 +3,7 @@
[ Aurelien Jarno ]
* Add testsuite results for s390x.
* Install x86-64 version of ldd in libc-bin:i386. Closes: #636947.
+ * Add a Breaks: perl (<< 5.12.4-2) to libc0.1/6/6.1. Closes: #636686.
-- Aurelien Jarno <aurel32@debian.org> Fri, 05 Aug 2011 07:46:28 +0200
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2011-08-08 08:46:12 UTC (rev 4854)
+++ glibc-package/trunk/debian/control 2011-08-08 08:46:51 UTC (rev 4855)
@@ -7,7 +7,7 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], gnumach-dev [hurd-i386], libpthread-stubs0-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
binutils (>= 2.20-3), binutils (>= 2.21) [sparc sparc64],
- g++-4.4 (>= 4.4.2-2), g++-4.4-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc]
+ g++-4.4 (>= 4.4.2-2) [!armhf], g++-4.6 [armhf], g++-4.4-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>
@@ -140,7 +140,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)
+Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i386 [kfreebsd-i386],
@@ -226,7 +226,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)
+Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i386 [kfreebsd-i386],
@@ -312,7 +312,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)
+Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i386 [kfreebsd-i386],
@@ -398,7 +398,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)
+Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2)
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-08 08:46:12 UTC (rev 4854)
+++ glibc-package/trunk/debian/control.in/libc 2011-08-08 08:46:51 UTC (rev 4855)
@@ -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)
+Breaks: nscd (<< 2.13), locales (<< 2.13), locales-all (<< 2.13), perl (<< 5.12.4-2)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i386 [kfreebsd-i386],
Reply to: