Ubuntu
jcc package

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

  1. Oneiric (11.10)
  2. fix-library-linking
  3. Merge into oneiric
Proposed by James Page
Status: Merged
Merged at revision: 16
Proposed branch: lp:~james-page/ubuntu/oneiric/jcc/fix-library-linking
Merge into: lp:ubuntu/oneiric/jcc
Diff against target: 42 lines (+11/-2)
3 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~james-page/ubuntu/oneiric/jcc/fix-library-linking
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+75194@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-07-07 22:03:05 +0000
3+++ debian/changelog 2011-09-13 14:47:23 +0000
4@@ -1,3 +1,11 @@
5+jcc (2.9-1ubuntu1) oneiric; urgency=low
6+
7+ * Link to libjvm.so instead of libjava.so (LP: #848931):
8+ - debian/rules: Switched JCC_LFLAGS -ljava -> -ljvm to pickup
9+ JNI_GetDefaultJavaVMInitArgs symbol directly.
10+
11+ -- James Page <james.page@ubuntu.com> Tue, 13 Sep 2011 15:37:42 +0100
12+
13 jcc (2.9-1) unstable; urgency=low
14
15 * New upstream release.
16
17=== modified file 'debian/control'
18--- debian/control 2011-07-07 22:03:05 +0000
19+++ debian/control 2011-09-13 14:47:23 +0000
20@@ -1,7 +1,8 @@
21 Source: jcc
22 Section: python
23 Priority: extra
24-Maintainer: Ludovico Cavedon <cavedon@debian.org>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: Ludovico Cavedon <cavedon@debian.org>
27 Build-Depends: debhelper (>= 8), python-setuptools (>= 0.6a9),
28 openjdk-6-jdk, python-all-dev
29 Standards-Version: 3.9.2
30
31=== modified file 'debian/rules'
32--- debian/rules 2011-04-14 23:53:06 +0000
33+++ debian/rules 2011-09-13 14:47:23 +0000
34@@ -18,7 +18,7 @@
35 endif
36
37 export JCC_ARGSEP=;
38-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
39+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
40 export JCC_CFLAGS := -fdollars-in-identifiers
41
42 # For shared mode we need patch http://bugs.python.org/setuptools/issue43 for setuptools to be applied

Subscribers

People subscribed via source and target branches

to all changes: