[java-common] 08/09: Removed the default values for Java 6

[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 2a3b4b914942dec7928b2be62384992afc02abb6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 8 09:26:30 2015 +0200

    Removed the default values for Java 6
---
 debian/changelog |  1 +
 debian/rules     | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4401830..4bb8f88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ java-common (0.54) UNRELEASED; urgency=medium
     (Closes: #800024)
   * Converted debian/copyright to the Copyright Format 1.0
   * Simplified debian/rules using the dh sequencer
+  * Removed the default values for Java 6 (no longer used)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 22 Sep 2015 09:23:34 +0200
 
diff --git a/debian/rules b/debian/rules
index 38fb5a7..36ff4bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,17 +57,6 @@ else ifneq (,$(filter $(DEB_HOST_ARCH),$(java7_architectures)))
   provides	= java java2 java5 java6 java7
   dversion	= 2:1.7-$(jrel)
   jvmdir	= java-1.7.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH))
-else ifneq (,$(filter $(DEB_HOST_ARCH),$(java6_architectures)))
-  p_jre		= openjdk-6-jre
-  p_jhl		= openjdk-6-jre-headless
-  p_jdk		= openjdk-6-jdk
-  jdk_build_dep	= gcj-jdk
-  v_jre		= $(S)(>= 6b23~pre8-2~)
-  v_jdk		= $(v_jre)
-  provides	= java java2 java5 java6
-  dversion	= 2:1.6-$(jrel)
-  jvmdir	= java-1.6.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH))
-  p_doc		= openjdk-6-doc
 endif
 
 jre_provides	= $(call mk_cslist,$(provides),runtime)

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