[Git][java-team/java-common][master] 7 commits: Use salsa.debian.org Vcs-* URLs
Emmanuel Bourg
gitlab at salsa.debian.org
Mon May 28 15:03:19 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / java-common
Commits:
68143043 by Emmanuel Bourg at 2018-05-28T14:02:59+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
5b0929c8 by Matthias Klose at 2018-05-28T14:16:44+02:00
Remove all references to the plugin and gcj packages.
- - - - -
d6e9e0c2 by Matthias Klose at 2018-05-28T14:55:55+02:00
Add the default values for Java 12
- - - - -
a62ac52d by Emmanuel Bourg at 2018-05-28T15:21:45+02:00
Removed the GCJ paths from jvm_includes
- - - - -
3391bf62 by Emmanuel Bourg at 2018-05-28T15:58:41+02:00
Simplified debian/rules
- - - - -
9e931909 by Emmanuel Bourg at 2018-05-28T15:58:56+02:00
Trimmed trailing spaces
- - - - -
938513c7 by Emmanuel Bourg at 2018-05-28T15:59:41+02:00
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- − debian/gcj-native-helper.preinst
- debian/java_defaults.mk
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+java-common (0.66) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Emmanuel Bourg ]
+ * Use salsa.debian.org Vcs-* URLs
+ * Removed the GCJ paths from jvm_includes
+ * Simplified debian/rules
+
+ [ Matthias Klose ]
+ * Remove all references to the plugin and gcj packages.
+ * Add the default values for Java 12
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 28 May 2018 15:59:28 +0200
+
java-common (0.65) unstable; urgency=medium
* Bump sparc64 defaults to 1.10.
@@ -337,7 +352,7 @@ java-common (0.38) unstable; urgency=low
* Updated the description of gcj-native-helper and also the
previous changelog entry to clarify that gcj-native-helper
is only a partial replacement for default-jdk-builddep.
-
+
Please see README.gcj-native-transition in the java-common
package for more information on the transition.
* Added missing Replaces/Conflicts for gcj-native-helper.
@@ -465,7 +480,7 @@ java-common (0.30ubuntu3) intrepid; urgency=low
* On powerpc, default back to openjdk-6 instead of cacao-oj6. Still
more testsuite failures in the OpenJDK testsuite with cacao compared
- to the zero port.
+ to the zero port.
-- Matthias Klose <doko at ubuntu.com> Mon, 13 Oct 2008 18:09:39 +0000
@@ -745,13 +760,13 @@ java-common (0.5) unstable; urgency=low
java-common (0.4) unstable; urgency=low
- * A few fixes (URLs mostly).
+ * A few fixes (URLs mostly).
-- Stephane Bortzmeyer <bortzmeyer at debian.org> Mon, 2 Oct 2000 11:26:10 +0200
java-common (0.3) unstable; urgency=low
- * Added the Debian-Java FAQ (maintained by Fernandez-Sanguino Pen~a
+ * Added the Debian-Java FAQ (maintained by Fernandez-Sanguino Pen~a
<jfs at computer.org>) to the information provided by the package.
-- Stephane Bortzmeyer <bortzmeyer at debian.org> Wed, 12 Jul 2000 16:08:32 +0200
@@ -764,7 +779,7 @@ java-common (0.2) unstable; urgency=low
java-common (0.1) unstable; urgency=low
- * Proper versioning for a Debian-only package
+ * Proper versioning for a Debian-only package
-- Stephane Bortzmeyer <bortzmeyer at debian.org> Mon, 28 Jun 1999 15:00:52 +0200
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Matthias Klose <doko at debian.org>
Build-Depends: debhelper (>= 11)
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
+Vcs-Git: https://salsa.debian.org/java-team/java-common.git
+Vcs-Browser: https://salsa.debian.org/java-team/java-common
Homepage: https://wiki.debian.org/Java/
Package: java-common
@@ -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 deleted
=====================================
--- a/debian/gcj-native-helper.preinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /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
=====================================
--- a/debian/java_defaults.mk
+++ b/debian/java_defaults.mk
@@ -1,8 +1,9 @@
# 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 =
+java12_architectures =
+java11_architectures = $(java12_architectures)
java10_architectures = $(java11_architectures) \
alpha amd64 arm64 armel armhf i386 \
ia64 mips mipsel mips64el \
@@ -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,21 +57,17 @@ 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)
endif
_jvm_osinclude = linux
-ifeq ($(java_default_version),5)
- jvm_includes = \
- -I/usr/lib/jvm/java-gcj/include -I/usr/lib/jvm/java-gcj/include/$(_jvm_osinclude)
-else
- ifeq (,$(filter $(java_default_version), 6 7))
- _jvm_osinclude = $(if $(findstring kfreebsd,$(_java_host_arch)),bsd,linux)
- endif
- jvm_includes = \
+ifeq (,$(filter $(java_default_version), 6 7))
+ _jvm_osinclude = $(if $(findstring kfreebsd,$(_java_host_arch)),bsd,linux)
+endif
+
+jvm_includes = \
-I/usr/lib/jvm/java-$(java_default_version)-openjdk-$(_java_host_arch)/include \
-I/usr/lib/jvm/java-$(java_default_version)-openjdk-$(_java_host_arch)/include/$(_jvm_osinclude)
-endif
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,44 +1,11 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/dpkg/default.mk
+include debian/java_defaults.mk
release = $(shell dpkg-parsechangelog | grep -E ^Version: | sed "s/Version: 0.//")
-DEB_HOST_ARCH ?= $(shell dpkg-architecture --query DEB_HOST_ARCH)
-
-include debian/java_defaults.mk
-
-p_jre = openjdk-$(java_default_version)-jre
-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 -Ndefault-java-plugin
-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))
@@ -53,11 +20,11 @@ override_dh_link:
dh_link
# Link /usr/lib/jvm/default-java to the default JRE
- dh_link -pdefault-jre-headless usr/lib/jvm/$(jvmdir) usr/lib/jvm/default-java
+ dh_link -pdefault-jre-headless usr/lib/jvm/java-1.$(java_default_version).0-openjdk-$(DEB_HOST_ARCH) usr/lib/jvm/default-java
# Link to the JDK documentation
- dh_link -pdefault-jdk-doc /usr/share/doc/$(p_doc)/api usr/share/doc/default-jre-headless/api
- dh_link -pdefault-jdk-doc /usr/share/doc/$(p_doc)/api usr/share/doc/default-jdk-doc/api
+ dh_link -pdefault-jdk-doc /usr/share/doc/openjdk-$(java_default_version)-doc/api usr/share/doc/default-jre-headless/api
+ dh_link -pdefault-jdk-doc /usr/share/doc/openjdk-$(java_default_version)-doc/api usr/share/doc/default-jdk-doc/api
override_dh_installdocs:
dh_installdocs -i
@@ -67,36 +34,20 @@ 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 $(nopkgs) -- \
+ dh_gencontrol -a -- \
-v$(dversion) \
- '-Vjre=$(p_jre)' \
- '-Vjhl=$(p_jhl)' \
- '-Vjdk=$(p_jdk)' \
- '-Vjdkhl=$(p_jdkhl)' \
- '-Vdoc=$(p_doc)' \
+ '-Vjre=openjdk-$(java_default_version)-jre' \
+ '-Vjhl=openjdk-$(java_default_version)-jre-headless' \
+ '-Vjdk=openjdk-$(java_default_version)-jdk' \
+ '-Vjdkhl=openjdk-$(java_default_version)-jdk-headless' \
+ '-Vdoc=openjdk-$(java_default_version)-doc' \
'-Vjre:arch=$(DEB_HOST_ARCH)' \
'-Vjre:provides=$(jre_provides)' \
'-Vjhl:provides=$(jhl_provides)' \
'-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 $(nopkgs)
-endif
-ifneq (,$(p_plugin))
- dh_builddeb -pdefault-java-plugin
-endif
View it on GitLab: https://salsa.debian.org/java-team/java-common/compare/f032def6816d6e46b0d0041ccecf45c0c7220bd1...938513c70a65e9fed99518116bf17da7e3b2c0f6
--
View it on GitLab: https://salsa.debian.org/java-team/java-common/compare/f032def6816d6e46b0d0041ccecf45c0c7220bd1...938513c70a65e9fed99518116bf17da7e3b2c0f6
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/20180528/a92db0c0/attachment.html>
More information about the pkg-java-commits
mailing list