debian/changelog

+java-common (0.65.1) experimental; urgency=medium
+
+  * Bump the version of the defaults packages to 1.11, keep defaults
+    for m68k, powerpcspe and sh4 at 1.10.
+  * Remove all references to the plugin and gcj packages.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 01 May 2018 12:22:09 +0200
+
+java-common (0.65) unstable; urgency=medium
+
+  * Bump sparc64 defaults to 1.10.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 30 Apr 2018 22:34:12 +0200
+
 java-common (0.63.1) experimental; urgency=medium
 
   [ Tiago Stürmer Daitx ]

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Matthias Klose <doko@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/
@@ -78,29 +78,3 @@ Description: Standard Java or Java compatible Development Kit (documentation)
  This dependency package points to the documentation for the Java development
  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: 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/gcj-native-helper.preinst

-#! /bin/sh
-
-set -e
-
-if [ "$1" = upgrade ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt 2:1.8-57~; then
-    if [ -h /usr/share/doc/gcj-native-helper ]; then
-	rm -f /usr/share/doc/gcj-native-helper
-    fi
-fi
-
-#DEBHELPER#
-
-exit 0

debian/java_defaults.mk

 
 # makefile fragment to define the macros java_default_version,
-# java{,5,6,7,8,9,10,11}_architectures
+# java{,5,6,7,8,9,10,11,12}_architectures
 
-java11_architectures =
-java10_architectures = $(java11_architectures) \
+java12_architectures =
+java11_architectures = $(java12_architectures) \
 		alpha amd64 arm64 armel armhf i386 \
 		ia64 mips mipsel mips64el \
 		powerpc ppc64 ppc64el \
-		s390x sh4 x32
-java9_architectures = $(java10_architectures) \
-		m68k powerpcspe sparc64
+		s390x sparc64 x32
+java10_architectures = $(java11_architectures) \
+		m68k powerpcspe sh4
+java9_architectures = $(java10_architectures)
 java8_architectures = $(java9_architectures) \
 		kfreebsd-amd64 kfreebsd-i386
 java7_architectures = $(java8_architectures)
@@ -23,14 +24,10 @@ java_default_architectures = $(java8_architectures)
 
 java_dependency = $(strip $(1) [$(foreach a,$(filter-out $(java_default_architectures), $(java5_architectures)),!$(a))])
 
-java_plugin_architectures = \
-		amd64 arm64 armel armhf i386 \
-		powerpc ppc64 ppc64el s390x \
-		kfreebsd-amd64 kfreebsd-i386 \
-		x32
-
 _java_host_arch := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH))
-ifneq (,$(filter $(_java_host_arch),$(java11_architectures)))
+ifneq (,$(filter $(_java_host_arch),$(java12_architectures)))
+  java_default_version = 12
+else ifneq (,$(filter $(_java_host_arch),$(java11_architectures)))
   java_default_version = 11
 else ifneq (,$(filter $(_java_host_arch),$(java10_architectures)))
   java_default_version = 10
@@ -60,7 +57,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 11))
+ifneq (,$(filter $(java_default_version), 9 10 11 12))
   jvm_archpath := lib/$(jvm_archdir)
 else
   jvm_archpath := jre/lib/$(jvm_archdir)

debian/rules

@@ -14,32 +14,9 @@ p_jhl		= openjdk-$(java_default_version)-jre-headless
 p_jdk		= openjdk-$(java_default_version)-jdk
 p_jdkhl		= openjdk-$(java_default_version)-jdk-headless
 p_doc		= openjdk-$(java_default_version)-doc
-p_plugin	= icedtea-$(java_default_version)-plugin
 dversion	= 2:1.$(java_default_version)-$(release)
 jvmdir		= java-1.$(java_default_version).0-openjdk-$(DEB_HOST_ARCH)
 
-ifeq (5, $(java_default_version))
-  p_jre		= gcj-jre
-  p_jhl		= gcj-jre-headless
-  p_jdk		= gcj-jdk
-  p_jdkhl	= gcj-jdk # no gcj-jdk-headless package
-  p_doc		= openjdk-8-doc
-  p_plugin	=
-  jvmdir	= java-gcj
-endif
-
-# Build default-java-plugin for the architectures supporting icedtea-web only
-ifeq (,$(filter $(_java_host_arch),$(java_plugin_architectures)))
-  p_plugin      =
-endif
-p_plugin      =
-
-nopkgs = -Ngcj-native-helper
-ifeq (5, $(java_default_version))
-	p_jre =
-	nopkgs += -N$(p_jre) -N$(p_jhl) -N$(p_jdk) -N$(p_jdkhl)
-endif
-
 jre_provides	= java-runtime, java2-runtime, $(shell seq --format java%.f-runtime --separator ', ' 5 $(java_default_version))
 jhl_provides	= java-runtime-headless, java2-runtime-headless, $(shell seq --format java%.f-runtime-headless --separator ', ' 5 $(java_default_version))
 jdk_provides	= java-sdk, java2-sdk, $(shell seq --format java%.f-sdk --separator ', ' 5 $(java_default_version))
@@ -67,15 +44,13 @@ override_dh_installdocs:
 	dh_link -pdefault-jre          /usr/share/doc/default-jre-headless /usr/share/doc/default-jre
 	dh_link -pdefault-jdk-headless /usr/share/doc/default-jre-headless /usr/share/doc/default-jdk-headless
 	dh_link -pdefault-jdk          /usr/share/doc/default-jre          /usr/share/doc/default-jdk
-#	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
 
 override_dh_gencontrol:
 	dh_gencontrol -i
 ifneq (,$(p_jre))
-	dh_gencontrol -a --no-package=default-java-plugin $(nopkgs) -- \
+	dh_gencontrol -a -- \
 		-v$(dversion) \
 		'-Vjre=$(p_jre)' \
 		'-Vjhl=$(p_jhl)' \
@@ -88,15 +63,9 @@ ifneq (,$(p_jre))
 		'-Vjdkhl:provides=$(jdkhl_provides)' \
 		'-Vjdk:provides=$(jdk_provides)'
 endif
-ifneq (,$(p_plugin))
-	dh_gencontrol -pdefault-java-plugin -- -v$(dversion) -Vplugin=$(p_plugin) -Vjre:arch=$(DEB_HOST_ARCH)
-endif
 
 override_dh_builddeb:
 	dh_builddeb -i
 ifneq (,$(p_jre))
-	dh_builddeb -a --no-package=default-java-plugin $(nopkgs)
-endif
-ifneq (,$(p_plugin))
-	dh_builddeb -pdefault-java-plugin
+	dh_builddeb -a
 endif