[not-yet-commons-ssl] 04/08: freshen build.xml patch for 0.3.15

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository not-yet-commons-ssl.

commit 6524366cad3b77da2ab0eb5f693d7bf2f3d49188
Author: tony mancill <tmancill at debian.org>
Date:   Wed Sep 10 22:53:39 2014 -0700

    freshen build.xml patch for 0.3.15
---
 debian/patches/debianise-build-xml       | 55 --------------------------------
 debian/patches/debianise-build-xml.patch | 46 ++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 55 deletions(-)

diff --git a/debian/patches/debianise-build-xml b/debian/patches/debianise-build-xml
deleted file mode 100644
index 4751c25..0000000
--- a/debian/patches/debianise-build-xml
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: Debianise build.xml
-Author: Matthew Vernon <matthew at debian.org>
-
-Modify build.xml to refer to the system-provided jars.
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- not-yet-commons-ssl-0.3.9.orig/build.xml
-+++ not-yet-commons-ssl-0.3.9/build.xml
-@@ -13,8 +13,8 @@
- -->
- <project name="commons-ssl" default="jar" basedir=".">
- 
--  <property name="httpclient-jar" value="commons-httpclient-3.0.jar"/>
--  <property name="log4j-jar" value="log4j-1.2.13.jar"/>
-+  <property name="httpclient-jar" value="commons-httpclient.jar"/>
-+  <property name="log4j-jar" value="log4j-1.2.jar"/>
-   <property name="src" location="./src/java"/>
-   <property name="build" location="./build"/>
-   <property name="lib" location="./lib"/>
-@@ -22,11 +22,12 @@
-   <property name="jar-file" value="${ant.project.name}.jar"/>
-   <property name="javadocs" value="${build}/javadocs"/>
-   <property name="rmic.includes" value="**/*RMI.class"/>
-+  <property name="debian.java.dir" value="/usr/share/java" />
- 
-   <path id="compile-classpath">
-     <pathelement location="${classes}"/>
--    <pathelement location="${lib}/${httpclient-jar}"/>
--    <pathelement location="${lib}/${log4j-jar}"/>
-+    <pathelement location="${debian.java.dir}/${httpclient-jar}"/>
-+    <pathelement location="${debian.java.dir}/${log4j-jar}"/>
-   </path>
- 
-   <target name="init">
-@@ -100,7 +101,7 @@
-     <delete dir="${build}"/>
-   </target>
- 
--  <target name="all" depends="clean,jar"/>
-+  <target name="all" depends="jar,javadocs"/>
- 
- 
- </project>
diff --git a/debian/patches/debianise-build-xml.patch b/debian/patches/debianise-build-xml.patch
new file mode 100644
index 0000000..27dcf3d
--- /dev/null
+++ b/debian/patches/debianise-build-xml.patch
@@ -0,0 +1,46 @@
+Description: Debianise build.xml
+Author: Matthew Vernon <matthew at debian.org>, tony mancill <tmancill at debian.org>
+
+Modify build.xml to refer to the system-provided jars.
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- a/build.xml
++++ b/build.xml
+@@ -15,7 +15,7 @@
+ 
+   <property name="src" location="./src/java"/>
+   <property name="build" location="./build"/>
+-  <property name="lib" location="./lib"/>
++  <property name="lib" location="/usr/share/java"/>
+   <property name="classes" value="${build}/classes"/>
+   <property name="jar-file" value="${ant.project.name}.jar"/>
+   <property name="javadocs" value="${build}/javadocs"/>
+@@ -27,7 +27,7 @@
+   <property name="test.report.dir" value="${build}/test-report"/>   
+ 
+   <path id="compile-classpath">
+-    <fileset dir="lib">
++    <fileset dir="/usr/share/java">
+       <include name="*.jar"/>
+     </fileset>
+     <pathelement location="."/>    
+@@ -43,6 +43,7 @@
+       debug="true"
+       optimize="false"
+       srcdir="${test-src}"
++      encoding="UTF-8"
+     >
+       <classpath refid="compile-classpath"/>
+     </javac>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/not-yet-commons-ssl.git