[java-common] 02/05: Changed gcj-native-helper to depend on gcj-jdk on openjdk architectures

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository java-common.

commit 3db72f73834055153b7a287ada667a7199ba2420
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 8 11:12:03 2015 +0200

    Changed gcj-native-helper to depend on gcj-jdk on openjdk architectures
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 5 -----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b63be0..f8ad976 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ java-common (0.54) UNRELEASED; urgency=medium
   * The Java Policy and the FAQ have been moved to the new java-policy package.
   * default-jdk-doc is now architecture dependent (Closes: #801257)
   * gcj-native-helper no longer depends on default-jdk
+  * gcj-native-helper depends on gcj-jdk instead of openjdk (regression in 0.53)
   * update-java-alternatives now supports bash completion (Closes: #777550)
   * The output of update-java-alternatives --list is now aligned vertically
   * Removed the unused classpath-from-jars-1 example
diff --git a/debian/control b/debian/control
index bc30121..7b8f090 100644
--- a/debian/control
+++ b/debian/control
@@ -65,7 +65,7 @@ Description: Standard Java or Java compatible Development Kit (documentation)
 
 Package: gcj-native-helper
 Architecture: any
-Depends: ${jdk:builddep}, ${misc:Depends}
+Depends: gcj-jdk, ${misc:Depends}
 Provides: default-jdk-builddep
 Conflicts: default-jdk-builddep
 Replaces: default-jdk-builddep
diff --git a/debian/rules b/debian/rules
index 0909541..37306f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,22 +19,18 @@ dversion	= 2:1.$(java_default_version)-$(jrel)
 jvmdir		= java-1.$(java_default_version).0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH))
 
 ifneq (,$(filter $(DEB_HOST_ARCH),$(java9_architectures)))
-  jdk_build_dep = openjdk-8-jdk
   v_jre         = $(S)(>= 9~b74-1)
   v_jdk         = $(v_jre)
 else ifneq (,$(filter $(DEB_HOST_ARCH),$(java8_architectures)))
-  jdk_build_dep = openjdk-7-jdk
   v_jre         = $(S)(>= 8~b132-1)
   v_jdk         = $(v_jre)
 else ifneq (,$(filter $(DEB_HOST_ARCH),$(java7_architectures)))
-  jdk_build_dep	= gcj-jdk
   v_jre		= $(S)(>= 7~u3-2.1.1)
   v_jdk		= $(v_jre)
 else
   p_jre		= gcj-jre
   p_jhl		= gcj-jre-headless
   p_jdk		= gcj-jdk
-  jdk_build_dep	=
   v_jre		=
   v_jdk		= $(v_jre)
   jvmdir	= java-gcj
@@ -79,7 +75,6 @@ ifneq (,$(p_jre))
 		'-Vjhl=$(p_jhl)' \
 		'-Vjdk=$(p_jdk)' \
 		'-Vdoc=$(p_doc)' \
-		'-Vjdk:builddep=$(jdk_build_dep)' \
 		'-Vjre:arch=$(DEB_HOST_ARCH)' \
 		'-Vjre:version=$(v_jre)' \
 		'-Vjdk:version=$(v_jdk)' \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-common.git