[jericho-html] 11/26: Fix FTBFS with OpenJDK7

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jericho-html.

commit 924265da1f32c24a8fa24492913d1411d3b9d8c8
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Wed Dec 14 02:33:12 2011 +0000

    Fix FTBFS with OpenJDK7
---
 debian/ant.properties                              |  4 ++++
 debian/build.xml                                   |  5 ++++-
 debian/changelog                                   | 18 +++++++++++++++++
 debian/control                                     | 23 +++++++++++++++++-----
 debian/docs                                        |  1 -
 ...{doc-base => libjericho-html-java-doc.doc-base} |  0
 debian/libjericho-html-java-doc.install            |  1 +
 debian/rules                                       |  5 +----
 8 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index 9e4f9a5..c8161f3 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,4 +1,8 @@
 jarfile=jericho-html.jar
 installdir=/usr/share/java
 installdocdir=/usr/share/doc/libjericho-html-java
+# Ensure that source and target are 1.5
+# For backwards compat on Java 7
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
 
diff --git a/debian/build.xml b/debian/build.xml
index a8c8de7..2399008 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -16,7 +16,10 @@
       Use="true"
       packagenames="net.htmlparser.jericho"
       group="Core Package net.htmlparser.jericho"
-      sourcepath="src/java" destdir="doc/api"/>
+      sourcepath="src/java" destdir="doc/api">
+        <link href="/usr/share/doc/default-jdk-doc/api/"
+              packagelistLoc="/usr/share/doc/default-jdk-doc/api/package-list"/>
+    </javadoc>
   </target>
 
   <target name="buildsamples" depends="build"
diff --git a/debian/changelog b/debian/changelog
index df4eefb..e69a217 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+jericho-html (3.1-2) UNRELEASED; urgency=low
+
+  [ Miguel Landaeta ]
+  * Team upload.
+  * Bump Standards-Version to 3.9.2. No changes were required.
+  * Fix Vcs-Svn URL.
+  * Drop unneeded dependency of libjericho-html-java on JREs.
+  * Provide -doc package.
+  * Add Build-Depends on javahelper.
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK7 (LP: #888949) (Closes: #651422):
+    - d/ant.properties: Specify source/target as 1.5 for javac and
+      javadoc ant tasks to ensure backwards compatibility and work
+      around Java 7 encoding errors.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 13 Dec 2011 20:39:17 -0430
+
 jericho-html (3.1-1) unstable; urgency=low
 
   [ Michael Koch ]
diff --git a/debian/control b/debian/control
index 7567118..76a8730 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,16 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk
-Build-Depends-Indep: libslf4j-java, libcommons-logging-java, liblog4j1.2-java 
-Standards-Version: 3.8.3
+Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk, default-jdk-doc
+Build-Depends-Indep: libslf4j-java, libcommons-logging-java, liblog4j1.2-java, javahelper 
+Standards-Version: 3.9.2
 Homepage: http://jerichohtml.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jericho-html/
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/jericho-html
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jericho-html
 
 Package: libjericho-html-java
 Architecture: all
-Depends: default-jre | java1-runtime | java2-runtime, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}
 Description: Java based library for HTML Parsing
  Jericho HTML Parser is a simple but powerful java library allowing
  analysis and manipulation of parts of an HTML document, including
@@ -20,3 +20,16 @@ Description: Java based library for HTML Parsing
  unrecognised or invalid HTML.
  .
  It also provides high-level HTML form manipulation functions.
+
+Package: libjericho-html-java-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: default-jdk-doc, libjericho-html-java
+Description: libjericho-html-java documentation
+ Documentation of Jericho HTML Parser that is a simple but powerful
+ java library allowing analysis and manipulation of parts of an HTML
+ document, including some common server-side tags, while reproducing
+ verbatim any unrecognised or invalid HTML.
+ .
+ This package contains the javadoc pages for libjericho-html-java.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index a37585e..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/api
diff --git a/debian/doc-base b/debian/libjericho-html-java-doc.doc-base
similarity index 100%
rename from debian/doc-base
rename to debian/libjericho-html-java-doc.doc-base
diff --git a/debian/libjericho-html-java-doc.install b/debian/libjericho-html-java-doc.install
new file mode 100644
index 0000000..ffa067f
--- /dev/null
+++ b/debian/libjericho-html-java-doc.install
@@ -0,0 +1 @@
+doc/api  usr/share/doc/libjericho-html-java
diff --git a/debian/rules b/debian/rules
index 3b395f2..b3ac65a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,7 @@ DEB_ANT_BUILD_TARGET   := build doc
 DEB_JARS               := commons-logging log4j-1.2 slf4j-api
 
 install/libjericho-html-java::
-	install -D -m644 jericho-html.jar \
-	  $(DEB_DESTDIR)/usr/share/java/jericho-html-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/jericho-html-$(DEB_UPSTREAM_VERSION).jar \
-	  /usr/share/java/jericho-html.jar
+	jh_installlibs -plibjericho-html-java jericho-html.jar
 
 get-orig-source:
 	uscan --upstream-version 0

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