[Git][java-team/ca-certificates-java][master] 7 commits: Removed the ${nss:Depends} substvar
Emmanuel Bourg
gitlab at salsa.debian.org
Mon Sep 9 11:00:08 BST 2019
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / ca-certificates-java
Commits:
6a4e52ba by Emmanuel Bourg at 2019-09-09T09:47:30Z
Removed the ${nss:Depends} substvar
- - - - -
9a467d1a by Emmanuel Bourg at 2019-09-09T09:47:34Z
Removed the @NSS_LIB@ template parameter
- - - - -
076c6eca by Emmanuel Bourg at 2019-09-09T09:47:34Z
Marked bug #910138 as fixed in the version 20190214
- - - - -
a66963d8 by Emmanuel Bourg at 2019-09-09T09:47:34Z
Removed the now unused ${jre:Depends} substvar
- - - - -
43e06cd5 by Emmanuel Bourg at 2019-09-09T09:56:17Z
Build with the DH sequencer
- - - - -
380c1ff9 by Emmanuel Bourg at 2019-09-09T09:56:25Z
Standards-Version updated to 4.4.0
- - - - -
d1bbd3f2 by Emmanuel Bourg at 2019-09-09T09:56:34Z
Upload to unstable
- - - - -
7 changed files:
- + debian/ca-certificates-java.dirs
- debian/changelog
- + debian/clean
- debian/control
- debian/jks-keystore.hook.in → debian/jks-keystore.hook
- debian/postinst.in → debian/postinst
- debian/rules
Changes:
=====================================
debian/ca-certificates-java.dirs
=====================================
@@ -0,0 +1,3 @@
+etc/default
+etc/ssl/certs/java
+etc/ca-certificates/update.d
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+ca-certificates-java (20190909) unstable; urgency=medium
+
+ * Team upload.
+ * Removed the ${nss:Depends} substvar
+ * Removed the @NSS_LIB@ template parameter
+ * Removed the now unused ${jre:Depends} substvar
+ * Build with the DH sequencer
+ * Standards-Version updated to 4.4.0
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 09 Sep 2019 11:56:28 +0200
+
ca-certificates-java (20190405) unstable; urgency=medium
* Team upload.
@@ -10,7 +21,7 @@ ca-certificates-java (20190214) unstable; urgency=medium
* Team upload.
* Declare compliance with Debian Policy 4.3.0.
* ca-certificates-java: Depend on default-jre-headless to avoid a circular dependency on
- a specific OpenJDK package. (Closes: #864657)
+ a specific OpenJDK package. (Closes: #864657, #910138)
-- Markus Koschany <apo at debian.org> Thu, 14 Feb 2019 22:21:15 +0100
=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+target/
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Matthias Klose <doko at ubuntu.com>,
James Page <james.page at ubuntu.com>
Build-Depends: debhelper (>= 11), default-jdk, javahelper, junit4
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
Vcs-Git: https://salsa.debian.org/java-team/ca-certificates-java.git
Vcs-Browser: https://salsa.debian.org/java-team/ca-certificates-java
@@ -14,8 +14,8 @@ Architecture: all
Multi-Arch: foreign
Depends: ca-certificates (>= 20121114),
default-jre-headless | java8-runtime-headless,
- ${misc:Depends},
- ${nss:Depends}
+ libnss3 (>= 3.12.10-2~),
+ ${misc:Depends}
# We need a versioned Depends due to multiarch changes (bug #635571).
Description: Common CA certificates (JKS keystore)
This package uses the hooks of the ca-certificates package to update the
=====================================
debian/jks-keystore.hook.in → debian/jks-keystore.hook
=====================================
@@ -18,9 +18,9 @@ JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar
nsslib_name()
{
if dpkg --assert-multi-arch 2>/dev/null; then
- echo "@NSS_LIB@:${arch}"
+ echo "libnss3:${arch}"
else
- echo "@NSS_LIB@"
+ echo "libnss3"
fi
}
=====================================
debian/postinst.in → debian/postinst
=====================================
@@ -17,9 +17,9 @@ JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar
nsslib_name()
{
if dpkg --assert-multi-arch 2>/dev/null; then
- echo "@NSS_LIB@:${arch}"
+ echo "libnss3:${arch}"
else
- echo "@NSS_LIB@"
+ echo "libnss3"
fi
}
=====================================
debian/rules
=====================================
@@ -1,94 +1,38 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@ --with javahelper
-ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
- SUBSTVARS = -Vnss:Depends="libnss3 (>= 3.12.9+ckbi-1.82-0ubuntu3~)" \
- -Vjre:Depends="openjdk-11-jre-headless"
- nss_lib = libnss3
-else
- SUBSTVARS = -Vnss:Depends="libnss3 (>= 3.12.10-2~)" \
- -Vjre:Depends="openjdk-8-jre-headless"
- nss_lib = libnss3
-endif
-
-JAVA_HOME := /usr/lib/jvm/default-java
-export JAVA_HOME
-OPTS := --no-javadoc --main=org.debian.security.UpdateCertificates --javacopts="-source 1.7 -target 1.7"
-CLASSPATH := /usr/share/java/junit4.jar
-export CLASSPATH
-
-do_junit = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,yes)
-
-d = debian/ca-certificates-java
-
-build-arch: build
-build-indep: build
-build: build-stamp
-build-stamp:
- dh_testdir
+override_dh_auto_build:
mkdir target
- jh_build $(OPTS) target/ca-certificates-java.jar src/main/java
-ifeq ($(do_junit),yes)
- jh_build --no-javadoc --javacopts="-source 1.7 -target 1.7 -cp target/ca-certificates-java.jar:${CLASSPATH}" \
- target/ca-certificates-java-tests.jar src/test/java
+ jh_build --no-javadoc --javacopts="-source 1.7 -target 1.7" \
+ target/ca-certificates-java.jar \
+ src/main/java \
+ --main=org.debian.security.UpdateCertificates
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ # Build the tests
+ jh_build --no-javadoc --javacopts="-source 1.7 -target 1.7 -cp target/ca-certificates-java.jar:/usr/share/java/junit4.jar" \
+ target/ca-certificates-java-tests.jar \
+ src/test/java
+
+ # Copy the test resources
mkdir target/test-classes
cp -R src/test/resources/* target/test-classes
- $(JAVA_HOME)/bin/java -cp /usr/share/java/junit4.jar:target/ca-certificates-java.jar:target/ca-certificates-java-tests.jar \
- org.junit.runner.JUnitCore \
- org.debian.security.UpdateCertificatesTest org.debian.security.KeyStoreHandlerTest
+
+ # Run the tests
+ java -cp /usr/share/java/junit4.jar:target/ca-certificates-java.jar:target/ca-certificates-java-tests.jar \
+ org.junit.runner.JUnitCore \
+ org.debian.security.UpdateCertificatesTest org.debian.security.KeyStoreHandlerTest
endif
- touch $@
-clean:
- dh_testdir
- dh_testroot
- jh_build --clean
- $(RM) -R build-stamp target
- dh_clean
- for f in debian/*.in; do \
- f2=$$(echo $$f | sed ';s/\.in$$//'); \
- rm -f $$f2; \
- done
+override_dh_auto_install:
+ install -m755 debian/jks-keystore.hook debian/ca-certificates-java/etc/ca-certificates/update.d/jks-keystore
+ install -m600 debian/default debian/ca-certificates-java/etc/default/cacerts
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs \
- usr/share/ca-certificates-java \
- etc/default \
- etc/ssl/certs/java \
- etc/ca-certificates/update.d
- for f in debian/*.in; do \
- f2=$$(echo $$f | sed 's/\.in$$//'); \
- sed -e 's/@NSS_LIB@/$(nss_lib)/g' \
- $$f > $$f2; \
- done
- install -m755 debian/jks-keystore.hook \
- $(d)/etc/ca-certificates/update.d/jks-keystore
- install -m600 debian/default \
- $(d)/etc/default/cacerts
dh_install target/ca-certificates-java.jar /usr/share/ca-certificates-java/
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol -- $(SUBSTVARS)
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_link:
+ dh_link
+ rm debian/ca-certificates-java/etc/default/ca-certificates-java
View it on GitLab: https://salsa.debian.org/java-team/ca-certificates-java/compare/3e51a84e9104823319abeb31f880580e46f45a98...d1bbd3f24d600c3e5486cfcb6e372d1866d2c3c4
--
View it on GitLab: https://salsa.debian.org/java-team/ca-certificates-java/compare/3e51a84e9104823319abeb31f880580e46f45a98...d1bbd3f24d600c3e5486cfcb6e372d1866d2c3c4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190909/2c707f15/attachment.html>
More information about the pkg-java-commits
mailing list