[jedit] 04/06: freshen patches for 5.1.0 release

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository jedit.

commit 6dab1546f1bdeee801f95a2eadae23943052788e
Author: tony mancill <tmancill at debian.org>
Date:   Sun Oct 20 16:36:51 2013 -0700

    freshen patches for 5.1.0 release
---
 debian/patches/03systemlibs    |    2 +-
 debian/patches/04disableivy    |    2 +-
 debian/patches/05systemdocbook |   12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/03systemlibs b/debian/patches/03systemlibs
index 1c1bd4d..3925143 100644
--- a/debian/patches/03systemlibs
+++ b/debian/patches/03systemlibs
@@ -56,7 +56,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  					 includes="*.jar"/>
  				<pathelement location="${classes.dir}/core"/>
  			</classpath>
-@@ -487,11 +488,11 @@
+@@ -494,11 +495,11 @@
  				<include name="startup/**"/>
  			</fileset>
  		</copy>
diff --git a/debian/patches/04disableivy b/debian/patches/04disableivy
index e84024e..30eb351 100644
--- a/debian/patches/04disableivy
+++ b/debian/patches/04disableivy
@@ -9,6 +9,6 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  		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 b1b511f..a7972a2 100644
--- a/debian/patches/05systemdocbook
+++ b/debian/patches/05systemdocbook
@@ -3,7 +3,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- a/build.xml
 +++ b/build.xml
-@@ -626,7 +626,7 @@
+@@ -633,7 +633,7 @@
  
  	<presetdef name="dependset.html">
  		<dependset.build>
@@ -12,7 +12,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  			<srcfilelist files="doc/jedithtml.xsl"/>
  		</dependset.build>
  	</presetdef>
-@@ -634,14 +634,14 @@
+@@ -641,14 +641,14 @@
  	<presetdef name="xslt.doc">
  		<xslt>
  			<classpath>
@@ -30,7 +30,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  			</xmlcatalog>
  			<sysproperty key="javax.xml.parsers.DocumentBuilderFactory"
  				     value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
-@@ -653,7 +653,7 @@
+@@ -660,7 +660,7 @@
  	</presetdef>
  
  	<target name="generate-doc-faq"
@@ -39,7 +39,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  		<dependset.html>
  			<srcfileset dir="doc/FAQ"/>
  			<targetfileset dir="${jar.location}/doc/FAQ"/>
-@@ -677,7 +677,7 @@
+@@ -684,7 +684,7 @@
  	</target>
  
  	<target name="generate-doc-news"
@@ -48,7 +48,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  		<dependset.html>
  			<srcfileset dir="doc/whatsnew"/>
  			<targetfileset dir="${jar.location}/doc/whatsnew"/>
-@@ -701,7 +701,7 @@
+@@ -708,7 +708,7 @@
  	</target>
  
  	<target name="generate-doc-users-guide"
@@ -57,7 +57,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  		<dependset.html>
  			<srcfileset dir="doc/users-guide"/>
  			<targetfileset dir="${jar.location}/doc/users-guide"/>
-@@ -836,7 +836,7 @@
+@@ -843,7 +843,7 @@
  	</target>
  
  	<target name="generate-pdf-users-guide"

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