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

[James Page]

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

[Thierry Carrez (ttx)]

Ack, will upload in a few.

review: Approve

=== modified file 'debian/ant.properties'
--- debian/ant.properties	2010-09-14 15:41:37 +0000
+++ debian/ant.properties	2010-11-15 09:31:55 +0000
@@ -3,5 +3,3 @@
 # JSR 173 (StAX) in included in JDK 6
 # Just set property to xmlbeans, to get build system happy
 jsr173.jar=/usr/share/java/xmlbeans.jar
-
-no-e4x=true
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-09-14 15:41:37 +0000
+++ debian/changelog	2010-11-15 09:31:55 +0000
@@ -1,3 +1,11 @@
+rhino (1.7R2-4ubuntu2) natty; urgency=low
+
+  * Re-enable E4X support (LP: #304702):
+    - debian/control: Added Build-Depends on libxmlbeans-java
+    - debian/ant.properties: Remove no-e4x flag 
+
+ -- James Page <[e-mail]>  Mon, 15 Nov 2010 08:51:04 +0000
+
 rhino (1.7R2-4ubuntu1) maverick; urgency=low
 
   * To fix FTBFS, temporarily disabled E4X support as it requires
 
=== modified file 'debian/control'
--- debian/control	2010-09-14 15:41:37 +0000
+++ debian/control	2010-11-15 09:31:55 +0000
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: Paul Cager <[e-mail]>,
   Marcus Better <[e-mail]>, Michael Koch <[e-mail]>, Damien Raude-Morvan <[e-mail]>
-Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk, quilt, maven-repo-helper
+Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk, quilt, maven-repo-helper, libxmlbeans-java
 Standards-Version: 3.8.4
 Homepage: http://www.mozilla.org/rhino/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/rhino/