r4693 - in glibc-package/trunk/debian: . control.in
Author: aurel32
Date: 2011-06-04 11:19:30 +0000 (Sat, 04 Jun 2011)
New Revision: 4693
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/libc
Log:
* Add breaks on packages which don't support multiarch paths.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-05-30 14:07:05 UTC (rev 4692)
+++ glibc-package/trunk/debian/changelog 2011-06-04 11:19:30 UTC (rev 4693)
@@ -25,6 +25,7 @@
* kfreebsd/local-sysdeps.diff, update to revision 3303 (from glibc-bsd),
to fix brk(), semctl() and if_nameindex() bugs.
* Add patches/any/local-tst-writev.diff to fix compilation of tst-writev.c.
+ * Add breaks on packages which don't support multiarch paths.
[ Steve Langasek ]
* Tighten the dependency on dpkg to a multiarch aware version.
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2011-05-30 14:07:05 UTC (rev 4692)
+++ glibc-package/trunk/debian/control 2011-06-04 11:19:30 UTC (rev 4693)
@@ -160,7 +160,7 @@
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
-Conflicts: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11)
+Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), make (<< 3.81-8.1), pkg-config (<< 0.26-1)
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -246,7 +246,7 @@
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
-Conflicts: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11)
+Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), make (<< 3.81-8.1), pkg-config (<< 0.26-1)
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -332,7 +332,7 @@
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
-Conflicts: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11)
+Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), make (<< 3.81-8.1), pkg-config (<< 0.26-1)
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -418,7 +418,7 @@
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
-Conflicts: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11)
+Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), make (<< 3.81-8.1), pkg-config (<< 0.26-1)
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
Modified: glibc-package/trunk/debian/control.in/libc
===================================================================
--- glibc-package/trunk/debian/control.in/libc 2011-05-30 14:07:05 UTC (rev 4692)
+++ glibc-package/trunk/debian/control.in/libc 2011-06-04 11:19:30 UTC (rev 4693)
@@ -29,7 +29,7 @@
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
-Conflicts: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11)
+Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), make (<< 3.81-8.1), pkg-config (<< 0.26-1)
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
Reply to: