[java-common] 02/02: Import Debian version 0.61

[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 3b081500beb57dc97f890b9ef6fcc0bff434fba1
Author: Matthias Klose <doko at debian.org>
Date:   Thu Mar 15 19:59:44 2018 +0100

    Import Debian version 0.61
    
    java-common (0.61) unstable; urgency=medium
    
      * Don't build jre/jdk defaults packages on platforms still relying
        on java 5 (provided by gcj). Closes: #892529.
      * Remove kfreebsd-amd64 kfreebsd-i386 from java9_architectures.
      * Prepare the default values for Java 11
      * Stop building gcj-native-helper.
      * java_defaults.mk: Add two new macros:
        - java_default_architectures
        - java_dependency, call as $(call java_dependency, default-jdk)
          -> default-jdk [!hppa !ia64 !s390 !sparc !hurd-i386]
---
 debian/changelog | 2 +-
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6de5f31..08ba0e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-java-common (0.60) unstable; urgency=medium
+java-common (0.61) unstable; urgency=medium
 
   * Don't build jre/jdk defaults packages on platforms still relying
     on java 5 (provided by gcj). Closes: #892529.
diff --git a/debian/rules b/debian/rules
index 862a34e..60127b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,7 +74,7 @@ override_dh_installdocs:
 override_dh_gencontrol:
 	dh_gencontrol -i
 ifneq (,$(p_jre))
-	dh_gencontrol -a --no-package=default-java-plugin -- \
+	dh_gencontrol -a --no-package=default-java-plugin $(nopkgs) -- \
 		-v$(dversion) \
 		'-Vjre=$(p_jre)' \
 		'-Vjhl=$(p_jhl)' \

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