------------------------------------------------------------
revno: 574
committer: Matthias Klose <[email protected]>
branch nick: openjdk6
timestamp: Sat 2016-05-07 00:08:18 +0200
message:
openjdk-6 (6b39-1.13.11-1) experimental; urgency=medium
[ Tiago Stürmer Daitx ]
* IcedTea 1.13.11 release.
* Security fixes:
- S8129952, CVE-2016-0686: Ensure thread consistency
- S8132051, CVE-2016-0687: Better byte behavior
- S8138593, CVE-2016-0695: Make DSA more fair
- S8139008: Better state table management
- S8143167, CVE-2016-3425: Better buffering of XML strings
- S8144430, CVE-2016-3427: Improve JMX connections
- S8146494: Better ligature substitution
- S8146498: Better device table adjustments
* debian/rules: remove deprecated dh_desktop call. Closes #817302
[ Matthias Klose ]
* Fix handling of /usr/lib/jvm/*/jre/lib/zi if internal tzdata is used.
Addresses: #821858.
* Build on ARM using the zero port (without the ARM assembler interpreter).
Broken in the security update.
-- Matthias Klose <[email protected]> Fri, 06 May 2016 21:32:49 +0200
openjdk-6 (6b38-1.13.10-1) experimental; urgency=medium
[ Tiago Stürmer Daitx ]
* IcedTea 1.13.10 release.
* Security fixes:
- S8059054, CVE-2016-0402: Better URL processing
- S8130710, CVE-2016-0448: Better attributes processing
- S8133962, CVE-2016-0466: More general limits
- S8137060: JMX memory management improvements
- S8139012: Better font substitutions
- S8139017, CVE-2016-0483: More stable image decoding
- S8140543, CVE-2016-0494: Arrange font actions
- S8143185: Cleanup for handling proxies
- S8143941, CVE-2015-8126, CVE-2015-8472: Update splashscreen displays
* Other fixes:
- S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F
(LP: #932274)
* debian/rules: removed old @op@, @pkg_version@, and @pkg_sversion@
* debian/control.in: replaced @op@ with =, @pkg_version@ with
${binary:Version}, and @pkg_sversion@ by ${source:Version}
* debian/control.cacao-jre: same
* debian/control.jamvm-jre: same
* debian/control.zero-jre: same
[ Matthias Klose ]
* Fix clean-up of dependency generation.
-- Matthias Klose <[email protected]> Tue, 26 Jan 2016 12:46:18 +0100
added:
patches/hotspot-disable-arm32-jit.diff
modified:
.bzrignore
JB-jre-headless.postinst.in
JB-jre-headless.preinst.in
changelog
control
control.cacao-jre
control.in
control.jamvm-jre
control.zero-jre
generate-debian-orig.sh
icedtea-patch.diff
rules
--
lp:~openjdk/openjdk/openjdk6
https://code.launchpad.net/~openjdk/openjdk/openjdk6
Your team Debian Java Maintainers is subscribed to branch
lp:~openjdk/openjdk/openjdk6.
To unsubscribe from this branch go to
https://code.launchpad.net/~openjdk/openjdk/openjdk6/+edit-subscription
=== modified file '.bzrignore'
--- .bzrignore 2008-04-01 13:44:46 +0000
+++ .bzrignore 2016-05-06 22:08:18 +0000
@@ -1,2 +1,49 @@
-debian
.bzr-builddeb
+autoreconf.*
+files
+*.debhelper
+*.debhelper.log
+*.install
+*.substvars
+*.links
+*.overrides
+
+tmp
+icedtea-6-jre-cacao
+icedtea-6-jre-jamvm
+openjdk-6-dbg
+openjdk-6-demo
+openjdk-6-doc
+openjdk-6-jdk
+openjdk-6-jre
+openjdk-6-jre-headless
+openjdk-6-jre-lib
+openjdk-6-jre-zero
+openjdk-6-source
+
+README.alternatives
+openjdk-6-archive.applications
+openjdk-6-archive.keys
+openjdk-6-archive.mime
+openjdk-6-demo.menu
+openjdk-6-doc.doc-base
+openjdk-6-fonts.defoma-hints
+openjdk-6-java.desktop
+openjdk-6-jconsole.desktop
+openjdk-6-jdk.menu
+openjdk-6-jdk.postinst
+openjdk-6-jdk.preinst
+openjdk-6-jdk.prerm
+openjdk-6-jre-headless.postinst
+openjdk-6-jre-headless.postrm
+openjdk-6-jre-headless.preinst
+openjdk-6-jre-headless.prerm
+openjdk-6-jre-lib.postinst
+openjdk-6-jre-lib.preinst
+openjdk-6-jre.menu
+openjdk-6-jre.postinst
+openjdk-6-jre.preinst
+openjdk-6-jre.prerm
+openjdk-6-policytool.desktop
+
+patches/jexec.diff
=== modified file 'JB-jre-headless.postinst.in'
--- JB-jre-headless.postinst.in 2013-02-06 22:16:31 +0000
+++ JB-jre-headless.postinst.in 2016-05-06 22:08:18 +0000
@@ -3,6 +3,7 @@
set -e
multiarch=@multiarch@
+with_tzdata=@with_tzdata@
priority=@priority@
basedir=/@basedir@
mandir=$basedir/jre/man
@@ -119,6 +120,13 @@
rm -f $log
esac
+ if [ "$with_tzdata" = yes ] && [ -n "$multiarch" ]; then
+ if [ ! -h /@basedir@/jre/lib/zi ] && [ -d /@basedir@/jre/lib/zi ]; then
+ rm -rf /@basedir@/jre/lib/zi
+ ln -s ../../../../../share/javazi /@basedir@/jre/lib/zi
+ fi
+ fi
+
# not shipped anymore
rm -f /etc/@basename@/security/nss-*.cfg
;;
=== modified file 'JB-jre-headless.preinst.in'
--- JB-jre-headless.preinst.in 2012-02-27 12:24:44 +0000
+++ JB-jre-headless.preinst.in 2016-05-06 22:08:18 +0000
@@ -7,6 +7,7 @@
fi
multiarch=@multiarch@
+with_tzdata=@with_tzdata@
old_basedir=/usr/lib/jvm/java-6-openjdk
jre_tools='java keytool pack200 rmid rmiregistry unpack200 orbd servertool tnameserv'
@@ -22,6 +23,13 @@
update-alternatives --remove jexec $old_basedir/jre/lib/jexec || true
fi
fi
+
+ # upgrading from a version that used the timezone files from tzdata-java
+ if [ "$with_tzdata" != yes ] && [ -n "$multiarch" ]; then
+ if [ -h /@basedir@/jre/lib/zi ]; then
+ rm -f /@basedir@/jre/lib/zi
+ fi
+ fi
;;
esac
=== modified file 'changelog'
--- changelog 2015-11-19 21:08:21 +0000
+++ changelog 2016-05-06 22:08:18 +0000
@@ -1,3 +1,55 @@
+openjdk-6 (6b39-1.13.11-1) experimental; urgency=medium
+
+ [ Tiago Stürmer Daitx ]
+ * IcedTea 1.13.11 release.
+ * Security fixes:
+ - S8129952, CVE-2016-0686: Ensure thread consistency
+ - S8132051, CVE-2016-0687: Better byte behavior
+ - S8138593, CVE-2016-0695: Make DSA more fair
+ - S8139008: Better state table management
+ - S8143167, CVE-2016-3425: Better buffering of XML strings
+ - S8144430, CVE-2016-3427: Improve JMX connections
+ - S8146494: Better ligature substitution
+ - S8146498: Better device table adjustments
+ * debian/rules: remove deprecated dh_desktop call. Closes #817302
+
+ [ Matthias Klose ]
+ * Fix handling of /usr/lib/jvm/*/jre/lib/zi if internal tzdata is used.
+ Addresses: #821858.
+ * Build on ARM using the zero port (without the ARM assembler interpreter).
+ Broken in the security update.
+
+ -- Matthias Klose <[email protected]> Fri, 06 May 2016 21:32:49 +0200
+
+openjdk-6 (6b38-1.13.10-1) experimental; urgency=medium
+
+ [ Tiago Stürmer Daitx ]
+ * IcedTea 1.13.10 release.
+ * Security fixes:
+ - S8059054, CVE-2016-0402: Better URL processing
+ - S8130710, CVE-2016-0448: Better attributes processing
+ - S8133962, CVE-2016-0466: More general limits
+ - S8137060: JMX memory management improvements
+ - S8139012: Better font substitutions
+ - S8139017, CVE-2016-0483: More stable image decoding
+ - S8140543, CVE-2016-0494: Arrange font actions
+ - S8143185: Cleanup for handling proxies
+ - S8143941, CVE-2015-8126, CVE-2015-8472: Update splashscreen displays
+ * Other fixes:
+ - S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F
+ (LP: #932274)
+ * debian/rules: removed old @op@, @pkg_version@, and @pkg_sversion@
+ * debian/control.in: replaced @op@ with =, @pkg_version@ with
+ ${binary:Version}, and @pkg_sversion@ by ${source:Version}
+ * debian/control.cacao-jre: same
+ * debian/control.jamvm-jre: same
+ * debian/control.zero-jre: same
+
+ [ Matthias Klose ]
+ * Fix clean-up of dependency generation.
+
+ -- Matthias Klose <[email protected]> Tue, 26 Jan 2016 12:46:18 +0100
+
openjdk-6 (6b37-1.13.9-1) experimental; urgency=medium
[ Tiago Stürmer Daitx ]
=== modified file 'control'
--- control 2014-11-13 15:03:37 +0000
+++ control 2016-05-06 22:08:18 +0000
@@ -1,7 +1,8 @@
Source: openjdk-6
Section: java
Priority: optional
-Maintainer: OpenJDK Team <[email protected]>
+Maintainer: Ubuntu Developers <[email protected]>
+XSBC-Original-Maintainer: OpenJDK Team <[email protected]>
Uploaders: Torsten Werner <[email protected]>, Matthias Klose <[email protected]>, Damien Raude-Morvan <[email protected]>
Build-Depends: debhelper (>= 5), binutils-dev [armel armhf], m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, fastjar (>= 2:0.96-0ubuntu2), autoconf, automake1.11, autotools-dev, ant, ant-optional, libtool [alpha amd64 armel armhf i386 lpia m68k mips mipsel powerpc s390], g++-4.9, ecj-gcj [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el m68k mips mipsel sh4 sparc sparc64 s390 s390x], gcj-jdk [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el m68k mips mipsel sh4 sparc sparc64 s390 s390x], openjdk-6-jdk (>= 6b27) [alpha], 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, xsltproc, libkrb5-dev, rhino, fonts-ipafont-mincho, libffi-dev, zlib1g-dev, libpng-dev, libjpeg-dev, libgif-dev, libpulse-dev (>= 0.9.12), libnss3-dev (>= 2:3.17.1), mauve, xvfb, xauth, xfonts-base, libgl1-mesa-dri, twm | metacity, twm | dbus-x11, x11-xkb-utils,
Standards-Version: 3.9.6
=== modified file 'control.cacao-jre'
--- control.cacao-jre 2011-08-28 18:50:11 +0000
+++ control.cacao-jre 2016-05-06 22:08:18 +0000
@@ -4,7 +4,7 @@
Multi-Arch: same
Priority: extra
Pre-Depends: ${dpkg:Depends}
-Depends: @basename@-jre-headless (= @pkg_version@), ${shlibs:Depends}, ${misc:Depends}
+Depends: @basename@-jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Provides: icedtea6-jre-cacao
Description: Alternative JVM for OpenJDK, using Cacao
The package provides an alternative runtime using the Cacao VM and the
=== modified file 'control.in'
--- control.in 2014-11-13 15:03:37 +0000
+++ control.in 2016-05-06 22:08:18 +0000
@@ -1,7 +1,8 @@
Source: @basename@
Section: java
Priority: optional
-Maintainer: OpenJDK Team <[email protected]>
+Maintainer: Ubuntu Developers <[email protected]>
+XSBC-Original-Maintainer: OpenJDK Team <[email protected]>
Uploaders: Torsten Werner <[email protected]>, Matthias Klose <[email protected]>, Damien Raude-Morvan <[email protected]>
Build-Depends: debhelper (>= 5), binutils-dev [armel armhf], m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, @bd_fastjar@ @bd_compress@ @bd_autotools@ @bd_ant@ @bd_cacao@ @bd_gcc@ @bd_bootstrap@ @bd_openjdk@ @bd_zero@ @bd_shark@ @bd_syslibs@ @bd_pulsejava@ @bd_nss@ @bd_systemtap@ @bd_mauve@ @bd_xvfb@
Standards-Version: 3.9.6
@@ -13,7 +14,7 @@
Architecture: any
Multi-Arch: same
Pre-Depends: ${dpkg:Depends}
-Depends: @basename@-jre (@op@ @pkg_version@), ${shlibs:Depends}, ${misc:Depends}
+Depends: @basename@-jre (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: libxt-dev
Suggests: @basename@-demo, @basename@-source, visualvm
Provides: java-sdk, java2-sdk, java5-sdk, java6-sdk, java-compiler
@@ -29,7 +30,7 @@
Architecture: any
Multi-Arch: same
Pre-Depends: ${dpkg:Depends}, ${multiarch:Depends}
-Depends: @basename@-jre-lib (@op@ @pkg_sversion@), ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:Depends}, ${dlopenhl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: @basename@-jre-lib (= ${source:Version}), ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:Depends}, ${dlopenhl:Depends}, ${shlibs:Depends}, ${misc:Depends}
Recommends: ${dlopenjl:Recommends}, ${cacao:Recommends}, ${jamvm:Recommends}
Suggests: libnss-mdns, sun-java6-fonts, @core_fonts@, @cjk_fonts@
Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides}
@@ -46,7 +47,7 @@
Architecture: any
Multi-Arch: same
Pre-Depends: ${dpkg:Depends}
-Depends: @basename@-jre-headless (@op@ @pkg_version@), ${xandsound:Depends}, ${shlibs:Depends}, ${dlopenjre:Depends}, ${misc:Depends}, ${dep:bridge}
+Depends: @basename@-jre-headless (= ${binary:Version}), ${xandsound:Depends}, ${shlibs:Depends}, ${dlopenjre:Depends}, ${misc:Depends}, ${dep:bridge}
Recommends: ${dlopenjre:Recommends}, @core_fonts@, icedtea-netx
Suggests: icedtea-plugin, ${pkg:pulseaudio}
Conflicts: icedtea-gcjwebplugin (<< 1.0-1ubuntu4), @basename@-jre-lib (<< 6b17~pre3-1), @basename@-jre-headless (<< 6b17~pre3-1), @basename@-jdk (<< 6b17~pre3-1), @basename@-demo (<< 6b17~pre3-1), @basename@-source (<< 6b17~pre3-1), @basename@-doc (<< 6b17~pre3-1), @basename@-dbg (<< 6b17~pre3-1), @basename@-jre-zero (<< 6b17~pre3-1)
@@ -78,7 +79,7 @@
Architecture: any
Priority: extra
Pre-Depends: ${dpkg:Depends}
-Depends: @basename@-jre (@op@ @pkg_version@), ${shlibs:Depends}, ${misc:Depends}
+Depends: @basename@-jre (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: @basename@-jre-headless (<< 6b17~pre3-1), @basename@-jre (<< 6b17~pre3-1)
Description: Java runtime based on OpenJDK (demos and examples)
OpenJDK Java runtime
@@ -90,7 +91,7 @@
Architecture: all
Priority: extra
Pre-Depends: ${dpkg:Depends}
-Depends: @basename@-jre (>= @pkg_sversion@), @basename@-jdk (>= @pkg_version@), ${misc:Depends}
+Depends: @basename@-jre (>= ${source:Version}), @basename@-jdk (>= ${binary:Version}), ${misc:Depends}
Conflicts: @basename@-jre-headless (<< 6b17~pre3-1), @basename@-jre (<< 6b17~pre3-1)
Description: OpenJDK Development Kit (JDK) source files
OpenJDK is a development environment for building applications,
@@ -125,9 +126,9 @@
Priority: extra
Section: debug
Pre-Depends: ${dpkg:Depends}
-Depends: @basename@-jre-headless (= @pkg_version@), ${misc:Depends}
-Recommends: @basename@-jre (= @pkg_version@)
-Suggests: @basename@-jdk (= @pkg_version@)
+Depends: @basename@-jre-headless (= ${binary:Version}), ${misc:Depends}
+Recommends: @basename@-jre (= ${binary:Version})
+Suggests: @basename@-jdk (= ${binary:Version})
Conflicts: @basename@-jre-headless (<< 6b17~pre3-1), @basename@-jre (<< 6b17~pre3-1)
Description: Java runtime based on OpenJDK (debugging symbols)
OpenJDK is a development environment for building applications,
=== modified file 'control.jamvm-jre'
--- control.jamvm-jre 2011-08-28 18:50:11 +0000
+++ control.jamvm-jre 2016-05-06 22:08:18 +0000
@@ -4,7 +4,7 @@
Multi-Arch: same
Priority: extra
Pre-Depends: ${dpkg:Depends}
-Depends: @basename@-jre-headless (= @pkg_version@), ${shlibs:Depends}, ${misc:Depends}
+Depends: @basename@-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,
=== modified file 'control.zero-jre'
--- control.zero-jre 2011-08-28 18:50:11 +0000
+++ control.zero-jre 2016-05-06 22:08:18 +0000
@@ -4,7 +4,7 @@
Multi-Arch: same
Priority: extra
Pre-Depends: ${dpkg:Depends}
-Depends: @basename@-jre-headless (= @pkg_version@), ${shlibs:Depends}, ${misc:Depends}
+Depends: @basename@-jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Provides: ${zerovm:Provides}
Conflicts: @basename@-jre-headless (<< 6b17~pre3-1), @basename@-jre (<< 6b17~pre3-1)
Description: Alternative JVM for OpenJDK, using Zero/Shark
=== modified file 'generate-debian-orig.sh'
--- generate-debian-orig.sh 2015-11-19 21:08:21 +0000
+++ generate-debian-orig.sh 2016-05-06 22:08:18 +0000
@@ -1,15 +1,14 @@
-tarball=openjdk-6-src-b37-11_nov_2015.tar.xz
-version=6b37-1.13.9
-hotspot=hotspot-hs20.tar.gz
+tarball=openjdk-6-src-b39-03_may_2016.tar.xz
+version=6b39-1.13.11
cacaotb=cacao-68fe50ac34ec.tar.gz
jamvmtb=jamvm-2.0.0.tar.gz
base=openjdk-6
pkgdir=$base-$version
origtar=${base}_${version}.orig.tar.gz
-tarballdir=6b37
+tarballdir=6b39
-icedtea_checkout=icedtea6-1.13.9
+icedtea_checkout=icedtea6-1.13.11
debian_checkout=openjdk6
if [ -d $pkgdir ]; then
@@ -39,12 +38,8 @@
mkdir -p $pkgdir.orig
case "$base" in
openjdk*)
- #cp -p $hotspot $pkgdir.orig/
cp -p $tarballdir/$tarball $pkgdir.orig/
- #cp -a $tarballdir/drops $pkgdir.orig/
- #if [ $(lsb_release -is) = Ubuntu ]; then
- cp -p $tarballdir/$cacaotb $pkgdir.orig/
- #fi
+ cp -p $tarballdir/$cacaotb $pkgdir.orig/
cp -p $tarballdir/$jamvmtb $pkgdir.orig/
;;
esac
=== modified file 'icedtea-patch.diff'
--- icedtea-patch.diff 2015-08-01 18:24:41 +0000
+++ icedtea-patch.diff 2016-05-06 22:08:18 +0000
@@ -194,3 +194,45 @@
+ /* JVM_RegisterSignal */
+
+ extern void signalHandler(int sig);
+--- a/patches/ecj/override.patch 2016-05-05 18:08:41.413973050 -0500
++++ b/patches/ecj/override.patch 2016-05-05 18:09:08.488891619 -0500
+@@ -362,3 +362,39 @@
+ public Class<?> run() {
+ try {
+ ReflectUtil.checkPackageAccess(className);
++--- openjdk-ecj.orig/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java 2016-05-05 18:00:08.772655004 -0500
+++++ openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java 2016-05-05 18:02:26.657501472 -0500
++@@ -227,17 +227,14 @@
++ allowedTypes = credentialsTypes;
++ }
++
++- @Override
++ public String getVersion() throws RemoteException {
++ return impl.getVersion();
++ }
++
++- @Override
++ public RMIConnection newClient(Object credentials) throws IOException {
++ return impl.newClient(credentials);
++ }
++
++- @Override
++ public void check(Method method, ObjectStreamClass descriptor,
++ int paramIndex, int callID) {
++
++@@ -247,7 +244,6 @@
++ }
++ }
++
++- @Override
++ public void checkProxyClass(Method method, String[] ifaces,
++ int paramIndex, int callID) {
++ if (ifaces != null && ifaces.length > 0) {
++@@ -259,7 +255,6 @@
++ }
++ }
++
++- @Override
++ public void end(int callID) {
++ /* Do nothing */
++ }
=== added file 'patches/hotspot-disable-arm32-jit.diff'
--- patches/hotspot-disable-arm32-jit.diff 1970-01-01 00:00:00 +0000
+++ patches/hotspot-disable-arm32-jit.diff 2016-05-06 22:08:18 +0000
@@ -0,0 +1,11 @@
+--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -25,7 +25,7 @@
+
+ # Setup common to Zero (non-Shark) and Shark versions of VM
+
+-ifeq ($(ZERO_LIBARCH),arm)
++ifeq ($(ZERO_LIBARCH),armDISABLED)
+
+ Obj_Files += asm_helper.o
+ Obj_Files += cppInterpreter_arm.o
=== modified file 'rules'
--- rules 2015-11-19 21:08:21 +0000
+++ rules 2016-05-06 22:08:18 +0000
@@ -188,8 +188,8 @@
$(error unknown bootstrap method for architecture $(DEB_HOST_ARCH))
endif
-OPENJDK_VERSION = b37
-OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-11_nov_2015.tar.xz
+OPENJDK_VERSION = b39
+OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-03_may_2016.tar.xz
# the version of the build dependency for non-bootstrap builds; only adjust if
# the package is installable on all these architectures.
req_openjdk_bd_ver = 6b27
@@ -280,7 +280,8 @@
with_nss = yes
endif
-ifeq (,$(filter $(distrel), dapper))
+ifneq (,$(filter $(distrel),squeeze wheezy jessie lucid precise trusty vivid wily))
+ # use the timezone files from tzdata-java
with_tzdata = yes
endif
@@ -364,6 +365,7 @@
debian/patches/libpcsclite-dlopen.diff \
debian/patches/m68k-text-relocations.diff \
debian/patches/add-zero-ports.diff \
+ debian/patches/hotspot-disable-arm32-jit.diff \
ifneq (,$(filter $(distrel),squeeze wheezy lucid maverick natty oneiric precise quantal raring))
DISTRIBUTION_PATCHES += \
@@ -963,9 +965,6 @@
-e 's/@jamvm_archs@/$(jamvm_archs)/g' \
-e 's/@hotspot_archs@/$(hotspot_archs)/g' \
-e 's/@altzero_archs@/$(altzero_archs)/g' \
- -e 's,@pkg_version@,$(if $(filter $(distrel),etch dapper edgy feisty gutsy),$${Source-Version},$${binary:Version}),g' \
- -e 's,@pkg_sversion@,$(if $(filter $(distrel),etch dapper edgy feisty gutsy),$${Source-Version},$${source:Version}),g' \
- -e 's/@op@/$(if $(filter Debian,$(distribution)),=,>=)/g' \
-e 's/@lib_arch@/$(p_lib_arch)/g' \
debian/control.in \
$(if $(cacao_archs), debian/control.cacao-jre) \
@@ -1420,7 +1419,7 @@
debian-clean:
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
for f in debian/*.in debian/patches/*.in; do \
f2=$$(echo $$f | sed 's/JB/$(basename)/;s/\.in$$//'); \
case "$$f2" in debian/control) continue; esac; \
@@ -1968,7 +1967,6 @@
ifneq (,$(filter zero, $(alternate_vms)))
$(call install_test_results,zero)
endif
- dh_desktop -s $(nodemo) $(nojrec) $(nojrej) $(nojrez)
# FIXME: desktop and menu files not ready for multiarch. #658321
ifeq (,$(DEB_HOST_MULTIARCH))
dh_installmenu -s $(nodemo) $(nojrec) $(nojrej) $(nojrez)
__
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.
