The following commit has been merged in the master branch:
commit 807df0302886b6d6ec79c4f0c1781fd18c072778
Author: Gabriele Giacone <[email protected]>
Date: Sat Jun 16 09:53:49 2012 +0000
Refresh patches.
diff --git a/debian/patches/02build.xml b/debian/patches/02build.xml
index af70d55..d13671c 100644
--- a/debian/patches/02build.xml
+++ b/debian/patches/02build.xml
@@ -4,9 +4,9 @@ Author: Gabriele Giacone <[email protected]>
--- a/build.xml
+++ b/build.xml
-@@ -233,6 +233,10 @@
- encoding="UTF-8"
- includeAntRuntime="false">
+@@ -234,6 +234,10 @@
+ includes="*.jar"/>
+ </classpath>
<include name="org/**"/>
+ <exclude name="org/gjt/sp/jedit/bsh/servlet/*"/>
+ <exclude name="org/gjt/sp/jedit/bsh/util/*"/>
diff --git a/debian/patches/03systemlibs b/debian/patches/03systemlibs
index 2ffd43d..916ff8d 100644
--- a/debian/patches/03systemlibs
+++ b/debian/patches/03systemlibs
@@ -12,7 +12,7 @@ Author: Gabriele Giacone <[email protected]>
<property name="config.build.dir"
value="build"/>
<property name="config.dist.dir"
-@@ -140,14 +140,14 @@
+@@ -137,14 +137,14 @@
<taskdef resource="net/sf/antcontrib/antlib.xml"
uri="antlib:net.sf.antcontrib">
<classpath>
@@ -30,7 +30,33 @@ Author: Gabriele Giacone <[email protected]>
includes="*.jar"/>
</classpath>
-@@ -422,11 +422,11 @@
+@@ -230,7 +230,7 @@
+ encoding="UTF-8"
+ includeAntRuntime="false">
+ <classpath id="classpath.compile">
+- <fileset dir="${lib.dir}/compile"
++ <fileset dir="${lib.dir}"
+ includes="*.jar"/>
+ </classpath>
+ <include name="org/**"/>
+@@ -245,6 +245,7 @@
+ <target name="compile-test"
+ depends="init,retrieve,compile">
+ <mkdir dir="${classes.dir}/test"/>
++ <mkdir dir="test"/>
+ <depend srcDir="${basedir}/test"
+ destDir="${classes.dir}/test"
+ cache="${classes.dir}"/>
+@@ -265,7 +266,7 @@
+ encoding="UTF-8"
+ includeAntRuntime="false">
+ <classpath id="classpath.test">
+- <fileset dir="${lib.dir}/test"
++ <fileset dir="${lib.dir}"
+ includes="*.jar"/>
+ <pathelement location="${classes.dir}/core"/>
+ </classpath>
+@@ -478,11 +479,11 @@
<include name="startup/**"/>
</fileset>
</copy>
diff --git a/debian/patches/04disableivy b/debian/patches/04disableivy
index f33397d..e84024e 100644
--- a/debian/patches/04disableivy
+++ b/debian/patches/04disableivy
@@ -3,7 +3,7 @@ Author: Gabriele Giacone <[email protected]>
--- a/build.xml
+++ b/build.xml
-@@ -122,7 +122,7 @@
+@@ -119,7 +119,7 @@
<target name="retrieve"
description="retrieve the dependencies"
diff --git a/debian/patches/05systemdocbook b/debian/patches/05systemdocbook
index 1b7564a..8714101 100644
--- a/debian/patches/05systemdocbook
+++ b/debian/patches/05systemdocbook
@@ -3,7 +3,7 @@ Author: Gabriele Giacone <[email protected]>
--- a/build.xml
+++ b/build.xml
-@@ -560,7 +560,7 @@
+@@ -617,7 +617,7 @@
<presetdef name="dependset.html">
<dependset.build>
@@ -12,7 +12,7 @@ Author: Gabriele Giacone <[email protected]>
<srcfilelist files="doc/jedithtml.xsl"/>
</dependset.build>
</presetdef>
-@@ -568,14 +568,14 @@
+@@ -625,14 +625,14 @@
<presetdef name="xslt.doc">
<xslt>
<classpath>
@@ -30,7 +30,7 @@ Author: Gabriele Giacone <[email protected]>
</xmlcatalog>
<sysproperty
key="javax.xml.parsers.DocumentBuilderFactory"
value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
-@@ -587,7 +587,7 @@
+@@ -644,7 +644,7 @@
</presetdef>
<target name="generate-doc-faq"
@@ -39,16 +39,16 @@ Author: Gabriele Giacone <[email protected]>
<dependset.html>
<srcfileset dir="doc/FAQ"/>
<targetfileset dir="${jar.location}/doc/FAQ"/>
-@@ -611,7 +611,7 @@
+@@ -668,7 +668,7 @@
</target>
<target name="generate-doc-news"
- depends="init,retrieve,setup,unpack-docbook-xsl">
+ depends="init,retrieve,setup">
<dependset.html>
- <srcfileset dir="doc/news45"/>
- <targetfileset dir="${jar.location}/doc/news45"/>
-@@ -635,7 +635,7 @@
+ <srcfileset dir="doc/whatsnew"/>
+ <targetfileset dir="${jar.location}/doc/whatsnew"/>
+@@ -692,7 +692,7 @@
</target>
<target name="generate-doc-users-guide"
@@ -57,7 +57,7 @@ Author: Gabriele Giacone <[email protected]>
<dependset.html>
<srcfileset dir="doc/users-guide"/>
<targetfileset dir="${jar.location}/doc/users-guide"/>
-@@ -757,7 +757,7 @@
+@@ -822,7 +822,7 @@
</target>
<target name="generate-pdf-users-guide"
--
jedit - Java plugin-based editor for programmers
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
