Package: swi-prolog
Version: 5.10.4-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Transition package to use default java implementation:
- d/control: BD on default-jdk instead of openjdk-6-jdk, switch
primary runtime dependency to default-jre-headless.
- d/p/java-compat.patch: Set source/target = 1.5 to ensure that
backwards compatible bytecode is built.
Ubuntu quantal is transitioning from openjdk-6 to openjdk-7 as default java;
this patch eases the transition and ensures that bytecode built with later
versions of java is backwards compatible.
Note that this is not a release goal for wheezy.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-8-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQIoy4AAoJEL/srsug59jDOVUQAIofxp/yki7UPDO4HQnDWRYG
iY12zpui6OWHh4shOdoOD00Z3TlSF7c3VpF3tRAn06JWuowvWQw46ddhLK/nPwoO
gPhyCDUkJlFjfMFGA+mC3V+hlxgx3VAhVe8M29t72FCWDkCT/yqo5r1OgpNLqh3W
4Cgr859MSjta+AvCRPZ9OYvklLlzVTNploFxvIrdN07HSrqj2TjIljVkHqaU4/xM
LLFh/4ZKYXLFj+sv7kbIZOGTBQi12eITrFuCiQqzACDx4hipBQTzQWLZEY3MS3k5
Z5XxHh/A4oWbZHH68TFwt1VxeM4yZv2+8T4FD48ajound+cwZbtz1pSqwdN36yw0
ZUKWWkt5e4NXMmRHUGaB5ggJotnXCeaxX556kRRrwXJUW2b1lU0Bg6/edJmaiw7S
osZQdIpwEMR4ieC9wI7+VSHSQdO8dH7v4nVUb3KG5h8MKUCWcJe7D/Tsu+n1PZBA
mLx9wkXDu/Aojiff1iAg81WB8qqvGCOcprTqm+QUysd4k977Yg0VbP2wx2B3rGMF
1M9ic++ceai+9bw0HapFsNQaqT/qKvFwXlNS4ZqnW53/4GBo3EXC8JX+IVg9nhY9
X6mRu8dwN5YfPiWsdekb0PytaOploLC2jnYgEbrEIjmoh91BGK2MO3RNjhIs0tnO
DAWOGxFIbbND6neXT7wh
=DzoC
-----END PGP SIGNATURE-----
diff -Nru swi-prolog-5.10.4/debian/changelog swi-prolog-5.10.4/debian/changelog
diff -Nru swi-prolog-5.10.4/debian/control swi-prolog-5.10.4/debian/control
--- swi-prolog-5.10.4/debian/control 2011-12-27 08:35:15.000000000 +0000
+++ swi-prolog-5.10.4/debian/control 2012-08-08 16:53:09.000000000 +0100
@@ -1,8 +1,8 @@
Source: swi-prolog
Section: interpreters
Priority: optional
Maintainer: Євгеній Мещеряков <eu...@debian.org>
-Build-Depends: debhelper (>= 5), autoconf, autotools-dev, libncurses5-dev, libreadline-dev, libgmp-dev, libjpeg-dev, libx11-dev, libxpm-dev, libxt-dev, x11proto-core-dev, chrpath, unixodbc-dev, openjdk-6-jdk [alpha amd64 armel i386 ia64 mips mipsel powerpc s390 sparc], libxft-dev, libxext-dev, libice-dev, libxinerama-dev
+Build-Depends: debhelper (>= 5), autoconf, autotools-dev, libncurses5-dev, libreadline-dev, libgmp-dev, libjpeg-dev, libx11-dev, libxpm-dev, libxt-dev, x11proto-core-dev, chrpath, unixodbc-dev, default-jdk [alpha amd64 armel i386 ia64 mips mipsel powerpc s390 sparc], libxft-dev, libxext-dev, libice-dev, libxinerama-dev
Standards-Version: 3.9.2
XS-Debian-Vcs-Git: git://anonscm.debian.org/collab-maint/swi-prolog.git
XS-Debian-Vcs-Browser: http://anonscm.debian.org/git/collab-maint/swi-prolog.git
@@ -80,7 +79,7 @@
Package: swi-prolog-java
Architecture: alpha amd64 armel i386 ia64 mips mipsel powerpc s390 sparc
Pre-Depends: dpkg (>= 1.15.6)
-Depends: ${shlibs:Depends}, swi-prolog-nox (= ${binary:Version}), ${misc:Depends}, openjdk-6-jre-headless | java2-runtime
+Depends: ${shlibs:Depends}, swi-prolog-nox (= ${binary:Version}), ${misc:Depends}, default-jre-headless | java2-runtime
Description: Bidirectional interface between SWI-Prolog and Java
SWI-Prolog is a fast and powerful ISO/Edinburgh-style Prolog compiler with a
rich set of built-in predicates. It offers a fast, robust and small
diff -Nru swi-prolog-5.10.4/debian/patches/java-compat.patch swi-prolog-5.10.4/debian/patches/java-compat.patch
--- swi-prolog-5.10.4/debian/patches/java-compat.patch 1970-01-01 01:00:00.000000000 +0100
+++ swi-prolog-5.10.4/debian/patches/java-compat.patch 2012-08-08 16:13:43.000000000 +0100
@@ -0,0 +1,17 @@
+Description: Ensure java bytecode is backwards compatible
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: no
+
+Index: swi-prolog-5.10.4/packages/jpl/src/java/Makefile.in
+===================================================================
+--- swi-prolog-5.10.4.orig/packages/jpl/src/java/Makefile.in 2011-02-06 16:04:14.000000000 +0000
++++ swi-prolog-5.10.4/packages/jpl/src/java/Makefile.in 2012-08-08 16:13:06.073871930 +0100
+@@ -4,7 +4,7 @@
+
+ .SUFFIXES: .java .class
+
+-JAVAC=@JAVAC@
++JAVAC=@JAVAC@ -source 1.5 -target 1.5
+ JAR=@JAR@
+ JUNIT=@JUNIT@
+ JAVADOC=@JAVADOC@
diff -Nru swi-prolog-5.10.4/debian/patches/series swi-prolog-5.10.4/debian/patches/series
--- swi-prolog-5.10.4/debian/patches/series 2011-12-15 23:06:47.000000000 +0000
+++ swi-prolog-5.10.4/debian/patches/series 2012-08-08 16:12:28.000000000 +0100
@@ -1 +1,2 @@
swi-prolog-mipsel-FTBFS.diff
+java-compat.patch
