[SCM] jedit - Java plugin-based editor for programmers branch, master, updated. debian/4.4.2+dfsg-1-23-g998e08e

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit da04468335bc5f72c4929f5250e8a2b38c71315b
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Fri Jun 15 17:03:14 2012 +0000

    Add patches to disable ivy and use system libs, system docbook.

diff --git a/debian/patches/03systemlibs b/debian/patches/03systemlibs
new file mode 100644
index 0000000..2ffd43d
--- /dev/null
+++ b/debian/patches/03systemlibs
@@ -0,0 +1,46 @@
+Description: Use system libs under /usr/share/java
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+--- a/build.xml
++++ b/build.xml
+@@ -24,7 +24,7 @@
+ 
+ 	<!-- Various Paths -->
+ 	<property name="config.lib.dir"
+-		  value="lib"/>
++		  value="/usr/share/java"/>
+ 	<property name="config.build.dir"
+ 		  value="build"/>
+ 	<property name="config.dist.dir"
+@@ -140,14 +140,14 @@
+ 		<taskdef resource="net/sf/antcontrib/antlib.xml"
+ 			 uri="antlib:net.sf.antcontrib">
+ 			<classpath>
+-				<fileset dir="${lib.dir}/ant-contrib"
+-					 includes="*.jar"/>
++				<fileset dir="${lib.dir}"
++					 includes="ant-contrib.jar"/>
+ 			</classpath>
+ 		</taskdef>
+ 
+ 		<script language="beanshell">
+ 			<classpath>
+-				<fileset dir="${lib.dir}/scripting"
++				<fileset dir="${lib.dir}"
+ 					 includes="*.jar"/>
+ 			</classpath>
+ 
+@@ -422,11 +422,11 @@
+ 				<include name="startup/**"/>
+ 			</fileset>
+ 		</copy>
+-		<copy todir="${jar.location}/jars">
++<!--		<copy todir="${jar.location}/jars">
+ 			<fileset dir="${lib.dir}/default-plugins">
+ 				<exclude name="MacOSX.jar"/>
+ 			</fileset>
+-		</copy>
++		</copy> -->
+ 		<contrib:if>
+ 			<os family="mac"/>
+ 			<contrib:then>
diff --git a/debian/patches/04disableivy b/debian/patches/04disableivy
new file mode 100644
index 0000000..f33397d
--- /dev/null
+++ b/debian/patches/04disableivy
@@ -0,0 +1,14 @@
+Description: Disable ivy initialization
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+--- a/build.xml
++++ b/build.xml
+@@ -122,7 +122,7 @@
+ 
+ 	<target name="retrieve"
+ 		description="retrieve the dependencies"
+-		depends="init,init-ivy"
++		depends="init"
+ 		unless="ivy.done">
+ 		<ivy:retrieve sync="true"/>
+ 		<ivy:retrieve pattern="${lib.dir}/ivy/[artifact]-[revision].[ext]"
diff --git a/debian/patches/05systemdocbook b/debian/patches/05systemdocbook
new file mode 100644
index 0000000..1b7564a
--- /dev/null
+++ b/debian/patches/05systemdocbook
@@ -0,0 +1,68 @@
+Description: Use system docbook.
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+--- a/build.xml
++++ b/build.xml
+@@ -560,7 +560,7 @@
+ 
+ 	<presetdef name="dependset.html">
+ 		<dependset.build>
+-			<srcfileset dir="${lib.dir}/docbook"/>
++<!--			<srcfileset dir="${lib.dir}/docbook"/> -->
+ 			<srcfilelist files="doc/jedithtml.xsl"/>
+ 		</dependset.build>
+ 	</presetdef>
+@@ -568,14 +568,14 @@
+ 	<presetdef name="xslt.doc">
+ 		<xslt>
+ 			<classpath>
+-				<fileset dir="${lib.dir}/docbook"
++				<fileset dir="${lib.dir}"
+ 					 includes="*.jar"/>
+ 			</classpath>
+ 			<xmlcatalog>
+ 				<entity publicid="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"
+-					location="${build.dir}/docbook-xsl/docbook/html/chunk.xsl"/>
++					location="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunk.xsl"/>
+ 				<entity publicid="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"
+-					location="${build.dir}/docbook-xsl/docbook/fo/docbook.xsl"/>
++					location="/usr/share/xml/docbook/stylesheet/docbook-xsl/fo/docbook.xsl"/>
+ 			</xmlcatalog>
+ 			<sysproperty key="javax.xml.parsers.DocumentBuilderFactory"
+ 				     value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
+@@ -587,7 +587,7 @@
+ 	</presetdef>
+ 
+ 	<target name="generate-doc-faq"
+-		depends="init,retrieve,setup,unpack-docbook-xsl">
++		depends="init,retrieve,setup">
+ 		<dependset.html>
+ 			<srcfileset dir="doc/FAQ"/>
+ 			<targetfileset dir="${jar.location}/doc/FAQ"/>
+@@ -611,7 +611,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 @@
+ 	</target>
+ 
+ 	<target name="generate-doc-users-guide"
+-		depends="init,retrieve,setup,unpack-docbook-xsl">
++		depends="init,retrieve,setup">
+ 		<dependset.html>
+ 			<srcfileset dir="doc/users-guide"/>
+ 			<targetfileset dir="${jar.location}/doc/users-guide"/>
+@@ -757,7 +757,7 @@
+ 	</target>
+ 
+ 	<target name="generate-pdf-users-guide"
+-		depends="init,retrieve,setup,unpack-docbook-xsl">
++		depends="init,retrieve,setup">
+ 		<fail message="Please set the property "paper.type""
+ 		      unless="paper.type"/>
+ 		<contrib:switch value="${paper.type}">
diff --git a/debian/patches/series.noauto b/debian/patches/series.noauto
index e0e923e..d93d4fa 100644
--- a/debian/patches/series.noauto
+++ b/debian/patches/series.noauto
@@ -1,3 +1,6 @@
 00bsh-jedit
 01bsh-jedit-asm
 02build.xml
+03systemlibs
+04disableivy
+05systemdocbook

-- 
jedit - Java plugin-based editor for programmers