[Git][java-team/java-common][master] Import Debian version 0.65
Tony Mancill
gitlab at salsa.debian.org
Tue May 8 18:00:58 BST 2018
Tony Mancill pushed to branch master at Debian Java Maintainers / java-common
Commits:
f032def6 by Matthias Klose at 2018-05-08T09:59:33-07:00
Import Debian version 0.65
java-common (0.65) unstable; urgency=medium
* Bump sparc64 defaults to 1.10.
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.
- - - - -
4 changed files:
- debian/changelog
- debian/control
- debian/java_defaults.mk
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+java-common (0.65) unstable; urgency=medium
+
+ * Bump sparc64 defaults to 1.10.
+
+ -- Matthias Klose <doko at debian.org> Mon, 30 Apr 2018 22:34:12 +0200
+
+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 <doko at debian.org> Sun, 08 Apr 2018 20:00:51 +0200
+
java-common (0.63) unstable; urgency=medium
* Team upload
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Matthias Klose <doko at debian.org>
Build-Depends: debhelper (>= 11)
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
Vcs-Git: https://anonscm.debian.org/git/pkg-java/java-common.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/java-common.git
Homepage: https://wiki.debian.org/Java/
@@ -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
@@ -77,28 +79,28 @@ Description: Standard Java or Java compatible Development Kit (documentation)
kit, or Java compatible development kit recommended for Debian, which is
${doc} for ${jre:arch}.
-Package: default-java-plugin
-Architecture: any
-Depends: default-jre (= ${binary:Version}), ${plugin}, ${misc:Depends}
-Provides: icedtea-plugin
-Description: Default Java Plugin for running applets and Java Web Start applications
- This dependency package points to the default Java Plugin recommended
- for the ${jre:arch} architecture. The Java Plugin adds the ability to run
- Java applets from a web browser and launch Java Web Start applications using
- the Java Network Launch Protocol (JNLP).
+#Package: default-java-plugin
+#Architecture: any
+#Depends: default-jre (= ${binary:Version}), ${plugin}, ${misc:Depends}
+#Provides: icedtea-plugin
+#Description: Default Java Plugin for running applets and Java Web Start applications
+# This dependency package points to the default Java Plugin recommended
+# for the ${jre:arch} architecture. The Java Plugin adds the ability to run
+# Java applets from a web browser and launch Java Web Start applications using
+# the Java Network Launch Protocol (JNLP).
-Package: gcj-native-helper
-Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
-Depends: gcj-jdk, ${misc:Depends}
-Provides: default-jdk-builddep
-Conflicts: default-jdk-builddep
-Replaces: default-jdk-builddep
-Description: Standard helper tools for creating gcj native packages
- This dependency package points to the build dependencies used to build
- gcj native packages.
- .
- Unlike default-jdk-builddep, this package only provides the
- helpers to compile jar/class files into native code and not
- a Java Development Kit (JDK). You do not need this package
- unless you are compiling jar/class files to native code.
+#Package: gcj-native-helper
+#Architecture: any
+#Pre-Depends: ${misc:Pre-Depends}
+#Depends: gcj-jdk, ${misc:Depends}
+#Provides: default-jdk-builddep
+#Conflicts: default-jdk-builddep
+#Replaces: default-jdk-builddep
+#Description: Standard helper tools for creating gcj native packages
+# This dependency package points to the build dependencies used to build
+# gcj native packages.
+# .
+# Unlike default-jdk-builddep, this package only provides the
+# helpers to compile jar/class files into native code and not
+# a Java Development Kit (JDK). You do not need this package
+# unless you are compiling jar/class files to native code.
=====================================
debian/java_defaults.mk
=====================================
--- 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 sparc64 sh4 x32
+java9_architectures = $(java10_architectures) \
+ m68k powerpcspe
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)
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ ifeq (,$(filter $(_java_host_arch),$(java_plugin_architectures)))
endif
p_plugin =
-nopkgs = -Ngcj-native-helper
+# nopkgs = -Ngcj-native-helper -Ndefault-java-plugin
ifeq (5, $(java_default_version))
p_jre =
nopkgs += -N$(p_jre) -N$(p_jhl) -N$(p_jdk) -N$(p_jdkhl)
@@ -70,12 +70,12 @@ override_dh_installdocs:
# dh_link -pdefault-java-plugin /usr/share/doc/default-jre /usr/share/doc/default-java-plugin
dh_installdocs -pdefault-jdk-doc
- dh_installdocs -pgcj-native-helper
+# dh_installdocs -pgcj-native-helper
override_dh_gencontrol:
dh_gencontrol -i
ifneq (,$(p_jre))
- dh_gencontrol -a --no-package=default-java-plugin $(nopkgs) -- \
+ dh_gencontrol -a $(nopkgs) -- \
-v$(dversion) \
'-Vjre=$(p_jre)' \
'-Vjhl=$(p_jhl)' \
@@ -95,7 +95,7 @@ endif
override_dh_builddeb:
dh_builddeb -i
ifneq (,$(p_jre))
- dh_builddeb -a --no-package=default-java-plugin $(nopkgs)
+ dh_builddeb -a $(nopkgs)
endif
ifneq (,$(p_plugin))
dh_builddeb -pdefault-java-plugin
View it on GitLab: https://salsa.debian.org/java-team/java-common/commit/f032def6816d6e46b0d0041ccecf45c0c7220bd1
---
View it on GitLab: https://salsa.debian.org/java-team/java-common/commit/f032def6816d6e46b0d0041ccecf45c0c7220bd1
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/20180508/aa2b40f9/attachment.html>
More information about the pkg-java-commits
mailing list