r6078 - in glibc-package/trunk/debian: . control.in
Author: aurel32
Date: 2014-05-19 08:53:35 +0000 (Mon, 19 May 2014)
New Revision: 6078
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/i386
glibc-package/trunk/debian/control.in/libc
glibc-package/trunk/debian/control.in/mips64
glibc-package/trunk/debian/control.in/mipsn32
glibc-package/trunk/debian/control.in/powerpc
glibc-package/trunk/debian/control.in/s390
glibc-package/trunk/debian/control.in/sparc
glibc-package/trunk/debian/control.in/sparc64
Log:
control.in/*: remove conflicts between multiarch libc packages using the same
dynamic library loader. This was introduced in 2.18-6, but sadly the
infrastructure is not ready for that, leaving now way to fix the problem.
Reopens: #745552.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-05-19 07:07:50 UTC (rev 6077)
+++ glibc-package/trunk/debian/changelog 2014-05-19 08:53:35 UTC (rev 6078)
@@ -6,6 +6,10 @@
* testsuite-checking/expected-results-*s390*: ignore tst-cancel17.out
failure, it is due to a bug in the test (see BZ #12683).
* local/etc/bindresvport.blacklist: add port 655 (tinc). Closes: #748338.
+ * control.in/*: remove conflicts between multiarch libc packages using the same
+ dynamic library loader. This was introduced in 2.18-6, but sadly the
+ infrastructure is not ready for that, leaving now way to fix the problem.
+ Reopens: #745552.
[ Samuel Thibault ]
* patches/hurd-i386/cvs-libpthread_guardsize.diff: Disable for now, it
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2014-05-19 07:07:50 UTC (rev 6077)
+++ glibc-package/trunk/debian/control 2014-05-19 08:53:35 UTC (rev 6078)
@@ -144,8 +144,6 @@
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),
- libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc], libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
- libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel [alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390], libc6:s390 [alpha m68k mips mipsel powerpc],
Breaks: nscd (<< 2.18), locales (<< 2.18), locales-all (<< 2.18), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
@@ -236,8 +234,6 @@
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),
- libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc], libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
- libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel [alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390], libc6:s390 [alpha m68k mips mipsel powerpc],
Breaks: nscd (<< 2.18), locales (<< 2.18), locales-all (<< 2.18), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
@@ -328,8 +324,6 @@
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),
- libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc], libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
- libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel [alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390], libc6:s390 [alpha m68k mips mipsel powerpc],
Breaks: nscd (<< 2.18), locales (<< 2.18), locales-all (<< 2.18), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
@@ -420,8 +414,6 @@
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),
- libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc], libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
- libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel [alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390], libc6:s390 [alpha m68k mips mipsel powerpc],
Breaks: nscd (<< 2.18), locales (<< 2.18), locales-all (<< 2.18), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
@@ -508,7 +500,6 @@
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Replaces: libc6-dev-i386
-Conflicts: libc6:alpha, libc6:sh4, libc6:sparc, libc6-sparc:sparc64
Breaks: fakeroot (<< 1.12.3), gnu-efi (<< 3.0e-3), fakechroot (<< 2.9-1.1), fglrx-glx-ia32 (<< 1:9-6-1), ia32-libs (<< 20090804), ia32-libs-gtk (<< 20090804), lib32asound2 (<< 1.0.20-3), lib32asound2-dev (<< 1.0.20-3), lib32bz2-1.0 (<< 1.0.5-3), lib32bz2-dev (<< 1.0.5-3), lib32ffi-dev (<< 3.0.9~rc9-1), lib32ffi5 (<< 3.0.9~rc9-1), lib32g2c0 (<< 1:3.4.6-10), lib32gcc1 (<< 1:4.4.0-7), lib32gfortran3 (<< 4.4.0-7), lib32gmp3 (<< 2:4.3.1+dfsg-3), lib32gmp3-dev (<< 2:4.3.1+dfsg-3), lib32gmpxx4 (<< 2:4.3.1+dfsg-3), lib32gomp1 (<< 4.4.0-7), lib32icu-dev (<< 4.0.1-3), lib32icu40 (<< 4.0.1-3), lib32mudflap0 (<< 4.4.0-7), lib32ncurses5 (<< 5.7+20090523-1), lib32ncurses5-dev (<< 5.7+20090530-1), lib32ncursesw5 (<< 5.7+20090530-1), lib32ncursesw5-dev (<< 5.7+20090530-1), lib32nss-mdns (<< 0.10-3.1), lib32objc2 (<< 4.4.0-7), lib32readline5 (<< 5.2-5), lib32readline5-dev (<< 5.2-5), lib32stdc++6 (<< 4.4.0-7), lib32stdc++6-4.4-dbg (<< 4.4.0-7), lib32z1 (<< 1:1.2.3.3.dfsg-14), lib32z1-dev (<< 1:1.2.3
.3.dfsg-14), libc6-dev-i386 (<< 2.9-15), nvidia-glx-ia32 (<< 185.18.14-2), nvidia-libvdpau1-ia32 (<< 185.18.14-2)
Description: Embedded GNU C Library: 32-bit shared libraries for AMD64
This package includes shared versions of the standard C
@@ -534,7 +525,6 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libc6:alpha, libc6:i386, libc6:sh4
Description: Embedded GNU C Library: 32bit Shared libraries for SPARC
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 32bit version
@@ -559,7 +549,6 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libc6:i386, libc6:sh4
Description: Embedded GNU C Library: 64bit Shared libraries for UltraSPARC
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
@@ -583,7 +572,6 @@
Architecture: s390x
Section: libs
Priority: optional
-Conflicts: libc6:hppa, libc6:m68k, libc6:mips, libc6:mipsel, libc6:powerpc
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: 32bit Shared libraries for IBM zSeries
This package includes shared versions of the standard C library and the
@@ -634,7 +622,6 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libc6:hppa, libc6:m68k, libc6:mips, libc6:mipsel, libc6:s390
Description: Embedded GNU C Library: 32bit powerpc shared libraries for ppc64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -683,7 +670,6 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libc6-mipsn32:mips [mipsel], libc6-mipsn32:mipsel [mips]
Description: Embedded GNU C Library: n32 Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the n32 version
@@ -708,7 +694,6 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libc6-mips64:mips [mipsel], libc6-mips64:mipsel [mips]
Description: Embedded GNU C Library: 64bit Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
Modified: glibc-package/trunk/debian/control.in/i386
===================================================================
--- glibc-package/trunk/debian/control.in/i386 2014-05-19 07:07:50 UTC (rev 6077)
+++ glibc-package/trunk/debian/control.in/i386 2014-05-19 08:53:35 UTC (rev 6078)
@@ -4,7 +4,6 @@
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Replaces: libc6-dev-i386
-Conflicts: libc6:alpha, libc6:sh4, libc6:sparc, libc6-sparc:sparc64
Breaks: fakeroot (<< 1.12.3), gnu-efi (<< 3.0e-3), fakechroot (<< 2.9-1.1), fglrx-glx-ia32 (<< 1:9-6-1), ia32-libs (<< 20090804), ia32-libs-gtk (<< 20090804), lib32asound2 (<< 1.0.20-3), lib32asound2-dev (<< 1.0.20-3), lib32bz2-1.0 (<< 1.0.5-3), lib32bz2-dev (<< 1.0.5-3), lib32ffi-dev (<< 3.0.9~rc9-1), lib32ffi5 (<< 3.0.9~rc9-1), lib32g2c0 (<< 1:3.4.6-10), lib32gcc1 (<< 1:4.4.0-7), lib32gfortran3 (<< 4.4.0-7), lib32gmp3 (<< 2:4.3.1+dfsg-3), lib32gmp3-dev (<< 2:4.3.1+dfsg-3), lib32gmpxx4 (<< 2:4.3.1+dfsg-3), lib32gomp1 (<< 4.4.0-7), lib32icu-dev (<< 4.0.1-3), lib32icu40 (<< 4.0.1-3), lib32mudflap0 (<< 4.4.0-7), lib32ncurses5 (<< 5.7+20090523-1), lib32ncurses5-dev (<< 5.7+20090530-1), lib32ncursesw5 (<< 5.7+20090530-1), lib32ncursesw5-dev (<< 5.7+20090530-1), lib32nss-mdns (<< 0.10-3.1), lib32objc2 (<< 4.4.0-7), lib32readline5 (<< 5.2-5), lib32readline5-dev (<< 5.2-5), lib32stdc++6 (<< 4.4.0-7), lib32stdc++6-4.4-dbg (<< 4.4.0-7), lib32z1 (<< 1:1.2.3.3.dfsg-14), lib32z1-dev (<< 1:1.2.3
.3.dfsg-14), libc6-dev-i386 (<< 2.9-15), nvidia-glx-ia32 (<< 185.18.14-2), nvidia-libvdpau1-ia32 (<< 185.18.14-2)
Description: Embedded GNU C Library: 32-bit shared libraries for AMD64
This package includes shared versions of the standard C
Modified: glibc-package/trunk/debian/control.in/libc
===================================================================
--- glibc-package/trunk/debian/control.in/libc 2014-05-19 07:07:50 UTC (rev 6077)
+++ glibc-package/trunk/debian/control.in/libc 2014-05-19 08:53:35 UTC (rev 6078)
@@ -8,8 +8,6 @@
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),
- libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc], libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
- libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel [alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390], libc6:s390 [alpha m68k mips mipsel powerpc],
Breaks: nscd (<< 2.18), locales (<< 2.18), locales-all (<< 2.18), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
Modified: glibc-package/trunk/debian/control.in/mips64
===================================================================
--- glibc-package/trunk/debian/control.in/mips64 2014-05-19 07:07:50 UTC (rev 6077)
+++ glibc-package/trunk/debian/control.in/mips64 2014-05-19 08:53:35 UTC (rev 6078)
@@ -3,7 +3,6 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libc6-mips64:mips [mipsel], libc6-mips64:mipsel [mips]
Description: Embedded GNU C Library: 64bit Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
Modified: glibc-package/trunk/debian/control.in/mipsn32
===================================================================
--- glibc-package/trunk/debian/control.in/mipsn32 2014-05-19 07:07:50 UTC (rev 6077)
+++ glibc-package/trunk/debian/control.in/mipsn32 2014-05-19 08:53:35 UTC (rev 6078)
@@ -3,7 +3,6 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libc6-mipsn32:mips [mipsel], libc6-mipsn32:mipsel [mips]
Description: Embedded GNU C Library: n32 Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the n32 version
Modified: glibc-package/trunk/debian/control.in/powerpc
===================================================================
--- glibc-package/trunk/debian/control.in/powerpc 2014-05-19 07:07:50 UTC (rev 6077)
+++ glibc-package/trunk/debian/control.in/powerpc 2014-05-19 08:53:35 UTC (rev 6078)
@@ -3,7 +3,6 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libc6:hppa, libc6:m68k, libc6:mips, libc6:mipsel, libc6:s390
Description: Embedded GNU C Library: 32bit powerpc shared libraries for ppc64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
Modified: glibc-package/trunk/debian/control.in/s390
===================================================================
--- glibc-package/trunk/debian/control.in/s390 2014-05-19 07:07:50 UTC (rev 6077)
+++ glibc-package/trunk/debian/control.in/s390 2014-05-19 08:53:35 UTC (rev 6078)
@@ -2,7 +2,6 @@
Architecture: s390x
Section: libs
Priority: optional
-Conflicts: libc6:hppa, libc6:m68k, libc6:mips, libc6:mipsel, libc6:powerpc
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: 32bit Shared libraries for IBM zSeries
This package includes shared versions of the standard C library and the
Modified: glibc-package/trunk/debian/control.in/sparc
===================================================================
--- glibc-package/trunk/debian/control.in/sparc 2014-05-19 07:07:50 UTC (rev 6077)
+++ glibc-package/trunk/debian/control.in/sparc 2014-05-19 08:53:35 UTC (rev 6078)
@@ -3,7 +3,6 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libc6:alpha, libc6:i386, libc6:sh4
Description: Embedded GNU C Library: 32bit Shared libraries for SPARC
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 32bit version
Modified: glibc-package/trunk/debian/control.in/sparc64
===================================================================
--- glibc-package/trunk/debian/control.in/sparc64 2014-05-19 07:07:50 UTC (rev 6077)
+++ glibc-package/trunk/debian/control.in/sparc64 2014-05-19 08:53:35 UTC (rev 6078)
@@ -3,7 +3,6 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libc6:i386, libc6:sh4
Description: Embedded GNU C Library: 64bit Shared libraries for UltraSPARC
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
Reply to: