[ca-certificates-java] 02/02: Depend on openjdk-7 instead of openjdk-6 (Closes: #776897)

[Emmanuel Bourg]

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

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

commit 123f3a12114ec8a0e90056bc39faa672140b5f4f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Feb 3 02:18:50 2015 +0100

    Depend on openjdk-7 instead of openjdk-6 (Closes: #776897)
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 6 ++----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eddb9d5..c94586e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ca-certificates-java (20140325) UNRELEASED; urgency=medium
 
   * Support OpenJDK 8 (Closes: #775775)
+  * Depend on openjdk-7 instead of openjdk-6 (Closes: #776897)
   * Standards-Version updated to 3.9.6 (no changes)
   * Moved the package to Git
 
diff --git a/debian/control b/debian/control
index e232d09..e227603 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: ca-certificates-java
 Architecture: all
 Multi-Arch: foreign
 Depends: ca-certificates (>= 20121114),
-         ${jre:Depends} | java6-runtime-headless,
+         openjdk-7-jre-headless | java6-runtime-headless,
          ${misc:Depends},
          ${nss:Depends}
 # We need a versioned Depends due to multiarch changes (bug #635571).
diff --git a/debian/rules b/debian/rules
index 4b1f487..b27fa43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,10 @@
 #export DH_VERBOSE=1
 
 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
-	SUBSTVARS = -Vnss:Depends="libnss3 (>= 3.12.9+ckbi-1.82-0ubuntu3~)" \
-				-Vjre:Depends="openjdk-7-jre-headless (>= 7~u3-2.1.1~pre1-1)"
+	SUBSTVARS = -Vnss:Depends="libnss3 (>= 3.12.9+ckbi-1.82-0ubuntu3~)"
 	nss_lib = libnss3
 else
-	SUBSTVARS = -Vnss:Depends="libnss3 (>= 3.12.10-2~)" \
-				-Vjre:Depends="openjdk-6-jre-headless (>= 6b16-1.6.1-2)"
+	SUBSTVARS = -Vnss:Depends="libnss3 (>= 3.12.10-2~)"
 	nss_lib = libnss3
 endif
 

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