[gcc-6] 27/401: - fix think for libjava b-d's

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 90617d837c7b8d4bd70c470835a9c0f19a14a7ea
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Dec 17 14:26:57 2015 +0000

     - fix think for libjava b-d's
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8543 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/control    |  2 +-
 debian/rules.conf | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 3fd75d2..e5a38ce 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5.0.62), dpkg-dev (>= 1.17.11),
   gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, 
   gdb:native, 
   texinfo (>= 4.3), locales, sharutils, 
-  procps, zlib1g-dev, libantlr-java, python:native, libffi-dev, fastjar, libmagic-dev <!cross>, libecj-java (>= 3.3.0-2), zip, libasound2-dev [ !hurd-any !kfreebsd-any] <!cross>, libxtst-dev <!cross>, libxt-dev <!cross>, libgtk2.0-dev (>= 2.4.4-2) <!cross>, libart-2.0-dev <!cross>, libcairo2-dev, <!cross> gnat-5:native [!m32r !sh3 !sh3eb !sh4eb !powerpcspe !mips64 !x32 !m68k !sh4 !sparc64], g++-5:native, netbase, 
+  procps, zlib1g-dev, libantlr-java, python:native, 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 gnat-5:native [!m32r !sh3 !sh3eb !sh4eb !powerpcspe !mips64 !x32 !sh4 !sparc64], g++-5:native, netbase, 
   libisl-dev (>= 0.14), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), 
   dejagnu [!m68k], realpath (>= 1.9.12), chrpath, lsb-release, quilt, 
    g++-6-alpha-linux-gnu [alpha] <cross>, gobjc-6-alpha-linux-gnu [alpha] <cross>, gfortran-6-alpha-linux-gnu [alpha] <cross>, gcj-6-alpha-linux-gnu [alpha] <cross>, gdc-6-alpha-linux-gnu [alpha] <cross>, gccgo-6-alpha-linux-gnu [alpha] <cross>, gnat-6-alpha-linux-gnu [alpha] <cross>, g++-6-x86-64-linux-gnu [amd64] <cross>, gobjc-6-x86-64-linux-gnu [amd64] <cross>, gfortran-6-x86-64-linux-gnu [amd64] <cross>, gcj-6-x86-64-linux-gnu [amd64] <cross>, gdc-6-x86-64-linux-gnu [amd64] <cross>, [...]
diff --git a/debian/rules.conf b/debian/rules.conf
index f3bb823..a4bf7c4 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -473,23 +473,23 @@ else
 endif
 
 ifneq (,$(java_awt_peers))
-  JAVA_BUILD_DEP += fastjar$(bd_java_archs), libmagic-dev$(bd_java_archs)$(pf_ncross),
+  JAVA_BUILD_DEP += fastjar$(bd_java_archs), libmagic-dev$(bd_java_archs),
   JAVA_BUILD_DEP += libecj-java (>= 3.3.0-2)$(bd_java_archs), zip$(bd_java_archs),
   ifeq ($(with_java_maintainer_mode),yes)
     # gcj-6 needed for gjavah-6.
     JAVA_BUILD_DEP += gcj-6$(bd_java_archs), ecj (>= 3.3.0-2)$(bd_java_archs),
   endif
-  JAVA_BUILD_DEP += libasound2-dev [$(java_no_archs) $(linux_no_archs)]$(pf_ncross),
+  JAVA_BUILD_DEP += libasound2-dev [$(java_no_archs) $(linux_no_archs)],
   ifneq (,$(findstring gtk,$(java_awt_peers)))
-    JAVA_BUILD_DEP += libxtst-dev$(bd_java_archs)$(pf_ncross), libxt-dev$(bd_java_archs)$(pf_ncross), libgtk2.0-dev (>= 2.4.4-2)$(bd_java_archs)$(pf_ncross), libart-2.0-dev$(bd_java_archs)$(pf_ncross), libcairo2-dev$(bd_java_archs),$(pf_ncross)
+    JAVA_BUILD_DEP += libxtst-dev$(bd_java_archs), libxt-dev$(bd_java_archs), libgtk2.0-dev (>= 2.4.4-2)$(bd_java_archs), libart-2.0-dev$(bd_java_archs), libcairo2-dev$(bd_java_archs)
   endif
   ifneq (,$(findstring qt,$(java_awt_peers)))
-    JAVA_BUILD_DEP += libqt4-dev (>= 4.1.0)$(bd_java_archs)$(pf_ncross),
+    JAVA_BUILD_DEP += libqt4-dev (>= 4.1.0)$(bd_java_archs),
   endif
   # gconf peer, disabled by default
-  #JAVA_BUILD_DEP += libgconf2-dev$(bd_java_archs)$(pf_ncross),
+  #JAVA_BUILD_DEP += libgconf2-dev$(bd_java_archs),
   # gstreamer peer
-  #JAVA_BUILD_DEP += libgstreamer-plugins-base0.10-dev$(bd_java_archs)$(pf_ncross),
+  #JAVA_BUILD_DEP += libgstreamer-plugins-base0.10-dev$(bd_java_archs),
 endif
 ifneq ($(with_standalone_gcj),yes)
   ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git