diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-08-21 10:04:01 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-08-21 10:04:01 +0000 |
| commit | 88b09e1b231855af9875cef5183c87eb4cdde9cb (patch) | |
| tree | 6b2c936ce7efa90b4111d40dfb0cd78580c91e14 | |
| parent | c3114f53093d24117c88c31c183cf0573dfe7463 (diff) | |
| download | gcc-47-88b09e1b231855af9875cef5183c87eb4cdde9cb.tar.gz | |
* Tighten the build conflict with binutils-gold (closes: #720264).
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6935 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/control.m4 | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index ab16c03..5849a60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ gcc-4.7 (4.7.3-7) UNRELEASED; urgency=low * Update to SVN 20130821 (r201895) from the gcc-4_7-branch. * Update the Linaro support to the 4.7-2013.08 release. + * Tighten the build conflict with binutils-gold (closes: #720264). -- Matthias Klose <doko@debian.org> Wed, 21 Aug 2013 11:40:56 +0200 diff --git a/debian/control b/debian/control index 8b39ef0..672f2d3 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5.0.62), gcc-4.8-base, libcloog-ppl-dev (>= 0.16), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, quilt Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns, -Build-Conflicts: binutils-gold +Build-Conflicts: binutils-gold (<< 2.23.52.20130727) Homepage: http://gcc.gnu.org/ XS-Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-4.7/ XS-Vcs-Svn: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7 diff --git a/debian/control.m4 b/debian/control.m4 index 63805b4..3b31678 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -74,7 +74,7 @@ Build-Depends: debhelper (>= 5.0.62), gcc-4.8-base, CHECK_BUILD_DEP realpath (>= 1.9.12), chrpath, lsb-release, quilt Build-Depends-Indep: LIBSTDCXX_BUILD_INDEP JAVA_BUILD_INDEP ')dnl -Build-Conflicts: binutils-gold +Build-Conflicts: binutils-gold (<< 2.23.52.20130727) ifelse(regexp(SRCNAME, `gnat'),0,`dnl Homepage: http://gcc.gnu.org/ ', regexp(SRCNAME, `gdc'),0,`dnl |