[java-common] 03/05: Use unversioned dependencies on openjdk

[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 46b65d9b713854d38587aed3d755985eb6059aea
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 8 13:29:35 2015 +0200

    Use unversioned dependencies on openjdk
---
 debian/changelog |  1 +
 debian/control   |  6 +++---
 debian/rules     | 16 +---------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8ad976..7a21e58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ java-common (0.54) UNRELEASED; urgency=medium
   * 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)
+  * default-jdk/jre now have unversioned dependencies on openjdk
   * 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 7b8f090..4012b0a 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Description: Base package for Java runtimes
 
 Package: default-jre
 Architecture: any
-Depends: default-jre-headless (= ${binary:Version}), ${jre}${jre:version},
+Depends: default-jre-headless (= ${binary:Version}), ${jre},
  ${misc:Depends}
 Provides: ${jre:provides}
 Description: Standard Java or Java compatible Runtime
@@ -31,7 +31,7 @@ Description: Standard Java or Java compatible Runtime
 
 Package: default-jre-headless
 Architecture: any
-Depends: ${jhl}${jre:version}, java-common, ${misc:Depends}
+Depends: ${jhl}, java-common, ${misc:Depends}
 Suggests: default-jre
 Provides: ${jhl:provides}
 Replaces: openjdk-6-jre-headless (<< 6b23~pre8-2~)
@@ -45,7 +45,7 @@ Description: Standard Java or Java compatible Runtime (headless)
 
 Package: default-jdk
 Architecture: any
-Depends: default-jre (= ${binary:Version}), ${jdk}${jdk:version},
+Depends: default-jre (= ${binary:Version}), ${jdk},
  ${misc:Depends}
 Provides: ${jdk:provides}
 Description: Standard Java or Java compatible Development Kit
diff --git a/debian/rules b/debian/rules
index 37306f7..96e4292 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-S = $(EMPTY) $(EMPTY)
 jrel = $(shell dpkg-parsechangelog | grep -E ^Version: | sed "s/Version: 0.//")
 
 DEB_HOST_ARCH      ?= $(shell dpkg-architecture --query DEB_HOST_ARCH)
@@ -18,21 +17,10 @@ p_doc		= openjdk-$(java_default_version)-doc
 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)))
-  v_jre         = $(S)(>= 9~b74-1)
-  v_jdk         = $(v_jre)
-else ifneq (,$(filter $(DEB_HOST_ARCH),$(java8_architectures)))
-  v_jre         = $(S)(>= 8~b132-1)
-  v_jdk         = $(v_jre)
-else ifneq (,$(filter $(DEB_HOST_ARCH),$(java7_architectures)))
-  v_jre		= $(S)(>= 7~u3-2.1.1)
-  v_jdk		= $(v_jre)
-else
+ifeq (5, $(java_default_version))
   p_jre		= gcj-jre
   p_jhl		= gcj-jre-headless
   p_jdk		= gcj-jdk
-  v_jre		=
-  v_jdk		= $(v_jre)
   jvmdir	= java-gcj
   p_doc		= openjdk-7-doc
 endif
@@ -76,8 +64,6 @@ ifneq (,$(p_jre))
 		'-Vjdk=$(p_jdk)' \
 		'-Vdoc=$(p_doc)' \
 		'-Vjre:arch=$(DEB_HOST_ARCH)' \
-		'-Vjre:version=$(v_jre)' \
-		'-Vjdk:version=$(v_jdk)' \
 		'-Vjre:provides=$(jre_provides)' \
 		'-Vjhl:provides=$(jhl_provides)' \
 		'-Vjdk:provides=$(jdk_provides)'

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