[libjxp-java] 02/02: Fixed an IOException (Too many open files) during the build

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libjxp-java.

commit 5fa3a518be7a4bdc1846cc43a28bf0e742a4bb7e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 12 15:26:29 2014 +0200

    Fixed an IOException (Too many open files) during the build
---
 debian/changelog                 |  2 ++
 debian/patches/debian-libs.patch | 35 -----------------------------------
 debian/patches/fix-javadoc.patch |  2 +-
 debian/patches/series            |  1 -
 debian/rules                     |  7 +++++++
 5 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 901caee..31ab6f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libjxp-java (1.6.1-5) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed an IOException (Too many open files) during the build
+    (debian-libs.patch caused Ant to load all the jars in /usr/share/java)
   * Switch to debhelper level 9
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 12 May 2014 14:12:53 +0200
diff --git a/debian/patches/debian-libs.patch b/debian/patches/debian-libs.patch
deleted file mode 100644
index 4622c3e..0000000
--- a/debian/patches/debian-libs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: use Debian libraries
-Forwarded: no
-Author: gregor herrmann <gregoa at debian.org>
-origin: vendor
-Last-Update: 2012-04-18
-
---- a/build.xml
-+++ b/build.xml
-@@ -6,7 +6,7 @@
- <project default="jar" name="jxp" basedir=".">
-   <property name="defaulttargetdir" value="target">
-   </property>
--  <property name="libdir" value="target/lib">
-+  <property name="libdir" value="/usr/share/java">
-   </property>
-   <property name="classesdir" value="target/classes">
-   </property>
-@@ -29,8 +29,10 @@
-     </fileset>
-   </path>
-   <target name="init" description="o Initializes some properties">
-+    <!--
-     <mkdir dir="${libdir}">
-     </mkdir>
-+    -->
-     <condition property="noget">
-       <equals arg2="only" arg1="${build.sysclasspath}">
-       </equals>
-@@ -173,4 +175,4 @@
-     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-     </unjar>
-   </target>
--</project>
-\ No newline at end of file
-+</project>
diff --git a/debian/patches/fix-javadoc.patch b/debian/patches/fix-javadoc.patch
index 8ebf5af..e839ed1 100644
--- a/debian/patches/fix-javadoc.patch
+++ b/debian/patches/fix-javadoc.patch
@@ -6,7 +6,7 @@ Last-Update: 2012-04-18
 
 --- a/build.xml
 +++ b/build.xml
-@@ -144,7 +144,7 @@
+@@ -142,7 +142,7 @@
      </property>
      <property name="title" value="jxp 1.6.1 API">
      </property>
diff --git a/debian/patches/series b/debian/patches/series
index 3a34cef..a7f227e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-debian-libs.patch
 fix-test.patch
 fix-javadoc.patch
diff --git a/debian/rules b/debian/rules
index 72ea161..c54602e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,4 +7,11 @@ export ANT_OPTS=-Dnoget=true
 	dh $@
 
 override_dh_auto_build:
+	# Link the required libraries with the ones available in Debian
+	mkdir -p target/lib
+	ln -s /usr/share/java/servlet-api-3.0.jar target/lib/servlet-api.jar
+	ln -s /usr/share/java/commons-java.jar target/lib/commons-java.jar
+	ln -s /usr/share/java/commons-invoke.jar target/lib/commons-invoke.jar
+	ln -s /usr/share/java/commons-fileupload.jar target/lib/commons-fileupload.jar
+
 	DISPLAY="" dh_auto_build -- jar javadoc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjxp-java.git