This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository jedit.
commit ea1cb151bb1be837ef8b3787ebbcac5566fd9ed1 Author: tony mancill <[email protected]> Date: Wed Sep 30 22:50:02 2015 -0700 refresh patches --- debian/patches/02build.xml | 2 +- debian/patches/03systemlibs | 12 ++++++------ debian/patches/04disableivy | 4 ++-- debian/patches/05systemdocbook | 42 ++++-------------------------------------- 4 files changed, 13 insertions(+), 47 deletions(-) diff --git a/debian/patches/02build.xml b/debian/patches/02build.xml index d13671c..ff0adcb 100644 --- a/debian/patches/02build.xml +++ b/debian/patches/02build.xml @@ -4,7 +4,7 @@ Author: Gabriele Giacone <[email protected]> --- a/build.xml +++ b/build.xml -@@ -234,6 +234,10 @@ +@@ -235,6 +235,10 @@ includes="*.jar"/> </classpath> <include name="org/**"/> diff --git a/debian/patches/03systemlibs b/debian/patches/03systemlibs index 3925143..96776b1 100644 --- a/debian/patches/03systemlibs +++ b/debian/patches/03systemlibs @@ -3,7 +3,7 @@ Author: Gabriele Giacone <[email protected]> --- a/build.xml +++ b/build.xml -@@ -24,7 +24,7 @@ +@@ -25,7 +25,7 @@ <!-- Various Paths --> <property name="config.lib.dir" @@ -12,7 +12,7 @@ Author: Gabriele Giacone <[email protected]> <property name="config.build.dir" value="build"/> <property name="config.dist.dir" -@@ -137,14 +137,14 @@ +@@ -138,14 +138,14 @@ <taskdef resource="net/sf/antcontrib/antlib.xml" uri="antlib:net.sf.antcontrib"> <classpath> @@ -30,7 +30,7 @@ Author: Gabriele Giacone <[email protected]> includes="*.jar"/> </classpath> -@@ -230,7 +230,7 @@ +@@ -231,7 +231,7 @@ encoding="UTF-8" includeAntRuntime="false"> <classpath id="classpath.compile"> @@ -39,7 +39,7 @@ Author: Gabriele Giacone <[email protected]> includes="*.jar"/> </classpath> <include name="org/**"/> -@@ -245,6 +245,7 @@ +@@ -246,6 +246,7 @@ <target name="compile-test" depends="init,retrieve,compile"> <mkdir dir="${classes.dir}/test"/> @@ -47,7 +47,7 @@ Author: Gabriele Giacone <[email protected]> <depend srcDir="${basedir}/test" destDir="${classes.dir}/test" cache="${classes.dir}"/> -@@ -265,7 +266,7 @@ +@@ -266,7 +267,7 @@ encoding="UTF-8" includeAntRuntime="false"> <classpath id="classpath.test"> @@ -56,7 +56,7 @@ Author: Gabriele Giacone <[email protected]> includes="*.jar"/> <pathelement location="${classes.dir}/core"/> </classpath> -@@ -494,11 +495,11 @@ +@@ -493,11 +494,11 @@ <include name="startup/**"/> </fileset> </copy> diff --git a/debian/patches/04disableivy b/debian/patches/04disableivy index 9301a57..14cc169 100644 --- a/debian/patches/04disableivy +++ b/debian/patches/04disableivy @@ -3,12 +3,12 @@ Author: Gabriele Giacone <[email protected]> --- a/build.xml +++ b/build.xml -@@ -119,7 +119,7 @@ +@@ -120,7 +120,7 @@ <target name="retrieve" description="retrieve the dependencies" - depends="init,init-ivy" + depends="init" - unless="ivy.done"> + 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 index a7972a2..ee0a8f9 100644 --- a/debian/patches/05systemdocbook +++ b/debian/patches/05systemdocbook @@ -3,7 +3,7 @@ Author: Gabriele Giacone <[email protected]> --- a/build.xml +++ b/build.xml -@@ -633,7 +633,7 @@ +@@ -644,7 +644,7 @@ <presetdef name="dependset.html"> <dependset.build> @@ -12,7 +12,7 @@ Author: Gabriele Giacone <[email protected]> <srcfilelist files="doc/jedithtml.xsl"/> </dependset.build> </presetdef> -@@ -641,14 +641,14 @@ +@@ -652,16 +652,16 @@ <presetdef name="xslt.doc"> <xslt> <classpath> @@ -20,6 +20,8 @@ Author: Gabriele Giacone <[email protected]> + <fileset dir="${lib.dir}" includes="*.jar"/> </classpath> + <!-- ant 1.9 compatibility: explicitly set the processor to Saxon (see bug #3818) --> + <factory name="com.icl.saxon.TransformerFactoryImpl"/> <xmlcatalog> <entity publicid="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"; - location="${build.dir}/docbook-xsl/docbook/html/chunk.xsl"/> @@ -30,39 +32,3 @@ Author: Gabriele Giacone <[email protected]> </xmlcatalog> <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/> -@@ -660,7 +660,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"/> -@@ -684,7 +684,7 @@ - </target> - - <target name="generate-doc-news" -- depends="init,retrieve,setup,unpack-docbook-xsl"> -+ depends="init,retrieve,setup"> - <dependset.html> - <srcfileset dir="doc/whatsnew"/> - <targetfileset dir="${jar.location}/doc/whatsnew"/> -@@ -708,7 +708,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"/> -@@ -843,7 +843,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}"> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jedit.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
