------------------------------------------------------------ revno: 714 committer: Matthias Klose <d...@ubuntu.com> branch nick: openjdk8 timestamp: Sat 2017-09-30 04:20:14 +0200 message: upload 8u144-b01-2 added: debian/jvm.cfg-client_default modified: debian/changelog debian/control debian/control.in debian/rules
-- lp:~openjdk/openjdk/openjdk8 https://code.launchpad.net/~openjdk/openjdk/openjdk8 Your team Debian Java Maintainers is subscribed to branch lp:~openjdk/openjdk/openjdk8. To unsubscribe from this branch go to https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'debian/changelog' --- debian/changelog 2017-08-24 14:39:01 +0000 +++ debian/changelog 2017-09-30 02:20:14 +0000 @@ -1,9 +1,20 @@ -openjdk-8 (8u144-b01-2) UNRELEASED; urgency=medium +openjdk-8 (8u144-b01-2) unstable; urgency=medium + [ Matthias Klose ] * Don't regenerate the control file during the build. * Enable systemtap on sh4. - - -- Matthias Klose <d...@ubuntu.com> Thu, 24 Aug 2017 16:32:03 +0200 + * Bump standards version to 4.1.0. + * Build using GCC 7 on recent development versions. + + [ Tiago Stürmer Daitx ] + * debian/rules: + - when zero/shark alternate vm is build, add '-zero KNOWN' to jvm.cfg. + - for non-hotspot builds add '-zero ALIASED_TO -server' to jvm.cfg. + - enable zero alternate vm on armhf. + * debian/jvm.cfg-client_default: aarch32 only builds the client + compiler and requires its own default jvm. Closes: #874434. + + -- Matthias Klose <d...@ubuntu.com> Sat, 30 Sep 2017 02:37:14 +0200 openjdk-8 (8u144-b01-1) unstable; urgency=medium === modified file 'debian/control' --- debian/control 2017-08-24 00:17:21 +0000 +++ debian/control 2017-09-30 02:20:14 +0000 @@ -7,7 +7,7 @@ sharutils, gawk, cpio, pkg-config, procps, wdiff, tzdata, fastjar (>= 2:0.96-0ubuntu2), autoconf (>= 2.69), automake, autotools-dev, ant, ant-optional, - g++-6, + g++-7, openjdk-8-jdk | openjdk-7-jdk, libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libffi-dev, @@ -15,7 +15,7 @@ libnss3-dev (>= 2:3.17.1), mauve, jtreg, xvfb, xauth, xfonts-base, libgl1-mesa-dri [!x32], twm | metacity, twm | dbus-x11, x11-xkb-utils, time, openjdk-8-jdk-headless <cross>, dpkg-dev (>= 1.17.14), -Standards-Version: 3.9.8 +Standards-Version: 4.1.0 Homepage: http://openjdk.java.net/ Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/openjdk8 Vcs-Browser: https://code.launchpad.net/~openjdk/openjdk/openjdk8 @@ -168,7 +168,7 @@ from the IcedTea project. Package: openjdk-8-jre-zero -Architecture: amd64 i386 arm64 ppc64 ppc64el sparc64 kfreebsd-amd64 kfreebsd-i386 +Architecture: amd64 i386 arm64 ppc64 ppc64el sparc64 armhf kfreebsd-amd64 kfreebsd-i386 Multi-Arch: same Priority: extra Pre-Depends: ${dpkg:Depends} === modified file 'debian/control.in' --- debian/control.in 2017-08-24 00:17:21 +0000 +++ debian/control.in 2017-09-30 02:20:14 +0000 @@ -15,7 +15,7 @@ @bd_nss@ @bd_mauve@ @bd_jtreg@ @bd_xvfb@ time, @bd_cross@ -Standards-Version: 3.9.8 +Standards-Version: 4.1.0 Homepage: http://openjdk.java.net/ Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/openjdk8 Vcs-Browser: https://code.launchpad.net/~openjdk/openjdk/openjdk8 === added file 'debian/jvm.cfg-client_default' --- debian/jvm.cfg-client_default 1970-01-01 00:00:00 +0000 +++ debian/jvm.cfg-client_default 2017-09-30 02:20:14 +0000 @@ -0,0 +1,6 @@ +# jvm.cfg-default - default jvm configuration which is used if no jvm.cfg +# is found. After unpacking the file jvm.cfg doesn't exist yet (config file), +# in this case use this file instead, so that the VM can be used before +# configuration of the runtime package. +-client KNOWN +-server ALIASED_TO -client === modified file 'debian/rules' --- debian/rules 2017-08-24 14:39:01 +0000 +++ debian/rules 2017-09-30 02:20:14 +0000 @@ -161,7 +161,7 @@ # Don't build zero alternate vm on Trusty ifeq (,$(filter $(distrel),trusty)) - altzero_archs = $(filter-out sparc $(hotspot_aarch32_archs), $(hotspot_archs)) $(altshark_archs) + altzero_archs = $(filter-out sparc, $(hotspot_archs)) $(altshark_archs) endif ifeq (,$(filter noaltzero, $(DEB_BUILD_OPTIONS))$(filter noaltshark, $(DEB_BUILD_OPTIONS))) @@ -249,12 +249,15 @@ else ifneq (,$(filter $(distrel),wily xenial)) export CC = $(DEB_HOST_GNU_TYPE)-gcc-5 export CXX = $(DEB_HOST_GNU_TYPE)-g++-5 -else ifneq (,$(filter $(distrel),sid stretch)) +else ifneq (,$(filter $(distrel),zesty stretch)) export CC = $(DEB_HOST_GNU_TYPE)-gcc-6 export CXX = $(DEB_HOST_GNU_TYPE)-g++-6 +else ifneq (,$(filter $(distrel),sid buster artful)) + export CC = $(DEB_HOST_GNU_TYPE)-gcc-7 + export CXX = $(DEB_HOST_GNU_TYPE)-g++-7 else - export CC = $(DEB_HOST_GNU_TYPE)-gcc-6 - export CXX = $(DEB_HOST_GNU_TYPE)-g++-6 + export CC = $(DEB_HOST_GNU_TYPE)-gcc-7 + export CXX = $(DEB_HOST_GNU_TYPE)-g++-7 endif ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf)) @@ -663,10 +666,12 @@ bd_gcc = g++-4.9, else ifneq (,$(filter $(distrel),wily xenial)) bd_gcc = g++-5, -else ifneq (,$(filter $(distrel),stretch sid)) +else ifneq (,$(filter $(distrel),stretch zesty)) bd_gcc = g++-6, +else ifneq (,$(filter $(distrel),buster sid artful)) + bd_gcc = g++-7, else - bd_gcc = g++-6, + bd_gcc = g++-7, endif bd_syslibs = zlib1g-dev, libattr1-dev, ifneq (,$(filter $(distrel),squeeze lucid)) @@ -1542,7 +1547,11 @@ find $(d) -name 'javaws*' | xargs -r rm -f : # install default jvm config file +ifeq (,$(filter $(DEB_HOST_ARCH),$(hotspot_aarch32_archs))) cp debian/jvm.cfg-default $(d)/$(basedir)/jre/lib/$(archdir)/ +else + cp debian/jvm.cfg-client_default $(d)/$(basedir)/jre/lib/$(archdir)/jvm.cfg-default +endif : # compress manpages find $(d)/$(basedir)/man $(d)/$(basedir)/jre/man -type f ! -type l \ @@ -1636,9 +1645,11 @@ done mv $(d)/$(basedir)/jre/lib/$(archdir)/jvm.cfg \ $(d)/$(etcdir)/ -ifneq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs))) +ifneq (,$(filter shark zero,$(alternate_vms))) + # a zero alternate vm was build printf -- '-zero KNOWN\n' >> $(d)/$(etcdir)/jvm.cfg -else +else ifeq (,$(filter $(DEB_HOST_ARCH),$(hotspot_archs))) + # not a hotspot arch, so alias zero to server printf -- '-zero ALIASED_TO -server\n' >> $(d)/$(etcdir)/jvm.cfg endif
__ This is the maintainer address of Debian's Java team <http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. Please use debian-j...@lists.debian.org for discussions and questions.
