* Fix dependency generation for the cross gcc-4.8 package.

git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@6975 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

3 files changed, 4 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index e1874d8..510962c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ gcc-4.8 (4.8.1-11) UNRELEASED; urgency=low
   * [ARM] Fix bug in add patterns due to commutativity modifier,
     backport from trunk. LP: #1234060.
   * Build libatomic on AArch64.
+  * Fix dependency generation for the cross gcc-4.8 package.
 
  -- Matthias Klose <doko@debian.org>  Tue, 01 Oct 2013 18:45:51 +0200
 
diff --git a/debian/control b/debian/control
index 46e03a1..2d1ecee 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mi
   texinfo (>= 4.3), locales, sharutils, 
   procps, zlib1g-dev, libantlr-java, python, libffi-dev, fastjar, libmagic-dev, libecj-java (>= 3.3.0-2), zip, libasound2-dev [ !hurd-any !kfreebsd-any], libxtst-dev, libxt-dev, libgtk2.0-dev (>= 2.4.4-2), libart-2.0-dev, libcairo2-dev, g++-4.8 [armel armhf], netbase, 
   libcloog-isl-dev (>= 0.18), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), 
-  dejagnu [!m68k !hurd-amd64 !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, quilt
+  dejagnu [!arm64 !m68k !hurd-amd64 !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, 
 Homepage: http://gcc.gnu.org/
 XS-Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-4.8/
@@ -231,7 +231,7 @@ Package: gcc-4.8
 Architecture: any
 Section: devel
 Priority: optional
-Depends: gcc-4.8-base (= ${gcc:Version}), cpp-4.8 (= ${gcc:Version}),
+Depends: cpp-4.8 (= ${gcc:Version}), gcc-4.8-base (= ${gcc:Version}),
   binutils (>= ${binutils:Version}), 
   libgcc-4.8-dev (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${dep:libcdev}
diff --git a/debian/control.m4 b/debian/control.m4
index 6b3ef0e..1e4cd72 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -699,7 +699,7 @@ Package: gcc`'PV`'TS
 Architecture: any
 Section: devel
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
-Depends: ifenabled(`gccbase',`BASEDEP, ')cpp`'PV`'TS (= ${gcc:Version}),
+Depends: cpp`'PV`'TS (= ${gcc:Version}),ifenabled(`gccbase',` BASEDEP,')
   binutils`'TS (>= ${binutils:Version}),
   ifenabled(`libgcc',`libdevdep(gcc`'PV-dev`',), ')${shlibs:Depends}, ${misc:Depends}
 Recommends: ${dep:libcdev}