Merge lp:~james-page/ubuntu/oneiric/jcc/fix-library-linking into lp:ubuntu/oneiric/jcc

[James Page]

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-07 22:03:05 +0000
+++ debian/changelog	2011-09-13 14:47:23 +0000
@@ -1,3 +1,11 @@
+jcc (2.9-1ubuntu1) oneiric; urgency=low
+
+  * Link to libjvm.so instead of libjava.so (LP: #848931):
+    - debian/rules: Switched JCC_LFLAGS -ljava -> -ljvm to pickup 
+      JNI_GetDefaultJavaVMInitArgs symbol directly.
+
+ -- James Page <[e-mail]>  Tue, 13 Sep 2011 15:37:42 +0100
+
 jcc (2.9-1) unstable; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2011-07-07 22:03:05 +0000
+++ debian/control	2011-09-13 14:47:23 +0000
@@ -1,7 +1,8 @@
 Source: jcc
 Section: python
 Priority: extra
-Maintainer: Ludovico Cavedon <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Ludovico Cavedon <[e-mail]>
 Build-Depends: debhelper (>= 8), python-setuptools (>= 0.6a9),
   openjdk-6-jdk, python-all-dev
 Standards-Version: 3.9.2
 
=== modified file 'debian/rules'
--- debian/rules	2011-04-14 23:53:06 +0000
+++ debian/rules	2011-09-13 14:47:23 +0000
@@ -18,7 +18,7 @@
 endif
 
 export JCC_ARGSEP=;
-export JCC_LFLAGS := -L/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH);-L/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH)/server;-Wl,-rpath=/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH):/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH)/server;-ljava
+export JCC_LFLAGS := -L/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH);-L/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH)/server;-Wl,-rpath=/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH):/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH)/server;-ljvm
 export JCC_CFLAGS := -fdollars-in-identifiers
 
 # For shared mode we need patch http://bugs.python.org/setuptools/issue43 for setuptools to be applied