Ubuntu
rhino package

Merge lp:~james-page/ubuntu/natty/rhino/fix-304702 into lp:ubuntu/natty/rhino

  1. Natty (11.04)
  2. fix-304702
  3. Merge into natty
Proposed by James Page
Status: Merged
Merge reported by: Thierry Carrez
Merged at revision: not available
Proposed branch: lp:~james-page/ubuntu/natty/rhino/fix-304702
Merge into: lp:ubuntu/natty/rhino
Diff against target: 38 lines (+9/-3)
3 files modified
debian/ant.properties (+0/-2)
debian/changelog (+8/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~james-page/ubuntu/natty/rhino/fix-304702
Reviewer Review Type Date Requested Status
Thierry Carrez (community) Approve
Ubuntu branches Pending
Review via email: mp+40840@code.launchpad.net

Description of the change

Re-enabled E4X support now that xmlbeans + saxonb are both in main.

To post a comment you must log in.
Revision history for this message
Thierry Carrez (ttx) wrote :

Ack, will upload in a few.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/ant.properties'
2--- debian/ant.properties 2010-09-14 15:41:37 +0000
3+++ debian/ant.properties 2010-11-15 09:31:55 +0000
4@@ -3,5 +3,3 @@
5 # JSR 173 (StAX) in included in JDK 6
6 # Just set property to xmlbeans, to get build system happy
7 jsr173.jar=/usr/share/java/xmlbeans.jar
8-
9-no-e4x=true
10
11=== modified file 'debian/changelog'
12--- debian/changelog 2010-09-14 15:41:37 +0000
13+++ debian/changelog 2010-11-15 09:31:55 +0000
14@@ -1,3 +1,11 @@
15+rhino (1.7R2-4ubuntu2) natty; urgency=low
16+
17+ * Re-enable E4X support (LP: #304702):
18+ - debian/control: Added Build-Depends on libxmlbeans-java
19+ - debian/ant.properties: Remove no-e4x flag
20+
21+ -- James Page <james.page@canonical.com> Mon, 15 Nov 2010 08:51:04 +0000
22+
23 rhino (1.7R2-4ubuntu1) maverick; urgency=low
24
25 * To fix FTBFS, temporarily disabled E4X support as it requires
26
27=== modified file 'debian/control'
28--- debian/control 2010-09-14 15:41:37 +0000
29+++ debian/control 2010-11-15 09:31:55 +0000
30@@ -5,7 +5,7 @@
31 XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
32 Uploaders: Paul Cager <paul-debian@home.paulcager.org>,
33 Marcus Better <marcus@better.se>, Michael Koch <konqueror@gmx.de>, Damien Raude-Morvan <drazzib@debian.org>
34-Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk, quilt, maven-repo-helper
35+Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk, quilt, maven-repo-helper, libxmlbeans-java
36 Standards-Version: 3.8.4
37 Homepage: http://www.mozilla.org/rhino/
38 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/rhino/

Subscribers

People subscribed via source and target branches

to all changes: