------------------------------------------------------------
revno: 691
committer: Matthias Klose <[email protected]>
branch nick: openjdk8
timestamp: Thu 2017-01-19 17:02:21 +0100
message:
* Add a breaks for ca-certificates-java (<< 20160321~). Closes: #851667.
* Stop building JamVM for the stretch release, the VM is not working
with recent OpenJDK 8 updates. Closes: #841229, #842132.
* Fix location of jspawnhelper for KFreeBSD. Closes: #851053.
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-01-10 15:40:48 +0000
+++ debian/changelog 2017-01-19 16:02:21 +0000
@@ -2,13 +2,17 @@
[ Matthias Klose ]
* Build using the default flags (POWER8) on ppc64el.
+ * Add a breaks for ca-certificates-java (<< 20160321~). Closes: #851667.
+ * Stop building JamVM for the stretch release, the VM is not working
+ with recent OpenJDK 8 updates. Closes: #841229, #842132.
+ * Fix location of jspawnhelper for KFreeBSD. Closes: #851053.
[ Tiago Stürmer Daitx ]
* debian/rules: add -O3 to DEB_CFLAGS_MAINT_STRIP and
DEB_CXXFLAGS_MAINT_STRIP for dpkg_buildflags_jdk and
dpkg_buildflags_hs as ppc64le has -O3 by default. LP: #1640845.
- -- Matthias Klose <[email protected]> Thu, 03 Nov 2016 22:58:01 +0100
+ -- Matthias Klose <[email protected]> Thu, 19 Jan 2017 12:19:04 +0100
openjdk-8 (8u111-b14-3) unstable; urgency=high
=== modified file 'debian/control'
--- debian/control 2016-11-03 15:02:19 +0000
+++ debian/control 2017-01-19 16:02:21 +0000
@@ -5,7 +5,7 @@
Uploaders: Matthias Klose <[email protected]>
Build-Depends: debhelper (>= 9), quilt, m4, lsb-release, zip, unzip,
sharutils, gawk, cpio, pkg-config, procps, wdiff, fastjar (>= 2:0.96-0ubuntu2),
- autoconf (>= 2.69), automake, autotools-dev, ant, ant-optional, libtool,
+ autoconf (>= 2.69), automake, autotools-dev, ant, ant-optional,
g++-6,
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,
@@ -54,7 +54,8 @@
java5-runtime-headless, java6-runtime-headless,
java7-runtime-headless, java8-runtime-headless,
${defaultvm:Provides}, ${jvm:Provides}
-Breaks: oracle-java8-installer (<< 8u77+8u77arm-1)
+Breaks: oracle-java8-installer (<< 8u77+8u77arm-1),
+ ca-certificates-java (<< 20160321~)
Description: OpenJDK Java runtime, using ${vm:Name} (headless)
Minimal Java runtime - needed for executing non GUI Java programs,
using ${vm:Name}.
@@ -166,19 +167,6 @@
The packages are built using the IcedTea build support and patches
from the IcedTea project.
-Package: openjdk-8-jre-jamvm
-Architecture: amd64 armel armhf i386 powerpc kfreebsd-i386 kfreebsd-amd64 mips mipsel
-Multi-Arch: same
-Priority: extra
-Pre-Depends: ${dpkg:Depends}
-Depends: openjdk-8-jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Alternative JVM for OpenJDK, using JamVM
- The package provides an alternative runtime using the JamVM. This is a
- somewhat faster alternative than the Zero port on architectures like armel,
- mips, mipsel, powerpc.
- .
- The VM is started with the option `-jamvm'. See the README.Debian for details.
-
Package: openjdk-8-jre-zero
Architecture: amd64 i386 arm64 ppc64 ppc64el sparc64 kfreebsd-amd64 kfreebsd-i386
Multi-Arch: same
=== modified file 'debian/control.in'
--- debian/control.in 2016-11-03 15:02:19 +0000
+++ debian/control.in 2017-01-19 16:02:21 +0000
@@ -54,7 +54,8 @@
java5-runtime-headless, java6-runtime-headless,
java7-runtime-headless, java8-runtime-headless,
${defaultvm:Provides}, ${jvm:Provides}
-Breaks: oracle-java8-installer (<< 8u77+8u77arm-1)
+Breaks: oracle-java8-installer (<< 8u77+8u77arm-1),
+ ca-certificates-java (<< 20160321~)
Description: OpenJDK Java runtime, using ${vm:Name} (headless)
Minimal Java runtime - needed for executing non GUI Java programs,
using ${vm:Name}.
=== modified file 'debian/rules'
--- debian/rules 2017-01-10 15:40:48 +0000
+++ debian/rules 2017-01-19 16:02:21 +0000
@@ -149,7 +149,7 @@
any_archs = alpha amd64 armel armhf arm64 i386 ia64 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64
-ifeq (,$(filter $(distrel),squeeze lucid))
+ifeq (,$(filter $(distrel),squeeze lucid sid stretch))
jamvm_archs = amd64 armel armhf i386 powerpc kfreebsd-i386 kfreebsd-amd64 mips mipsel
endif
ifeq (,$(filter $(distrel),wheezy squeeze lucid))
@@ -1606,6 +1606,8 @@
ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386))
cp -a $(d)/$(basedir)/include/bsd $(d)/$(basedir)/include/linux
+ : # Easy fix for #851053
+ mv $(d)/$(basedir)/jre/lib/$(archdir)/jspawnhelper $(d)/$(basedir)/jre/lib/
endif
chmod -R u+w $(d)
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
[email protected] for discussions and questions.
