r4844 - in glibc-package/trunk/debian: . control.in
Author: aurel32
Date: 2011-08-04 07:06:16 +0000 (Thu, 04 Aug 2011)
New Revision: 4844
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control.in/amd64
glibc-package/trunk/debian/control.in/i386
glibc-package/trunk/debian/control.in/kfreebsd-i386
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/ppc64
glibc-package/trunk/debian/control.in/s390
glibc-package/trunk/debian/control.in/s390x
glibc-package/trunk/debian/control.in/sparc64
Log:
* Update conflicts to libc6-dev in biarch packages to (<< 2.13-14) so that
the directory to symlink conversion is done correctly.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-08-04 06:44:37 UTC (rev 4843)
+++ glibc-package/trunk/debian/changelog 2011-08-04 07:06:16 UTC (rev 4844)
@@ -6,6 +6,8 @@
* Fix the biarch symlinks on mipsel, pointing them to the right multiarch
directory.
* Include a symlink for fpu_control in biarch packages. Closes: #635685.
+ * Update conflicts to libc6-dev in biarch packages to (<< 2.13-14) so that
+ the directory to symlink conversion is done correctly.
[ Samuel Thibault ]
* patches/hurd-i386/submitted-sysvshm.diff: Fix shm creation: do not create
Modified: glibc-package/trunk/debian/control.in/amd64
===================================================================
--- glibc-package/trunk/debian/control.in/amd64 2011-08-04 06:44:37 UTC (rev 4843)
+++ glibc-package/trunk/debian/control.in/amd64 2011-08-04 07:06:16 UTC (rev 4844)
@@ -15,7 +15,7 @@
Priority: optional
Depends: libc6-amd64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
-Conflicts: libc6-dev (<< 2.13-11)
+Conflicts: libc6-dev (<< 2.13-14)
Replaces: amd64-libs-dev (<= 1.2), libc6-dev (<< 2.13-11)
Provides: lib64c-dev
Description: Embedded GNU C Library: 64bit Development Libraries for AMD64
Modified: glibc-package/trunk/debian/control.in/i386
===================================================================
--- glibc-package/trunk/debian/control.in/i386 2011-08-04 06:44:37 UTC (rev 4843)
+++ glibc-package/trunk/debian/control.in/i386 2011-08-04 07:06:16 UTC (rev 4844)
@@ -15,7 +15,7 @@
Section: libdevel
Priority: optional
Provides: lib32c-dev
-Conflicts: libc6-i386 (<= 2.9-18), libc6-dev (<< 2.13-11)
+Conflicts: libc6-i386 (<= 2.9-18), libc6-dev (<< 2.13-14)
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-i386 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Modified: glibc-package/trunk/debian/control.in/kfreebsd-i386
===================================================================
--- glibc-package/trunk/debian/control.in/kfreebsd-i386 2011-08-04 06:44:37 UTC (rev 4843)
+++ glibc-package/trunk/debian/control.in/kfreebsd-i386 2011-08-04 07:06:16 UTC (rev 4844)
@@ -13,6 +13,8 @@
Section: libdevel
Priority: optional
Provides: lib32c-dev
+Conflicts: libc0.1-dev (<< 2.13-14)
+Replaces: libc0.1-dev (<< 2.13-11)
Depends: libc0.1-i386 (= ${binary:Version}), libc0.1-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Description: Embedded GNU C Library: 32bit development libraries for AMD64
Modified: glibc-package/trunk/debian/control.in/mips64
===================================================================
--- glibc-package/trunk/debian/control.in/mips64 2011-08-04 06:44:37 UTC (rev 4843)
+++ glibc-package/trunk/debian/control.in/mips64 2011-08-04 07:06:16 UTC (rev 4844)
@@ -13,6 +13,8 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
+Conflicts: libc6-dev (<< 2.13-14)
+Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-mips64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Description: Embedded GNU C Library: 64bit Development Libraries for MIPS64
Modified: glibc-package/trunk/debian/control.in/mipsn32
===================================================================
--- glibc-package/trunk/debian/control.in/mipsn32 2011-08-04 06:44:37 UTC (rev 4843)
+++ glibc-package/trunk/debian/control.in/mipsn32 2011-08-04 07:06:16 UTC (rev 4844)
@@ -13,6 +13,8 @@
Section: libdevel
Priority: optional
Provides: libn32c-dev
+Conflicts: libc6-dev (<< 2.13-14)
+Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Description: Embedded GNU C Library: n32 Development Libraries for MIPS64
Modified: glibc-package/trunk/debian/control.in/powerpc
===================================================================
--- glibc-package/trunk/debian/control.in/powerpc 2011-08-04 06:44:37 UTC (rev 4843)
+++ glibc-package/trunk/debian/control.in/powerpc 2011-08-04 07:06:16 UTC (rev 4844)
@@ -13,7 +13,7 @@
Section: libdevel
Priority: optional
Provides: lib32c-dev
-Conflicts: libc6-dev (<< 2.13-11)
+Conflicts: libc6-dev (<< 2.13-14)
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-powerpc (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Modified: glibc-package/trunk/debian/control.in/ppc64
===================================================================
--- glibc-package/trunk/debian/control.in/ppc64 2011-08-04 06:44:37 UTC (rev 4843)
+++ glibc-package/trunk/debian/control.in/ppc64 2011-08-04 07:06:16 UTC (rev 4844)
@@ -13,7 +13,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Conflicts: libc6-dev (<< 2.13-11)
+Conflicts: libc6-dev (<< 2.13-14)
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-ppc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Modified: glibc-package/trunk/debian/control.in/s390
===================================================================
--- glibc-package/trunk/debian/control.in/s390 2011-08-04 06:44:37 UTC (rev 4843)
+++ glibc-package/trunk/debian/control.in/s390 2011-08-04 07:06:16 UTC (rev 4844)
@@ -13,7 +13,7 @@
Section: libdevel
Priority: optional
Provides: lib32c-dev
-Conflicts: libc6-dev (<< 2.13-11)
+Conflicts: libc6-dev (<< 2.13-14)
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-s390 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Modified: glibc-package/trunk/debian/control.in/s390x
===================================================================
--- glibc-package/trunk/debian/control.in/s390x 2011-08-04 06:44:37 UTC (rev 4843)
+++ glibc-package/trunk/debian/control.in/s390x 2011-08-04 07:06:16 UTC (rev 4844)
@@ -13,7 +13,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Conflicts: libc6-dev (<< 2.13-11)
+Conflicts: libc6-dev (<< 2.13-14)
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-s390x (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Modified: glibc-package/trunk/debian/control.in/sparc64
===================================================================
--- glibc-package/trunk/debian/control.in/sparc64 2011-08-04 06:44:37 UTC (rev 4843)
+++ glibc-package/trunk/debian/control.in/sparc64 2011-08-04 07:06:16 UTC (rev 4844)
@@ -14,7 +14,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Conflicts: libc6-dev (<< 2.13-11)
+Conflicts: libc6-dev (<< 2.13-14)
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-sparc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Reply to: