Author: adconrad
Date: 2013-07-28 18:53:56 +0000 (Sun, 28 Jul 2013)
New Revision: 5675

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/control
   glibc-package/trunk/debian/control.in/main
Log:
debian/control.in/main: Drop build-conflicts on binutils-gold to
make us buildable again with the new binutils that provides it.

Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2013-07-28 16:35:30 UTC (rev 
5674)
+++ glibc-package/trunk/debian/changelog        2013-07-28 18:53:56 UTC (rev 
5675)
@@ -22,6 +22,10 @@
   * hurd-i386/unsubmitted-tls.diff: rename into tg-tls-threadvar.diff
   * hurd-i386/tg-tls.diff: Move some hooks to tg-tls-threadvar.diff.
 
+  [ Adam Conrad ]
+  * debian/control.in/main: Drop build-conflicts on binutils-gold to
+    make us buildable again with the new binutils that provides it.
+
  -- Aurelien Jarno <[email protected]>  Thu, 25 Jul 2013 08:45:35 +0200
 
 eglibc (2.17-7) unstable; urgency=medium

Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control  2013-07-28 16:35:30 UTC (rev 5674)
+++ glibc-package/trunk/debian/control  2013-07-28 18:53:56 UTC (rev 5675)
@@ -12,7 +12,6 @@
  g++-4.7 (>= 4.7.3-4) [kfreebsd-amd64],
  g++-4.7 (>= 4.7.2-11), g++-4.7-multilib [amd64 i386 kfreebsd-amd64 mips 
mipsel powerpc ppc64 s390 s390x sparc sparc64 x32]
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
-Build-Conflicts: binutils-gold
 Maintainer: GNU Libc Maintainers <[email protected]>
 Uploaders: Clint Adams <[email protected]>, Aurelien Jarno 
<[email protected]>, Adam Conrad <[email protected]>
 Standards-Version: 3.9.4

Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main  2013-07-28 16:35:30 UTC (rev 
5674)
+++ glibc-package/trunk/debian/control.in/main  2013-07-28 18:53:56 UTC (rev 
5675)
@@ -12,7 +12,6 @@
  g++-4.7 (>= 4.7.3-4) [kfreebsd-amd64],
  g++-4.7 (>= 4.7.2-11), g++-4.7-multilib [amd64 i386 kfreebsd-amd64 mips 
mipsel powerpc ppc64 s390 s390x sparc sparc64 x32]
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
-Build-Conflicts: binutils-gold
 Maintainer: GNU Libc Maintainers <[email protected]>
 Uploaders: Clint Adams <[email protected]>, Aurelien Jarno 
<[email protected]>, Adam Conrad <[email protected]>
 Standards-Version: 3.9.4


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]

Reply via email to