[pkg-java] r16122 - trunk/ca-certificates-java/debian

[James Page]

Author: jamespage-guest
Date: 2012-06-08 08:45:42 +0000 (Fri, 08 Jun 2012)
New Revision: 16122

Modified:
   trunk/ca-certificates-java/debian/changelog
   trunk/ca-certificates-java/debian/control
   trunk/ca-certificates-java/debian/rules
Log:
* 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.

Modified: trunk/ca-certificates-java/debian/changelog
===================================================================
--- trunk/ca-certificates-java/debian/changelog	2012-06-08 05:14:04 UTC (rev 16121)
+++ trunk/ca-certificates-java/debian/changelog	2012-06-08 08:45:42 UTC (rev 16122)
@@ -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:

Modified: trunk/ca-certificates-java/debian/control
===================================================================
--- trunk/ca-certificates-java/debian/control	2012-06-08 05:14:04 UTC (rev 16121)
+++ trunk/ca-certificates-java/debian/control	2012-06-08 08:45:42 UTC (rev 16122)
@@ -4,7 +4,8 @@
 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 @@
 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).

Modified: trunk/ca-certificates-java/debian/rules
===================================================================
--- trunk/ca-certificates-java/debian/rules	2012-06-08 05:14:04 UTC (rev 16121)
+++ trunk/ca-certificates-java/debian/rules	2012-06-08 08:45:42 UTC (rev 16122)
@@ -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