This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository libjt400-java.
commit 43fc003d54e1622bc9e15831c16f5e6bbedf9c1f
Author: tony mancill <tmanc...@debian.org>
Date: Mon Mar 26 21:49:03 2018 -0700
Combine disable-PDML-runtime patch with updated file_encoding patch
---
debian/patches/disable-PDML-runtime.patch | 38 -------------------------------
debian/patches/file_encoding.patch | 38 +++++++++++++++++++++++++++++++
debian/patches/replace-io-function.patch | 27 ----------------------
debian/patches/series | 3 +--
4 files changed, 39 insertions(+), 67 deletions(-)
diff --git a/debian/patches/disable-PDML-runtime.patch
b/debian/patches/disable-PDML-runtime.patch
deleted file mode 100644
index 8aca1ee..0000000
--- a/debian/patches/disable-PDML-runtime.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Disable PDML runtime, propietary library jui400.jar
- needed and fix compile targets for java6 and java8.
-Origin: upstream,
http://www-912.ibm.com/j_dir/JTOpen.nsf/8178b1c14b1e9b6b8525624f0062fe9f/176869EA087DECFA86257F9400563508?OpenDocument
-Forwarded: no
-Author: Luca Vercelli <luca.vercelli...@gmail.com>
-Last-Update: 2016-06-08
---- a/build.xml
-+++ b/build.xml
-@@ -1291,12 +1291,12 @@
-
<!--///////////////////////////////////////////////////////////////////////////
- // Target: pcml
-
///////////////////////////////////////////////////////////////////////////-->
-- <target name="pcml6" depends="init,compile">
-+ <target name="pcml6" depends="init,compile6">
- <condition property="pcmlRuntimeExists">
- <and>
- <available classname="java.nio.Buffer"/>
- <!-- JDK 1.4 and higher. -->
-- <available
classname="com.ibm.as400.data.ProgramCallDocument"
classpath="${output}:${include}:${source}"/>
-+ <!--available
classname="com.ibm.as400.data.ProgramCallDocument"
classpath="${output}:${include}:${source}"/-->
- </and>
- </condition>
- <fail message="Can't find PCML runtime."
unless="pcmlRuntimeExists"/>
-@@ -1312,12 +1312,12 @@
- Need "source" to find the pcml.dtd. -->
- </target>
-
-- <target name="pcml8" depends="init,compile">
-+ <target name="pcml8" depends="init,compile8">
- <condition property="pcmlRuntimeExists">
- <and>
- <available classname="java.nio.Buffer"/>
- <!-- JDK 1.4 and higher. -->
-- <available
classname="com.ibm.as400.data.ProgramCallDocument"
classpath="${output}:${include}:${source}"/>
-+ <!--available
classname="com.ibm.as400.data.ProgramCallDocument"
classpath="${output}:${include}:${source}"/-->
- </and>
- </condition>
- <fail message="Can't find PCML runtime."
unless="pcmlRuntimeExists"/>
diff --git a/debian/patches/file_encoding.patch
b/debian/patches/file_encoding.patch
new file mode 100644
index 0000000..bc4c9b1
--- /dev/null
+++ b/debian/patches/file_encoding.patch
@@ -0,0 +1,38 @@
+Description: Disable PDML runtime which requires a proprietary library,
+ fix compile targets for java8, specify source/target 8 and file-encoding.
+Origin: upstream,
http://www-912.ibm.com/j_dir/JTOpen.nsf/8178b1c14b1e9b6b8525624f0062fe9f/176869EA087DECFA86257F9400563508?OpenDocument
+Forwarded: no
+Author: Luca Vercelli <luca.vercelli...@gmail.com>,
+ tony mancill <tmanc...@debian.org>
+Last-Update: 2018-03-26
+Index: libjt400-java/build.xml
+===================================================================
+--- libjt400-java.orig/build.xml
++++ libjt400-java/build.xml
+@@ -496,8 +496,9 @@
+ debug="on"
+ debuglevel="lines,source"
+ fork="true"
+- source="5"
+- target="5"
++ source="8"
++ target="8"
++ encoding="iso-8859-1"
+ executable="${jdk18}/bin/javac">
+ <classpath>
+ <pathelement path="${include}"/>
+@@ -1355,12 +1356,12 @@
+ Need "source" to find the pcml.dtd. -->
+ </target>
+
+- <target name="pcml8" depends="init,compile">
++ <target name="pcml8" depends="init,compile8">
+ <condition property="pcmlRuntimeExists">
+ <and>
+ <available classname="java.nio.Buffer"/>
+ <!-- JDK 1.4 and higher. -->
+- <available
classname="com.ibm.as400.data.ProgramCallDocument"
classpath="${output}:${include}:${source}"/>
++ <!-- available
classname="com.ibm.as400.data.ProgramCallDocument"
classpath="${output}:${include}:${source}"/ -->
+ </and>
+ </condition>
+ <fail message="Can't find PCML runtime."
unless="pcmlRuntimeExists"/>
diff --git a/debian/patches/replace-io-function.patch
b/debian/patches/replace-io-function.patch
deleted file mode 100644
index 8be32c9..0000000
--- a/debian/patches/replace-io-function.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Replace deprecated sun.io.MalformedInputException
- java function by java.nio.charset.MalformedInputException
-Forwarded: no
-Author: Julián Moreno Patiño <jul...@debian.org>
-Last-Update: 2016-06-08
---- a/build/Jdbc40Task.java
-+++ b/build/Jdbc40Task.java
-@@ -278,7 +278,7 @@ public class Jdbc40Task extends MatchingTask
-
- if (verbose_) System.out.println("Processed. Time: "+(end-start)+" ms");
- }
-- catch (sun.io.MalformedInputException e) {
-+ catch (java.nio.charset.MalformedInputException e) {
- System.out.println("MalformedInputException processing "+filename+ "
line : "+lineNumber);
- e.printStackTrace();
- Throwable cause = e.getCause();
---- a/build/Jdbc42Task.java
-+++ b/build/Jdbc42Task.java
-@@ -340,7 +340,7 @@ public class Jdbc42Task extends MatchingTask
-
- if (verbose_) System.out.println("Processed. Time: "+(end-start)+" ms");
- }
-- catch (sun.io.MalformedInputException e) {
-+ catch (java.nio.charset.MalformedInputException e) {
- System.out.println("MalformedInputException processing "+filename+ "
line : "+lineNumber);
- e.printStackTrace();
- Throwable cause = e.getCause();
diff --git a/debian/patches/series b/debian/patches/series
index 56e8445..b6c5cba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-disable-PDML-runtime.patch
-replace-io-function.patch
+file_encoding.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/libjt400-java.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
