Package: jcc
Version: 2.13-1
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 openjdk-7:
    - d/control: BD on openjdk-7-jdk, switch runtime dependency
      to openjdk-7-jre.
    - d/rules: Switch openjdk-6 paths to openjdk-7 equivalents. 

Ubuntu quantal is transitioning default java to openjdk-7; as jcc
depends directly on so's provided by the java runtime it was not
appropriate to switch it to use the default-jdk/default-jre so this
patch simply transitions jcc to use the later java version.

I've tested this with the latest version of pylucene from Debian unstable.

Note that this patch should not be applied for wheezy - this is definately
a wheezy+1 activity.

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)

iQIcBAEBCAAGBQJQI5J6AAoJEL/srsug59jDhIwQALSrs8qZOTwiQhDbgpVkLyX1
yw7vpls5XnMNeTMhv5gjNflFizJWGeswdAClU01FsfLO5I71YK1fJweJf+Qo76XC
n/TcnuWplgltNqQF8r1ptJgl5cvoXk6Yil2A9tXidGrmIppPzhHd4rvZLxD1Ig5B
AiC+4RrKVLtDWq4QZPu/du8jQ8QBZl5b/OxDtATwg0d2CDum7JYtbrZk9/OU6V3d
pO0pofAKmHVQa5BbsYt3R02TLfvDTz4PEl5HT/y06pftYd9YpjnXZdvjE5aU5wcN
6ehUD7EMaVDEmLElR/iziytbijonsGaHt0gPfe/3gsSB+d3OlbUC7oeD/Eymztyy
bN++3rD7IPhcxUqAkNJ3Ut43sRMCeckxdZsr7vEc2LxzyZv2WQ39075jqaLNG2qY
IYTkHcIy+NYxFNepS221AJuIUvqL88A9aGSFZOjvBLkW59wxS/6B1bTd6FVXJaQl
AFU+2rK31H6TQK5InLFGfVGlmDHV7S5pIZpeEIj4MgzIcKxMzaQU45i2lGNTZuKr
ZWkq5+TrMyCnyT9jLTNtyoJb/LQxbsd3LLqp0Yu/GLyErIR7EiLIfm05Khn4sR1o
QvlcTlKphfohdwrGZwiIR6rpoLIJOxm7fqmBhMk8SQe9oFG3SdQlcANCZKruzvNm
EaqmIBsvqsGGLHL5qXzU
=+cqf
-----END PGP SIGNATURE-----
diff -Nru jcc-2.13/debian/changelog jcc-2.13/debian/changelog
diff -Nru jcc-2.13/debian/control jcc-2.13/debian/control
--- jcc-2.13/debian/control	2012-06-26 06:57:02.000000000 +0100
+++ jcc-2.13/debian/control	2012-08-09 11:32:58.000000000 +0100
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Ludovico Cavedon <cave...@debian.org>
 Build-Depends: debhelper (>= 9), python-setuptools (>= 0.6a9),
-  openjdk-6-jdk (>= 6b23~pre9-1~), python-all-dev
+  openjdk-7-jdk, python-all-dev
 Standards-Version: 3.9.3
 Homepage: http://lucene.apache.org/pylucene/jcc/
 Vcs-Git: git://git.debian.org/git/collab-maint/jcc.git
@@ -12,7 +12,7 @@
 
 Package: jcc
 Architecture: any
-Depends: openjdk-6-jdk (>= 6b23~pre9-1~), ${shlibs:Depends}, ${python:Depends},
+Depends: openjdk-7-jdk, ${shlibs:Depends}, ${python:Depends},
  ${misc:Depends}
 Breaks: ${python:Breaks}
 Description: code generator producing a Python extension from Java classes
diff -Nru jcc-2.13/debian/rules jcc-2.13/debian/rules
--- jcc-2.13/debian/rules	2012-06-26 06:57:02.000000000 +0100
+++ jcc-2.13/debian/rules	2012-08-09 10:22:15.000000000 +0100
@@ -19,13 +19,13 @@
   JAVAARCH :=sh
 endif
 
-JAVA_LIB_PATH := /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH)/jre/lib/$(JAVAARCH)
+JAVA_LIB_PATH := /usr/lib/jvm/java-7-openjdk-$(DEB_HOST_ARCH)/jre/lib/$(JAVAARCH)
 
 export JCC_ARGSEP=;
 export JCC_LFLAGS := -L$(JAVA_LIB_PATH);-ljava;-L$(JAVA_LIB_PATH)/server;-ljvm;-Wl,-rpath=$(JAVA_LIB_PATH):$(JAVA_LIB_PATH)/server
 
 export JCC_CFLAGS := -fdollars-in-identifiers
-export JCC_JDK := /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH)
+export JCC_JDK := /usr/lib/jvm/java-7-openjdk-$(DEB_HOST_ARCH)
 
 # For shared mode we need patch http://bugs.python.org/setuptools/issue43 for setuptools to be applied
 export NO_SHARED=1

Reply via email to