This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository libhtmlparser-java.
commit cec5e82aefddba5fee21d3e8699cc96060a8f37f Author: Markus Koschany <a...@debian.org> Date: Fri Mar 30 17:13:39 2018 +0200 Add encoding.patch and fix FTBFS with Java 9. Closes: #893243 --- debian/patches/encoding.patch | 92 +++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 93 insertions(+) diff --git a/debian/patches/encoding.patch b/debian/patches/encoding.patch new file mode 100644 index 0000000..a59fac5 --- /dev/null +++ b/debian/patches/encoding.patch @@ -0,0 +1,92 @@ +From: Markus Koschany <a...@debian.org> +Date: Fri, 30 Mar 2018 17:13:19 +0200 +Subject: encoding + +--- + src/build.xml | 27 +++++++++++++++++++-------- + 1 file changed, 19 insertions(+), 8 deletions(-) + +diff --git a/src/build.xml b/src/build.xml +index 2c9ca48..40b9469 100644 +--- a/src/build.xml ++++ b/src/build.xml +@@ -260,12 +260,15 @@ Update the Web Site + + <target name="compile" description="compile all java files"> + <mkdir dir="${classes}"/> +- <javac srcdir="${src}" destdir="${classes}" includes="org/htmlparser/**" excludes="org/htmlparser/tests/**" debug="on" classpath="${classes}" source="1.3"/> ++ <javac srcdir="${src}" destdir="${classes}" includes="org/htmlparser/**" ++ excludes="org/htmlparser/tests/**" debug="on" classpath="${classes}" ++ source="1.7" encoding="iso-8859-1"/> + </target> + + <target name="compilelexer" description="compile lexer java files"> + <mkdir dir="${classes}"/> +- <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="{classes}" target="1.1" source="1.3"> ++ <javac srcdir="${src}" destdir="${classes}" debug="on" ++ classpath="{classes}" target="1.7" source="1.7" encoding="iso-8859-1"> + <include name="org/htmlparser/lexer/*.java"/> + <include name="org/htmlparser/nodes/*.java"/> + <include name="org/htmlparser/Attribute.java"/> +@@ -290,7 +293,8 @@ Update the Web Site + + <target name="compileparser" depends="compilelexer" description="compile parser java files"> + <mkdir dir="${classes}"/> +- <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="{classes}:${sax2.jar}" source="1.3"> ++ <javac srcdir="${src}" destdir="${classes}" debug="on" ++ classpath="{classes}:${sax2.jar}" source="1.7" encoding="iso-8859-1"> + <include name="org/htmlparser/**/*.java"/> + <exclude name="org/htmlparser/tests/**"/> + <exclude name="org/htmlparser/lexerapplications/**/*.java"/> +@@ -371,7 +375,8 @@ Update the Web Site + <!-- Create the lib directory --> + <mkdir dir="${lib}"/> + <mkdir dir="${classes}"/> +- <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmlparser.jar" source="1.5"> ++ <javac srcdir="${src}" destdir="${classes}" debug="on" ++ classpath="${classes}:${lib}/htmlparser.jar" source="1.7" encoding="iso-8859-1"> + <include name="org/htmlparser/lexerapplications/thumbelina/**/*.java"/> + </javac> + <jar jarfile="${lib}/thumbelina.jar" +@@ -390,7 +395,9 @@ Update the Web Site + <!-- Create the lib directory --> + <mkdir dir="${lib}"/> + <mkdir dir="${classes}"/> +- <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmlparser.jar" source="1.3"> ++ <javac srcdir="${src}" destdir="${classes}" debug="on" ++ classpath="${classes}:${lib}/htmlparser.jar" source="1.7" ++ encoding="iso-8859-1"> + <include name="org/htmlparser/parserapplications/filterbuilder/**/*.java"/> + </javac> + <jar jarfile="${lib}/filterbuilder.jar" +@@ -414,7 +421,9 @@ Update the Web Site + <!-- Run the unit tests --> + <target name="test" depends="jar" description="run the JUnit tests"> + <mkdir dir="${classes}"/> +- <javac srcdir="${src}" destdir="${classes}" includes="org/htmlparser/tests/**" debug="on" source="1.3"> ++ <javac srcdir="${src}" destdir="${classes}" ++ includes="org/htmlparser/tests/**" debug="on" source="1.7" ++ encoding="iso-8859-1"> + <classpath> + <pathelement location="${classes}"/> + <pathelement location="${junit.jar}"/> +@@ -437,7 +446,8 @@ Update the Web Site + <!-- Create the javadoc for the project --> + <target name="javadoc" depends="JDK_OK,JDK_Warning,init" description="create JavaDoc (API) documentation"> + <mkdir dir="${classes}"/> +- <javac srcdir="${resources}" includes="HtmlTaglet.java" classpath="${classes}"/> ++ <javac srcdir="${resources}" includes="HtmlTaglet.java" ++ classpath="${classes}" encoding="iso-8859-1"/> + <mkdir dir="${docs}/javadoc"/> + <property name="javadoc.doctitle" value="HTML Parser ${versionNumber}"/> + <property name="javadoc.header" value="<A HREF="http://htmlparser.sourceforge.net" target="_top">HTML Parser Home Page</A>"/> +@@ -482,7 +492,8 @@ Update the Web Site + <!-- Create the javadoc for the project --> + <target name="checkjavadoc" depends="JDK_OK,JDK_Warning,init" description="create JavaDoc (API) documentation"> + <mkdir dir="${classes}"/> +- <javac srcdir="${resources}" includes="HtmlTaglet.java" classpath="${classes}"/> ++ <javac srcdir="${resources}" includes="HtmlTaglet.java" ++ classpath="${classes}" encoding="iso-8859-1"/> + <mkdir dir="${docs}/checkjavadoc"/> + <property name="javadoc.doctitle" value="HTML Parser ${versionNumber}"/> + <property name="javadoc.header" value="<A HREF="http://htmlparser.sourceforge.net" target="_top">HTML Parser Home Page</A>"/> diff --git a/debian/patches/series b/debian/patches/series index ed8de5e..8b336a6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 01_remove_jdk15-dependency.patch 02_adjust_path_in_examples.patch 03_remove-sourceforge-logo-from-javadoc.patch +encoding.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libhtmlparser-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