This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libhtmlparser-java.
commit 7a6abe95c19e1f89a8017818d068122fdb6a6cc8 Author: Tiago Saboga <[email protected]> Date: Sun Feb 21 21:45:52 2010 +0000 libhtmlparser-java (1.6.20060610.dfsg0-4) unstable; urgency=low * Bump debian version (no changes needed). * Change package section (thanks lintian). * Bugfix: debhelper but no misc:Depends (thanks lintian). * Switch to dpkg-source 3.0 (quilt) format * Use openjdk to build package. * Install changelog at the right place. -- Tiago Saboga <[email protected]> Sun, 21 Feb 2010 18:05:15 -0300 --- debian/changelog | 11 +++++ debian/control | 9 ++-- debian/copyright | 19 ++++---- debian/patches/00list | 2 - ...ncy.dpatch => 01_remove_jdk15-dependency.patch} | 14 ++---- ...les.dpatch => 02_adjust_path_in_examples.patch} | 54 ++++++++-------------- debian/patches/series | 2 + debian/rules | 4 +- debian/source/format | 1 + 9 files changed, 55 insertions(+), 61 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0e46777..099dbd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libhtmlparser-java (1.6.20060610.dfsg0-4) unstable; urgency=low + + * Bump debian version (no changes needed). + * Change package section (thanks lintian). + * Bugfix: debhelper but no misc:Depends (thanks lintian). + * Switch to dpkg-source 3.0 (quilt) format + * Use openjdk to build package. + * Install changelog at the right place. + + -- Tiago Saboga <[email protected]> Sun, 21 Feb 2010 18:05:15 -0300 + libhtmlparser-java (1.6.20060610.dfsg0-3) unstable; urgency=low * Remove bashism in debian/rules (brace expansion). (Closes: #477610) diff --git a/debian/control b/debian/control index 4646e94..541e04a 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,16 @@ Source: libhtmlparser-java -Section: libs +Section: java Priority: optional Maintainer: Tiago Saboga <[email protected]> Homepage: http://htmlparser.sourceforge.net/ -Build-Depends: cdbs, debhelper (>= 5), ant, java-gcj-compat-dev, dpatch +Build-Depends: cdbs, debhelper (>= 5), ant, openjdk-6-jdk Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libhtmlparser-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libhtmlparser-java -Standards-Version: 3.7.3 +Standards-Version: 3.8.4 Package: libhtmlparser-java Architecture: all -Depends: java-gcj-compat | java2-runtime +Depends: java-gcj-compat | java2-runtime, ${misc:Depends} Suggests: libhtmlparser-java-doc Description: java library to parse html HTML Parser is a Java library used to parse HTML in either a linear @@ -32,6 +32,7 @@ Description: java library to parse html Package: libhtmlparser-java-doc Section: doc Architecture: all +Depends: ${misc:Depends} Suggests: libhtmlparser-java Description: java library to parse html - doc HTML Parser is a Java library used to parse HTML in either a linear diff --git a/debian/copyright b/debian/copyright index e49d4e4..0eec51b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,12 +12,12 @@ Somik Raha Claude Duguay Ian Macfarlane -Copyright (C) 1997, 2002-2006 Derrick Oswald - (C) 1997 James Gosling - (C) 1997 Kevin A. Smith - (C) 2003-2004 Somik Raha - (C) 2004 Claude Duguay - (C) 2005-2006 Ian Macfarlane +Copyright 1997, 2002-2006 Derrick Oswald + 1997 James Gosling + 1997 Kevin A. Smith + 2003-2004 Somik Raha + 2004 Claude Duguay + 2005-2006 Ian Macfarlane License: @@ -46,7 +46,8 @@ License: [1] - <http://sourceforge.net/mailarchive/forum.php?thread_name=20060917204812.28296.qmail%40web88003.mail.re2.yahoo.com&forum_name=htmlparser-developer> On Debian systems, the complete text of GNU Lesser General Public -License can be found in `/usr/share/common-licenses/LGPL'. +License can be found in `/usr/share/common-licenses/LGPL-2.1'. -The Debian packaging is (C) 2007, Tiago Saboga <[email protected]> -and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +The Debian packaging is Copyright 2007,2010, Tiago Saboga +<[email protected]> and is licensed under the LGPL, version 2.1 or +later. diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 0b00c24..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,2 +0,0 @@ -01_remove_jdk15-dependency -02_adjust_path_in_examples diff --git a/debian/patches/01_remove_jdk15-dependency.dpatch b/debian/patches/01_remove_jdk15-dependency.patch old mode 100755 new mode 100644 similarity index 68% rename from debian/patches/01_remove_jdk15-dependency.dpatch rename to debian/patches/01_remove_jdk15-dependency.patch index 84175d7..39ac45f --- a/debian/patches/01_remove_jdk15-dependency.dpatch +++ b/debian/patches/01_remove_jdk15-dependency.patch @@ -1,13 +1,7 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_remove_jdk15-dependency.dpatch by Tiago Saboga <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad libhtmlparser-java-1.6.20060610~/src/build.xml libhtmlparser-java-1.6.20060610/src/build.xml ---- libhtmlparser-java-1.6.20060610~/src/build.xml 2007-11-06 14:05:31.000000000 -0200 -+++ libhtmlparser-java-1.6.20060610/src/build.xml 2007-11-06 14:06:51.000000000 -0200 +Author: Tiago Saboga <[email protected]> +Description: No description. +--- libhtmlparser-java-1.6.20060610.dfsg0.orig/src/build.xml ++++ libhtmlparser-java-1.6.20060610.dfsg0/src/build.xml @@ -367,11 +367,11 @@ </target> diff --git a/debian/patches/02_adjust_path_in_examples.dpatch b/debian/patches/02_adjust_path_in_examples.patch old mode 100755 new mode 100644 similarity index 80% rename from debian/patches/02_adjust_path_in_examples.dpatch rename to debian/patches/02_adjust_path_in_examples.patch index 18d1d7b..6220f17 --- a/debian/patches/02_adjust_path_in_examples.dpatch +++ b/debian/patches/02_adjust_path_in_examples.patch @@ -1,13 +1,7 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_adjust_path_in_examples.dpatch by Tiago Saboga <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad libhtmlparser-java-1.6.20060610~/bin/beanybaby libhtmlparser-java-1.6.20060610/bin/beanybaby ---- libhtmlparser-java-1.6.20060610~/bin/beanybaby 2007-11-06 14:13:58.000000000 -0200 -+++ libhtmlparser-java-1.6.20060610/bin/beanybaby 2007-11-06 14:14:08.000000000 -0200 +Author: Tiago Saboga <[email protected]> +Description: No description. +--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/beanybaby ++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/beanybaby @@ -1,34 +1,5 @@ #! /bin/sh @@ -60,9 +54,8 @@ diff -urNad libhtmlparser-java-1.6.20060610~/bin/beanybaby libhtmlparser-java-1. fi # handle 1.1x JDKs -diff -urNad libhtmlparser-java-1.6.20060610~/bin/filterbuilder libhtmlparser-java-1.6.20060610/bin/filterbuilder ---- libhtmlparser-java-1.6.20060610~/bin/filterbuilder 2007-11-06 14:13:58.000000000 -0200 -+++ libhtmlparser-java-1.6.20060610/bin/filterbuilder 2007-11-06 14:14:08.000000000 -0200 +--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/filterbuilder ++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/filterbuilder @@ -1,34 +1,5 @@ #! /bin/sh @@ -109,9 +102,8 @@ diff -urNad libhtmlparser-java-1.6.20060610~/bin/filterbuilder libhtmlparser-jav -"$JAVACMD" -Xmx256M -classpath "${HTMLPARSER_LIB}/filterbuilder.jar:${HTMLPARSER_LIB}/htmlparser.jar" org.htmlparser.parserapplications.filterbuilder.FilterBuilder "$@" +"$JAVACMD" -Xmx256M -classpath "${HTMLPARSER_EXLIB}/filterbuilder.jar:${HTMLPARSER_LIB}/libhtmlparser.jar" org.htmlparser.parserapplications.filterbuilder.FilterBuilder "$@" -diff -urNad libhtmlparser-java-1.6.20060610~/bin/lexer libhtmlparser-java-1.6.20060610/bin/lexer ---- libhtmlparser-java-1.6.20060610~/bin/lexer 2007-11-06 14:13:58.000000000 -0200 -+++ libhtmlparser-java-1.6.20060610/bin/lexer 2007-11-06 14:14:21.000000000 -0200 +--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/lexer ++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/lexer @@ -1,34 +1,5 @@ #! /bin/sh @@ -164,9 +156,8 @@ diff -urNad libhtmlparser-java-1.6.20060610~/bin/lexer libhtmlparser-java-1.6.20 fi # handle 1.1x JDKs -diff -urNad libhtmlparser-java-1.6.20060610~/bin/linkextractor libhtmlparser-java-1.6.20060610/bin/linkextractor ---- libhtmlparser-java-1.6.20060610~/bin/linkextractor 2007-11-06 14:13:58.000000000 -0200 -+++ libhtmlparser-java-1.6.20060610/bin/linkextractor 2007-11-06 14:14:08.000000000 -0200 +--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/linkextractor ++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/linkextractor @@ -1,34 +1,5 @@ #! /bin/sh @@ -219,9 +210,8 @@ diff -urNad libhtmlparser-java-1.6.20060610~/bin/linkextractor libhtmlparser-jav fi # handle 1.1x JDKs -diff -urNad libhtmlparser-java-1.6.20060610~/bin/parser libhtmlparser-java-1.6.20060610/bin/parser ---- libhtmlparser-java-1.6.20060610~/bin/parser 2007-11-06 14:13:58.000000000 -0200 -+++ libhtmlparser-java-1.6.20060610/bin/parser 2007-11-06 14:14:08.000000000 -0200 +--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/parser ++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/parser @@ -1,34 +1,5 @@ #! /bin/sh @@ -274,9 +264,8 @@ diff -urNad libhtmlparser-java-1.6.20060610~/bin/parser libhtmlparser-java-1.6.2 fi # handle 1.1x JDKs -diff -urNad libhtmlparser-java-1.6.20060610~/bin/sitecapturer libhtmlparser-java-1.6.20060610/bin/sitecapturer ---- libhtmlparser-java-1.6.20060610~/bin/sitecapturer 2007-11-06 14:13:58.000000000 -0200 -+++ libhtmlparser-java-1.6.20060610/bin/sitecapturer 2007-11-06 14:14:08.000000000 -0200 +--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/sitecapturer ++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/sitecapturer @@ -1,34 +1,5 @@ #! /bin/sh @@ -329,9 +318,8 @@ diff -urNad libhtmlparser-java-1.6.20060610~/bin/sitecapturer libhtmlparser-java fi # handle 1.1x JDKs -diff -urNad libhtmlparser-java-1.6.20060610~/bin/stringextractor libhtmlparser-java-1.6.20060610/bin/stringextractor ---- libhtmlparser-java-1.6.20060610~/bin/stringextractor 2007-11-06 14:13:58.000000000 -0200 -+++ libhtmlparser-java-1.6.20060610/bin/stringextractor 2007-11-06 14:14:08.000000000 -0200 +--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/stringextractor ++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/stringextractor @@ -1,34 +1,5 @@ #! /bin/sh @@ -384,9 +372,8 @@ diff -urNad libhtmlparser-java-1.6.20060610~/bin/stringextractor libhtmlparser-j fi # handle 1.1x JDKs -diff -urNad libhtmlparser-java-1.6.20060610~/bin/thumbelina libhtmlparser-java-1.6.20060610/bin/thumbelina ---- libhtmlparser-java-1.6.20060610~/bin/thumbelina 2007-11-06 14:13:58.000000000 -0200 -+++ libhtmlparser-java-1.6.20060610/bin/thumbelina 2007-11-06 14:14:08.000000000 -0200 +--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/thumbelina ++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/thumbelina @@ -1,34 +1,5 @@ #! /bin/sh @@ -433,9 +420,8 @@ diff -urNad libhtmlparser-java-1.6.20060610~/bin/thumbelina libhtmlparser-java-1 -"$JAVACMD" -Xmx256M -classpath "${HTMLPARSER_LIB}/thumbelina.jar:${HTMLPARSER_LIB}/htmllexer.jar" org.htmlparser.lexerapplications.thumbelina.Thumbelina "$@" +"$JAVACMD" -Xmx256M -classpath "${HTMLPARSER_EXLIB}/thumbelina.jar:${HTMLPARSER_LIB}/libhtmlparser.jar" org.htmlparser.lexerapplications.thumbelina.Thumbelina "$@" -diff -urNad libhtmlparser-java-1.6.20060610~/bin/translate libhtmlparser-java-1.6.20060610/bin/translate ---- libhtmlparser-java-1.6.20060610~/bin/translate 2007-11-06 14:13:58.000000000 -0200 -+++ libhtmlparser-java-1.6.20060610/bin/translate 2007-11-06 14:14:08.000000000 -0200 +--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/translate ++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/translate @@ -1,34 +1,5 @@ #! /bin/sh diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7793734 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +01_remove_jdk15-dependency.patch +02_adjust_path_in_examples.patch diff --git a/debian/rules b/debian/rules index 137a443..2fd650a 100755 --- a/debian/rules +++ b/debian/rules @@ -2,11 +2,11 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/dpatch.mk -JAVA_HOME = /usr/lib/jvm/java-gcj +JAVA_HOME = /usr/lib/jvm/java-6-openjdk DEB_ANT_BUILD_TARGET = jarparser javadoc filterbuilder thumbelina DEB_ANT_BUILDFILE = src/build.xml +DEB_INSTALL_CHANGELOGS_ALL = docs/changes.txt install/libhtmlparser-java:: install -m 644 -D 'src/lib/htmlparser.jar' \ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libhtmlparser-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
