[ca-certificates-java] 24/46: * Switch primary JRE dependency from openjdk-6 to openjdk-7 to support demotion of openjdk-6 to universe in Ubuntu: - d/control, rules: Generate primary JRE dependency at build time to allow differentiation between Ubuntu and Debian. * Added myself to uploaders.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Feb 2 21:25:25 UTC 2015
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 4c4ac9770fd0a11e8792d4190d1c75e9e1a5188f
Author: James Page <james.page at canonical.com>
Date: Fri Jun 8 08:45:42 2012 +0000
* Switch primary JRE dependency from openjdk-6 to openjdk-7 to support
demotion of openjdk-6 to universe in Ubuntu:
- d/control, rules: Generate primary JRE dependency at build time to
allow differentiation between Ubuntu and Debian.
* Added myself to uploaders.
---
debian/changelog | 10 ++++++++++
debian/control | 5 +++--
debian/rules | 6 ++++--
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fac694d..970e452 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ca-certificates-java (20120608) UNRELEASED; urgency=low
+
+ * Switch primary JRE dependency from openjdk-6 to openjdk-7 to support
+ demotion of openjdk-6 to universe in Ubuntu:
+ - d/control, rules: Generate primary JRE dependency at build time to
+ allow differentiation between Ubuntu and Debian.
+ * Added myself to uploaders.
+
+ -- James Page <james.page at ubuntu.com> Fri, 08 Jun 2012 09:44:58 +0100
+
ca-certificates-java (20120603) unstable; urgency=low
* Use javahelper as buildsystem:
diff --git a/debian/control b/debian/control
index 5b88017..2d26736 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Matthias Klose <doko at ubuntu.com>,
Torsten Werner <twerner at debian.org>,
- Damien Raude-Morvan <drazzib at debian.org>
+ Damien Raude-Morvan <drazzib at debian.org>,
+ James Page <james.page at ubuntu.com>
Build-Depends: debhelper (>= 6), default-jdk, javahelper, junit4
Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ca-certificates-java
@@ -14,7 +15,7 @@ Package: ca-certificates-java
Architecture: all
Multi-Arch: foreign
Depends: ca-certificates (>= 20090814),
- openjdk-6-jre-headless (>= 6b16-1.6.1-2) | java6-runtime-headless,
+ ${jre:Depends} | 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 22ad12f..1e02f4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,12 @@
#export DH_VERBOSE=1
ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
- SUBSTVARS = -Vnss:Depends="libnss3-1d (>= 3.12.9+ckbi-1.82-0ubuntu3~)"
+ SUBSTVARS = -Vnss:Depends="libnss3-1d (>= 3.12.9+ckbi-1.82-0ubuntu3~)" \
+ -Vjre:Depends="openjdk-7-jre-headless (>= 7~u3-2.1.1~pre1-1)"
nss_lib = libnss3
else
- SUBSTVARS = -Vnss:Depends="libnss3-1d (>= 3.12.10-2~)"
+ SUBSTVARS = -Vnss:Depends="libnss3-1d (>= 3.12.10-2~)" \
+ -Vjre:Depends="openjdk-6-jre-headless (>= 6b16-1.6.1-2)"
nss_lib = libnss3-1d
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ca-certificates-java.git
More information about the pkg-java-commits
mailing list