This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch exp in repository java-common.
commit 9ef5c73d30b8f153c3f06150b3d179501604101f Author: Matthias Klose <d...@debian.org> Date: Sun Apr 8 20:00:51 2018 +0200 Import Debian version 0.63.1 java-common (0.63.1) experimental; urgency=medium [ Tiago Stürmer Daitx ] * debian/control: - add XB-Cnf-Extra-Commands hints to default-{jre,jdk} for the new command-not-found extraction * default-jre: Lower recommends of default-java-plugin to a suggests. [ Matthias Klose ] * Bump the version of the defaults packages to 1.10, keep defaults for m68k powerpcspe sparc64 at 1.9. --- debian/changelog | 14 ++++++++++++++ debian/control | 4 +++- debian/java_defaults.mk | 17 ++++++++++------- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index b4807e5..069fe44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +java-common (0.63.1) experimental; urgency=medium + + [ Tiago Stürmer Daitx ] + * debian/control: + - add XB-Cnf-Extra-Commands hints to default-{jre,jdk} + for the new command-not-found extraction + * default-jre: Lower recommends of default-java-plugin to a suggests. + + [ Matthias Klose ] + * Bump the version of the defaults packages to 1.10, keep defaults + for m68k powerpcspe sparc64 at 1.9. + + -- Matthias Klose <d...@debian.org> Sun, 08 Apr 2018 20:00:51 +0200 + java-common (0.63) unstable; urgency=medium * Team upload diff --git a/debian/control b/debian/control index 880f07f..6691db8 100644 --- a/debian/control +++ b/debian/control @@ -23,12 +23,13 @@ Package: default-jre Architecture: any Depends: default-jre-headless (= ${binary:Version}), ${jre}, ${misc:Depends} -Recommends: default-java-plugin +Suggests: default-java-plugin Provides: ${jre:provides} Description: Standard Java or Java compatible Runtime This dependency package points to the Java runtime, or Java compatible runtime recommended for this architecture, which is ${jre} for ${jre:arch}. +XB-Cnf-Extra-Commands: java,jexec Package: default-jre-headless Architecture: any @@ -53,6 +54,7 @@ Description: Standard Java or Java compatible Development Kit This dependency package points to the Java runtime, or Java compatible development kit recommended for this architecture, which is ${jdk} for ${jre:arch}. +XB-Cnf-Extra-Commands: javac,javadoc,jar Package: default-jdk-headless Architecture: any diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk index 62e3687..c6c7a41 100644 --- a/debian/java_defaults.mk +++ b/debian/java_defaults.mk @@ -3,12 +3,13 @@ # java{,5,6,7,8,9,10,11}_architectures java11_architectures = -java10_architectures = $(java11_architectures) -java9_architectures = $(java10_architectures) \ +java10_architectures = $(java11_architectures) \ alpha amd64 arm64 armel armhf i386 \ - ia64 m68k mips mipsel mips64el \ - powerpc powerpcspe ppc64 ppc64el \ - s390x sh4 sparc64 x32 + ia64 mips mipsel mips64el \ + powerpc ppc64 ppc64el \ + s390x sh4 x32 +java9_architectures = $(java10_architectures) \ + m68k powerpcspe sparc64 java8_architectures = $(java9_architectures) \ kfreebsd-amd64 kfreebsd-i386 java7_architectures = $(java8_architectures) @@ -29,7 +30,9 @@ java_plugin_architectures = \ x32 _java_host_arch := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH)) -ifneq (,$(filter $(_java_host_arch),$(java10_architectures))) +ifneq (,$(filter $(_java_host_arch),$(java11_architectures))) + java_default_version = 11 +else ifneq (,$(filter $(_java_host_arch),$(java10_architectures))) java_default_version = 10 else ifneq (,$(filter $(_java_host_arch),$(java9_architectures))) java_default_version = 9 @@ -57,7 +60,7 @@ jvm_archdir_map = \ jvm_archdir := \ $(strip $(patsubst $(_java_host_cpu)=%, %, $(filter $(_java_host_cpu)=%, $(jvm_archdir_map)))) -ifneq (,$(filter $(java_default_version), 9 10)) +ifneq (,$(filter $(java_default_version), 9 10 11)) jvm_archpath := lib/$(jvm_archdir) else jvm_archpath := jre/lib/$(jvm_archdir) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-common.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits