[pkg-java] r15542 - trunk/jericho-html/debian
Miguel Landaeta
nomadium-guest at alioth.debian.org
Wed Dec 14 02:33:13 UTC 2011
Author: nomadium-guest
Date: 2011-12-14 02:33:12 +0000 (Wed, 14 Dec 2011)
New Revision: 15542
Added:
trunk/jericho-html/debian/libjericho-html-java-doc.doc-base
trunk/jericho-html/debian/libjericho-html-java-doc.install
Removed:
trunk/jericho-html/debian/doc-base
trunk/jericho-html/debian/docs
Modified:
trunk/jericho-html/debian/ant.properties
trunk/jericho-html/debian/build.xml
trunk/jericho-html/debian/changelog
trunk/jericho-html/debian/control
trunk/jericho-html/debian/rules
Log:
Fix FTBFS with OpenJDK7
Modified: trunk/jericho-html/debian/ant.properties
===================================================================
--- trunk/jericho-html/debian/ant.properties 2011-12-14 00:57:41 UTC (rev 15541)
+++ trunk/jericho-html/debian/ant.properties 2011-12-14 02:33:12 UTC (rev 15542)
@@ -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
Modified: trunk/jericho-html/debian/build.xml
===================================================================
--- trunk/jericho-html/debian/build.xml 2011-12-14 00:57:41 UTC (rev 15541)
+++ trunk/jericho-html/debian/build.xml 2011-12-14 02:33:12 UTC (rev 15542)
@@ -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"
Modified: trunk/jericho-html/debian/changelog
===================================================================
--- trunk/jericho-html/debian/changelog 2011-12-14 00:57:41 UTC (rev 15541)
+++ trunk/jericho-html/debian/changelog 2011-12-14 02:33:12 UTC (rev 15542)
@@ -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 ]
Modified: trunk/jericho-html/debian/control
===================================================================
--- trunk/jericho-html/debian/control 2011-12-14 00:57:41 UTC (rev 15541)
+++ trunk/jericho-html/debian/control 2011-12-14 02:33:12 UTC (rev 15542)
@@ -3,16 +3,16 @@
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 @@
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.
Deleted: trunk/jericho-html/debian/doc-base
===================================================================
--- trunk/jericho-html/debian/doc-base 2011-12-14 00:57:41 UTC (rev 15541)
+++ trunk/jericho-html/debian/doc-base 2011-12-14 02:33:12 UTC (rev 15542)
@@ -1,9 +0,0 @@
-Document: jericho-html
-Title: Debian jericho-html Manual
-Author: Martin Jericho <mart3862 at yahoo.com.au>
-Abstract: User manual for libjericho-html-java.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjericho-html-java/api/index.html
-Files: /usr/share/doc/libjericho-html-java/api/*.html
Deleted: trunk/jericho-html/debian/docs
===================================================================
--- trunk/jericho-html/debian/docs 2011-12-14 00:57:41 UTC (rev 15541)
+++ trunk/jericho-html/debian/docs 2011-12-14 02:33:12 UTC (rev 15542)
@@ -1 +0,0 @@
-doc/api
Copied: trunk/jericho-html/debian/libjericho-html-java-doc.doc-base (from rev 15541, trunk/jericho-html/debian/doc-base)
===================================================================
--- trunk/jericho-html/debian/libjericho-html-java-doc.doc-base (rev 0)
+++ trunk/jericho-html/debian/libjericho-html-java-doc.doc-base 2011-12-14 02:33:12 UTC (rev 15542)
@@ -0,0 +1,9 @@
+Document: jericho-html
+Title: Debian jericho-html Manual
+Author: Martin Jericho <mart3862 at yahoo.com.au>
+Abstract: User manual for libjericho-html-java.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libjericho-html-java/api/index.html
+Files: /usr/share/doc/libjericho-html-java/api/*.html
Copied: trunk/jericho-html/debian/libjericho-html-java-doc.install (from rev 15541, trunk/jericho-html/debian/docs)
===================================================================
--- trunk/jericho-html/debian/libjericho-html-java-doc.install (rev 0)
+++ trunk/jericho-html/debian/libjericho-html-java-doc.install 2011-12-14 02:33:12 UTC (rev 15542)
@@ -0,0 +1 @@
+doc/api usr/share/doc/libjericho-html-java
Modified: trunk/jericho-html/debian/rules
===================================================================
--- trunk/jericho-html/debian/rules 2011-12-14 00:57:41 UTC (rev 15541)
+++ trunk/jericho-html/debian/rules 2011-12-14 02:33:12 UTC (rev 15542)
@@ -9,10 +9,7 @@
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
More information about the pkg-java-commits
mailing list