r4352 - in glibc-package/trunk/debian: . control.in
Author: aurel32
Date: 2010-06-15 08:13:28 +0000 (Tue, 15 Jun 2010)
New Revision: 4352
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/libc
Log:
* control.in/libc: update the Conflicts on binutils to (<< 2.20.1-1)
Closes: #585937.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-06-15 08:08:46 UTC (rev 4351)
+++ glibc-package/trunk/debian/changelog 2010-06-15 08:13:28 UTC (rev 4352)
@@ -1,12 +1,12 @@
eglibc (2.11.2-2) UNRELEASED; urgency=low
[ Aurelien Jarno ]
- * control.in/libc: add a Conflicts on binutils-gold (<< 2.20.1-11).
- Closes: #585937.
+ * control.in/libc: update the Conflicts on binutils to (<< 2.20.1-1)
+ and add a Conflicts on binutils-gold (<< 2.20.1-11). Closes: #585937.
* Replace patches/alpha/local-longjmp-chk.diff by upstream version
patches/alpha/cvs-longjmp-chk.diff.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 15 Jun 2010 10:08:01 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 15 Jun 2010 10:12:15 +0200
eglibc (2.11.2-1) unstable; urgency=low
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2010-06-15 08:08:46 UTC (rev 4351)
+++ glibc-package/trunk/debian/control 2010-06-15 08:13:28 UTC (rev 4352)
@@ -131,7 +131,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.17cvs20070426-1), binutils-gold (<< 2.20.1-11)
+Conflicts: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11)
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.
@@ -206,7 +206,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.17cvs20070426-1), binutils-gold (<< 2.20.1-11)
+Conflicts: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11)
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.
@@ -281,7 +281,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.17cvs20070426-1), binutils-gold (<< 2.20.1-11)
+Conflicts: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11)
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.
@@ -356,7 +356,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.17cvs20070426-1), binutils-gold (<< 2.20.1-11)
+Conflicts: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11)
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 2010-06-15 08:08:46 UTC (rev 4351)
+++ glibc-package/trunk/debian/control.in/libc 2010-06-15 08:13:28 UTC (rev 4352)
@@ -21,7 +21,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.17cvs20070426-1), binutils-gold (<< 2.20.1-11)
+Conflicts: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11)
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: