[pkg-java] r11676 - in trunk/libhtmlparser-java/debian: . patches source
Tiago Saboga
tiagosab-guest at alioth.debian.org
Sun Feb 21 21:45:53 UTC 2010
Author: tiagosab-guest
Date: 2010-02-21 21:45:52 +0000 (Sun, 21 Feb 2010)
New Revision: 11676
Added:
trunk/libhtmlparser-java/debian/patches/01_remove_jdk15-dependency.patch
trunk/libhtmlparser-java/debian/patches/02_adjust_path_in_examples.patch
trunk/libhtmlparser-java/debian/patches/series
trunk/libhtmlparser-java/debian/source/
trunk/libhtmlparser-java/debian/source/format
Removed:
trunk/libhtmlparser-java/debian/patches/00list
trunk/libhtmlparser-java/debian/patches/01_remove_jdk15-dependency.dpatch
trunk/libhtmlparser-java/debian/patches/02_adjust_path_in_examples.dpatch
Modified:
trunk/libhtmlparser-java/debian/changelog
trunk/libhtmlparser-java/debian/control
trunk/libhtmlparser-java/debian/copyright
trunk/libhtmlparser-java/debian/rules
Log:
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 <tiagosaboga at gmail.com> Sun, 21 Feb 2010 18:05:15 -0300
Modified: trunk/libhtmlparser-java/debian/changelog
===================================================================
--- trunk/libhtmlparser-java/debian/changelog 2010-02-21 21:37:32 UTC (rev 11675)
+++ trunk/libhtmlparser-java/debian/changelog 2010-02-21 21:45:52 UTC (rev 11676)
@@ -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 <tiagosaboga at gmail.com> 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)
Modified: trunk/libhtmlparser-java/debian/control
===================================================================
--- trunk/libhtmlparser-java/debian/control 2010-02-21 21:37:32 UTC (rev 11675)
+++ trunk/libhtmlparser-java/debian/control 2010-02-21 21:45:52 UTC (rev 11676)
@@ -1,16 +1,16 @@
Source: libhtmlparser-java
-Section: libs
+Section: java
Priority: optional
Maintainer: Tiago Saboga <tiagosaboga at gmail.com>
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 @@
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
Modified: trunk/libhtmlparser-java/debian/copyright
===================================================================
--- trunk/libhtmlparser-java/debian/copyright 2010-02-21 21:37:32 UTC (rev 11675)
+++ trunk/libhtmlparser-java/debian/copyright 2010-02-21 21:45:52 UTC (rev 11676)
@@ -12,12 +12,12 @@
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 @@
[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 <tiagosaboga at gmail.com>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is Copyright 2007,2010, Tiago Saboga
+<tiagosaboga at gmail.com> and is licensed under the LGPL, version 2.1 or
+later.
Deleted: trunk/libhtmlparser-java/debian/patches/00list
===================================================================
--- trunk/libhtmlparser-java/debian/patches/00list 2010-02-21 21:37:32 UTC (rev 11675)
+++ trunk/libhtmlparser-java/debian/patches/00list 2010-02-21 21:45:52 UTC (rev 11676)
@@ -1,2 +0,0 @@
-01_remove_jdk15-dependency
-02_adjust_path_in_examples
Deleted: trunk/libhtmlparser-java/debian/patches/01_remove_jdk15-dependency.dpatch
===================================================================
--- trunk/libhtmlparser-java/debian/patches/01_remove_jdk15-dependency.dpatch 2010-02-21 21:37:32 UTC (rev 11675)
+++ trunk/libhtmlparser-java/debian/patches/01_remove_jdk15-dependency.dpatch 2010-02-21 21:45:52 UTC (rev 11676)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_remove_jdk15-dependency.dpatch by Tiago Saboga <tiagosaboga at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at 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
-@@ -367,11 +367,11 @@
- </target>
-
- <!-- Create the Thumbelina jar -->
-- <target name="thumbelina" depends="JDK_OK,jarlexer" description="create thumbelina.jar" if="JDK1.5">
-+ <target name="thumbelina" depends="JDK_OK,jarparser" description="create thumbelina.jar">
- <!-- Create the lib directory -->
- <mkdir dir="${lib}"/>
- <mkdir dir="${classes}"/>
-- <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmllexer.jar" source="1.5">
-+ <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmlparser.jar" source="1.5">
- <include name="org/htmlparser/lexerapplications/thumbelina/**/*.java"/>
- </javac>
- <jar jarfile="${lib}/thumbelina.jar"
-@@ -386,7 +386,7 @@
- </target>
-
- <!-- Create the FilterBuilder jar -->
-- <target name="filterbuilder" depends="JDK_OK,jarparser" description="create filterbuilder.jar" if="JDK1.4">
-+ <target name="filterbuilder" depends="JDK_OK,jarparser" description="create filterbuilder.jar">
- <!-- Create the lib directory -->
- <mkdir dir="${lib}"/>
- <mkdir dir="${classes}"/>
Added: trunk/libhtmlparser-java/debian/patches/01_remove_jdk15-dependency.patch
===================================================================
--- trunk/libhtmlparser-java/debian/patches/01_remove_jdk15-dependency.patch (rev 0)
+++ trunk/libhtmlparser-java/debian/patches/01_remove_jdk15-dependency.patch 2010-02-21 21:45:52 UTC (rev 11676)
@@ -0,0 +1,27 @@
+Author: Tiago Saboga <tiagosaboga at gmail.com>
+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>
+
+ <!-- Create the Thumbelina jar -->
+- <target name="thumbelina" depends="JDK_OK,jarlexer" description="create thumbelina.jar" if="JDK1.5">
++ <target name="thumbelina" depends="JDK_OK,jarparser" description="create thumbelina.jar">
+ <!-- Create the lib directory -->
+ <mkdir dir="${lib}"/>
+ <mkdir dir="${classes}"/>
+- <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmllexer.jar" source="1.5">
++ <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmlparser.jar" source="1.5">
+ <include name="org/htmlparser/lexerapplications/thumbelina/**/*.java"/>
+ </javac>
+ <jar jarfile="${lib}/thumbelina.jar"
+@@ -386,7 +386,7 @@
+ </target>
+
+ <!-- Create the FilterBuilder jar -->
+- <target name="filterbuilder" depends="JDK_OK,jarparser" description="create filterbuilder.jar" if="JDK1.4">
++ <target name="filterbuilder" depends="JDK_OK,jarparser" description="create filterbuilder.jar">
+ <!-- Create the lib directory -->
+ <mkdir dir="${lib}"/>
+ <mkdir dir="${classes}"/>
Deleted: trunk/libhtmlparser-java/debian/patches/02_adjust_path_in_examples.dpatch
===================================================================
--- trunk/libhtmlparser-java/debian/patches/02_adjust_path_in_examples.dpatch 2010-02-21 21:37:32 UTC (rev 11675)
+++ trunk/libhtmlparser-java/debian/patches/02_adjust_path_in_examples.dpatch 2010-02-21 21:45:52 UTC (rev 11676)
@@ -1,490 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_adjust_path_in_examples.dpatch by Tiago Saboga <tiagosaboga at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at 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
-@@ -1,34 +1,5 @@
- #! /bin/sh
-
--if [ -z "$HTMLPARSER_HOME" ] ; then
--
-- ## resolve links - $0 may be a link to the home
-- PRG="$0"
-- progname=`basename "$0"`
-- saveddir=`pwd`
--
-- # need this for relative symlinks
-- dirname_prg=`dirname "$PRG"`
-- cd "$dirname_prg"
--
-- while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '/.*' > /dev/null; then
-- PRG="$link"
-- else
-- PRG=`dirname "$PRG"`"/$link"
-- fi
-- done
--
-- HTMLPARSER_HOME=`dirname "$PRG"`/..
--
-- cd "$saveddir"
--
-- # make it fully qualified
-- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
--fi
--
- if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-@@ -55,13 +26,13 @@
- LOCALCLASSPATH="$CLASSPATH"
- fi
-
--HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
-+HTMLPARSER_LIB="/usr/share/java"
-
- # add in the parser .jar file
- if [ -z "$LOCALCLASSPATH" ] ; then
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
- else
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar":"$LOCALCLASSPATH"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
- 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
-@@ -1,34 +1,5 @@
- #! /bin/sh
-
--if [ -z "$HTMLPARSER_HOME" ] ; then
--
-- ## resolve links - $0 may be a link to the home
-- PRG="$0"
-- progname=`basename "$0"`
-- saveddir=`pwd`
--
-- # need this for relative symlinks
-- dirname_prg=`dirname "$PRG"`
-- cd "$dirname_prg"
--
-- while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '/.*' > /dev/null; then
-- PRG="$link"
-- else
-- PRG=`dirname "$PRG"`"/$link"
-- fi
-- done
--
-- HTMLPARSER_HOME=`dirname "$PRG"`/..
--
-- cd "$saveddir"
--
-- # make it fully qualified
-- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
--fi
--
- if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-@@ -51,7 +22,8 @@
- exit 1
- fi
-
--HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
-+HTMLPARSER_LIB="/usr/share/java"
-+HTMLPARSER_EXLIB="/usr/share/doc/libhtmlparser-java/examples/lib"
-
--"$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
-@@ -1,34 +1,5 @@
- #! /bin/sh
-
--if [ -z "$HTMLPARSER_HOME" ] ; then
--
-- ## resolve links - $0 may be a link to the home
-- PRG="$0"
-- progname=`basename "$0"`
-- saveddir=`pwd`
--
-- # need this for relative symlinks
-- dirname_prg=`dirname "$PRG"`
-- cd "$dirname_prg"
--
-- while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '/.*' > /dev/null; then
-- PRG="$link"
-- else
-- PRG=`dirname "$PRG"`"/$link"
-- fi
-- done
--
-- HTMLPARSER_HOME=`dirname "$PRG"`/..
--
-- cd "$saveddir"
--
-- # make it fully qualified
-- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
--fi
--
- if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-@@ -55,13 +26,13 @@
- LOCALCLASSPATH="$CLASSPATH"
- fi
-
--HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
-+HTMLPARSER_LIB="/usr/share/java"
-
- # add in the lexer .jar file
- if [ -z "$LOCALCLASSPATH" ] ; then
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmllexer.jar"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
- else
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmllexer.jar":"$LOCALCLASSPATH"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
- 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
-@@ -1,34 +1,5 @@
- #! /bin/sh
-
--if [ -z "$HTMLPARSER_HOME" ] ; then
--
-- ## resolve links - $0 may be a link to the home
-- PRG="$0"
-- progname=`basename "$0"`
-- saveddir=`pwd`
--
-- # need this for relative symlinks
-- dirname_prg=`dirname "$PRG"`
-- cd "$dirname_prg"
--
-- while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '/.*' > /dev/null; then
-- PRG="$link"
-- else
-- PRG=`dirname "$PRG"`"/$link"
-- fi
-- done
--
-- HTMLPARSER_HOME=`dirname "$PRG"`/..
--
-- cd "$saveddir"
--
-- # make it fully qualified
-- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
--fi
--
- if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-@@ -55,13 +26,13 @@
- LOCALCLASSPATH="$CLASSPATH"
- fi
-
--HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
-+HTMLPARSER_LIB="/usr/share/java"
-
- # add in the parser .jar file
- if [ -z "$LOCALCLASSPATH" ] ; then
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
- else
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar":"$LOCALCLASSPATH"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
- 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
-@@ -1,34 +1,5 @@
- #! /bin/sh
-
--if [ -z "$HTMLPARSER_HOME" ] ; then
--
-- ## resolve links - $0 may be a link to the home
-- PRG="$0"
-- progname=`basename "$0"`
-- saveddir=`pwd`
--
-- # need this for relative symlinks
-- dirname_prg=`dirname "$PRG"`
-- cd "$dirname_prg"
--
-- while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '/.*' > /dev/null; then
-- PRG="$link"
-- else
-- PRG=`dirname "$PRG"`"/$link"
-- fi
-- done
--
-- HTMLPARSER_HOME=`dirname "$PRG"`/..
--
-- cd "$saveddir"
--
-- # make it fully qualified
-- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
--fi
--
- if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-@@ -55,13 +26,13 @@
- LOCALCLASSPATH="$CLASSPATH"
- fi
-
--HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
-+HTMLPARSER_LIB="/usr/share/java"
-
- # add in the parser .jar file
- if [ -z "$LOCALCLASSPATH" ] ; then
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
- else
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar":"$LOCALCLASSPATH"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
- 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
-@@ -1,34 +1,5 @@
- #! /bin/sh
-
--if [ -z "$HTMLPARSER_HOME" ] ; then
--
-- ## resolve links - $0 may be a link to the home
-- PRG="$0"
-- progname=`basename "$0"`
-- saveddir=`pwd`
--
-- # need this for relative symlinks
-- dirname_prg=`dirname "$PRG"`
-- cd "$dirname_prg"
--
-- while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '/.*' > /dev/null; then
-- PRG="$link"
-- else
-- PRG=`dirname "$PRG"`"/$link"
-- fi
-- done
--
-- HTMLPARSER_HOME=`dirname "$PRG"`/..
--
-- cd "$saveddir"
--
-- # make it fully qualified
-- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
--fi
--
- if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-@@ -55,13 +26,13 @@
- LOCALCLASSPATH="$CLASSPATH"
- fi
-
--HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
-+HTMLPARSER_LIB="/usr/share/java"
-
- # add in the parser .jar file
- if [ -z "$LOCALCLASSPATH" ] ; then
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
- else
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar":"$LOCALCLASSPATH"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
- 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
-@@ -1,34 +1,5 @@
- #! /bin/sh
-
--if [ -z "$HTMLPARSER_HOME" ] ; then
--
-- ## resolve links - $0 may be a link to the home
-- PRG="$0"
-- progname=`basename "$0"`
-- saveddir=`pwd`
--
-- # need this for relative symlinks
-- dirname_prg=`dirname "$PRG"`
-- cd "$dirname_prg"
--
-- while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '/.*' > /dev/null; then
-- PRG="$link"
-- else
-- PRG=`dirname "$PRG"`"/$link"
-- fi
-- done
--
-- HTMLPARSER_HOME=`dirname "$PRG"`/..
--
-- cd "$saveddir"
--
-- # make it fully qualified
-- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
--fi
--
- if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-@@ -55,13 +26,13 @@
- LOCALCLASSPATH="$CLASSPATH"
- fi
-
--HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
-+HTMLPARSER_LIB="/usr/share/java"
-
- # add in the parser .jar file
- if [ -z "$LOCALCLASSPATH" ] ; then
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
- else
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar":"$LOCALCLASSPATH"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
- 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
-@@ -1,34 +1,5 @@
- #! /bin/sh
-
--if [ -z "$HTMLPARSER_HOME" ] ; then
--
-- ## resolve links - $0 may be a link to the home
-- PRG="$0"
-- progname=`basename "$0"`
-- saveddir=`pwd`
--
-- # need this for relative symlinks
-- dirname_prg=`dirname "$PRG"`
-- cd "$dirname_prg"
--
-- while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '/.*' > /dev/null; then
-- PRG="$link"
-- else
-- PRG=`dirname "$PRG"`"/$link"
-- fi
-- done
--
-- HTMLPARSER_HOME=`dirname "$PRG"`/..
--
-- cd "$saveddir"
--
-- # make it fully qualified
-- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
--fi
--
- if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-@@ -51,7 +22,8 @@
- exit 1
- fi
-
--HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
-+HTMLPARSER_LIB="/usr/share/java"
-+HTMLPARSER_EXLIB="/usr/share/doc/libhtmlparser-java/examples/lib"
-
--"$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
-@@ -1,34 +1,5 @@
- #! /bin/sh
-
--if [ -z "$HTMLPARSER_HOME" ] ; then
--
-- ## resolve links - $0 may be a link to the home
-- PRG="$0"
-- progname=`basename "$0"`
-- saveddir=`pwd`
--
-- # need this for relative symlinks
-- dirname_prg=`dirname "$PRG"`
-- cd "$dirname_prg"
--
-- while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '/.*' > /dev/null; then
-- PRG="$link"
-- else
-- PRG=`dirname "$PRG"`"/$link"
-- fi
-- done
--
-- HTMLPARSER_HOME=`dirname "$PRG"`/..
--
-- cd "$saveddir"
--
-- # make it fully qualified
-- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
--fi
--
- if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-@@ -55,13 +26,13 @@
- LOCALCLASSPATH="$CLASSPATH"
- fi
-
--HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
-+HTMLPARSER_LIB="/usr/share/java"
-
- # add in the parser .jar file
- if [ -z "$LOCALCLASSPATH" ] ; then
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
- else
-- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar":"$LOCALCLASSPATH"
-+ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
- fi
-
- # handle 1.1x JDKs
Added: trunk/libhtmlparser-java/debian/patches/02_adjust_path_in_examples.patch
===================================================================
--- trunk/libhtmlparser-java/debian/patches/02_adjust_path_in_examples.patch (rev 0)
+++ trunk/libhtmlparser-java/debian/patches/02_adjust_path_in_examples.patch 2010-02-21 21:45:52 UTC (rev 11676)
@@ -0,0 +1,476 @@
+Author: Tiago Saboga <tiagosaboga at gmail.com>
+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
+
+-if [ -z "$HTMLPARSER_HOME" ] ; then
+-
+- ## resolve links - $0 may be a link to the home
+- PRG="$0"
+- progname=`basename "$0"`
+- saveddir=`pwd`
+-
+- # need this for relative symlinks
+- dirname_prg=`dirname "$PRG"`
+- cd "$dirname_prg"
+-
+- while [ -h "$PRG" ] ; do
+- ls=`ls -ld "$PRG"`
+- link=`expr "$ls" : '.*-> \(.*\)$'`
+- if expr "$link" : '/.*' > /dev/null; then
+- PRG="$link"
+- else
+- PRG=`dirname "$PRG"`"/$link"
+- fi
+- done
+-
+- HTMLPARSER_HOME=`dirname "$PRG"`/..
+-
+- cd "$saveddir"
+-
+- # make it fully qualified
+- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
+-fi
+-
+ if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+@@ -55,13 +26,13 @@
+ LOCALCLASSPATH="$CLASSPATH"
+ fi
+
+-HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
++HTMLPARSER_LIB="/usr/share/java"
+
+ # add in the parser .jar file
+ if [ -z "$LOCALCLASSPATH" ] ; then
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
+ else
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar":"$LOCALCLASSPATH"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
+ fi
+
+ # handle 1.1x JDKs
+--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/filterbuilder
++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/filterbuilder
+@@ -1,34 +1,5 @@
+ #! /bin/sh
+
+-if [ -z "$HTMLPARSER_HOME" ] ; then
+-
+- ## resolve links - $0 may be a link to the home
+- PRG="$0"
+- progname=`basename "$0"`
+- saveddir=`pwd`
+-
+- # need this for relative symlinks
+- dirname_prg=`dirname "$PRG"`
+- cd "$dirname_prg"
+-
+- while [ -h "$PRG" ] ; do
+- ls=`ls -ld "$PRG"`
+- link=`expr "$ls" : '.*-> \(.*\)$'`
+- if expr "$link" : '/.*' > /dev/null; then
+- PRG="$link"
+- else
+- PRG=`dirname "$PRG"`"/$link"
+- fi
+- done
+-
+- HTMLPARSER_HOME=`dirname "$PRG"`/..
+-
+- cd "$saveddir"
+-
+- # make it fully qualified
+- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
+-fi
+-
+ if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+@@ -51,7 +22,8 @@
+ exit 1
+ fi
+
+-HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
++HTMLPARSER_LIB="/usr/share/java"
++HTMLPARSER_EXLIB="/usr/share/doc/libhtmlparser-java/examples/lib"
+
+-"$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 "$@"
+
+--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/lexer
++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/lexer
+@@ -1,34 +1,5 @@
+ #! /bin/sh
+
+-if [ -z "$HTMLPARSER_HOME" ] ; then
+-
+- ## resolve links - $0 may be a link to the home
+- PRG="$0"
+- progname=`basename "$0"`
+- saveddir=`pwd`
+-
+- # need this for relative symlinks
+- dirname_prg=`dirname "$PRG"`
+- cd "$dirname_prg"
+-
+- while [ -h "$PRG" ] ; do
+- ls=`ls -ld "$PRG"`
+- link=`expr "$ls" : '.*-> \(.*\)$'`
+- if expr "$link" : '/.*' > /dev/null; then
+- PRG="$link"
+- else
+- PRG=`dirname "$PRG"`"/$link"
+- fi
+- done
+-
+- HTMLPARSER_HOME=`dirname "$PRG"`/..
+-
+- cd "$saveddir"
+-
+- # make it fully qualified
+- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
+-fi
+-
+ if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+@@ -55,13 +26,13 @@
+ LOCALCLASSPATH="$CLASSPATH"
+ fi
+
+-HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
++HTMLPARSER_LIB="/usr/share/java"
+
+ # add in the lexer .jar file
+ if [ -z "$LOCALCLASSPATH" ] ; then
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmllexer.jar"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
+ else
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmllexer.jar":"$LOCALCLASSPATH"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
+ fi
+
+ # handle 1.1x JDKs
+--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/linkextractor
++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/linkextractor
+@@ -1,34 +1,5 @@
+ #! /bin/sh
+
+-if [ -z "$HTMLPARSER_HOME" ] ; then
+-
+- ## resolve links - $0 may be a link to the home
+- PRG="$0"
+- progname=`basename "$0"`
+- saveddir=`pwd`
+-
+- # need this for relative symlinks
+- dirname_prg=`dirname "$PRG"`
+- cd "$dirname_prg"
+-
+- while [ -h "$PRG" ] ; do
+- ls=`ls -ld "$PRG"`
+- link=`expr "$ls" : '.*-> \(.*\)$'`
+- if expr "$link" : '/.*' > /dev/null; then
+- PRG="$link"
+- else
+- PRG=`dirname "$PRG"`"/$link"
+- fi
+- done
+-
+- HTMLPARSER_HOME=`dirname "$PRG"`/..
+-
+- cd "$saveddir"
+-
+- # make it fully qualified
+- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
+-fi
+-
+ if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+@@ -55,13 +26,13 @@
+ LOCALCLASSPATH="$CLASSPATH"
+ fi
+
+-HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
++HTMLPARSER_LIB="/usr/share/java"
+
+ # add in the parser .jar file
+ if [ -z "$LOCALCLASSPATH" ] ; then
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
+ else
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar":"$LOCALCLASSPATH"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
+ fi
+
+ # handle 1.1x JDKs
+--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/parser
++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/parser
+@@ -1,34 +1,5 @@
+ #! /bin/sh
+
+-if [ -z "$HTMLPARSER_HOME" ] ; then
+-
+- ## resolve links - $0 may be a link to the home
+- PRG="$0"
+- progname=`basename "$0"`
+- saveddir=`pwd`
+-
+- # need this for relative symlinks
+- dirname_prg=`dirname "$PRG"`
+- cd "$dirname_prg"
+-
+- while [ -h "$PRG" ] ; do
+- ls=`ls -ld "$PRG"`
+- link=`expr "$ls" : '.*-> \(.*\)$'`
+- if expr "$link" : '/.*' > /dev/null; then
+- PRG="$link"
+- else
+- PRG=`dirname "$PRG"`"/$link"
+- fi
+- done
+-
+- HTMLPARSER_HOME=`dirname "$PRG"`/..
+-
+- cd "$saveddir"
+-
+- # make it fully qualified
+- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
+-fi
+-
+ if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+@@ -55,13 +26,13 @@
+ LOCALCLASSPATH="$CLASSPATH"
+ fi
+
+-HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
++HTMLPARSER_LIB="/usr/share/java"
+
+ # add in the parser .jar file
+ if [ -z "$LOCALCLASSPATH" ] ; then
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
+ else
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar":"$LOCALCLASSPATH"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
+ fi
+
+ # handle 1.1x JDKs
+--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/sitecapturer
++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/sitecapturer
+@@ -1,34 +1,5 @@
+ #! /bin/sh
+
+-if [ -z "$HTMLPARSER_HOME" ] ; then
+-
+- ## resolve links - $0 may be a link to the home
+- PRG="$0"
+- progname=`basename "$0"`
+- saveddir=`pwd`
+-
+- # need this for relative symlinks
+- dirname_prg=`dirname "$PRG"`
+- cd "$dirname_prg"
+-
+- while [ -h "$PRG" ] ; do
+- ls=`ls -ld "$PRG"`
+- link=`expr "$ls" : '.*-> \(.*\)$'`
+- if expr "$link" : '/.*' > /dev/null; then
+- PRG="$link"
+- else
+- PRG=`dirname "$PRG"`"/$link"
+- fi
+- done
+-
+- HTMLPARSER_HOME=`dirname "$PRG"`/..
+-
+- cd "$saveddir"
+-
+- # make it fully qualified
+- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
+-fi
+-
+ if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+@@ -55,13 +26,13 @@
+ LOCALCLASSPATH="$CLASSPATH"
+ fi
+
+-HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
++HTMLPARSER_LIB="/usr/share/java"
+
+ # add in the parser .jar file
+ if [ -z "$LOCALCLASSPATH" ] ; then
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
+ else
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar":"$LOCALCLASSPATH"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
+ fi
+
+ # handle 1.1x JDKs
+--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/stringextractor
++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/stringextractor
+@@ -1,34 +1,5 @@
+ #! /bin/sh
+
+-if [ -z "$HTMLPARSER_HOME" ] ; then
+-
+- ## resolve links - $0 may be a link to the home
+- PRG="$0"
+- progname=`basename "$0"`
+- saveddir=`pwd`
+-
+- # need this for relative symlinks
+- dirname_prg=`dirname "$PRG"`
+- cd "$dirname_prg"
+-
+- while [ -h "$PRG" ] ; do
+- ls=`ls -ld "$PRG"`
+- link=`expr "$ls" : '.*-> \(.*\)$'`
+- if expr "$link" : '/.*' > /dev/null; then
+- PRG="$link"
+- else
+- PRG=`dirname "$PRG"`"/$link"
+- fi
+- done
+-
+- HTMLPARSER_HOME=`dirname "$PRG"`/..
+-
+- cd "$saveddir"
+-
+- # make it fully qualified
+- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
+-fi
+-
+ if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+@@ -55,13 +26,13 @@
+ LOCALCLASSPATH="$CLASSPATH"
+ fi
+
+-HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
++HTMLPARSER_LIB="/usr/share/java"
+
+ # add in the parser .jar file
+ if [ -z "$LOCALCLASSPATH" ] ; then
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
+ else
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar":"$LOCALCLASSPATH"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
+ fi
+
+ # handle 1.1x JDKs
+--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/thumbelina
++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/thumbelina
+@@ -1,34 +1,5 @@
+ #! /bin/sh
+
+-if [ -z "$HTMLPARSER_HOME" ] ; then
+-
+- ## resolve links - $0 may be a link to the home
+- PRG="$0"
+- progname=`basename "$0"`
+- saveddir=`pwd`
+-
+- # need this for relative symlinks
+- dirname_prg=`dirname "$PRG"`
+- cd "$dirname_prg"
+-
+- while [ -h "$PRG" ] ; do
+- ls=`ls -ld "$PRG"`
+- link=`expr "$ls" : '.*-> \(.*\)$'`
+- if expr "$link" : '/.*' > /dev/null; then
+- PRG="$link"
+- else
+- PRG=`dirname "$PRG"`"/$link"
+- fi
+- done
+-
+- HTMLPARSER_HOME=`dirname "$PRG"`/..
+-
+- cd "$saveddir"
+-
+- # make it fully qualified
+- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
+-fi
+-
+ if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+@@ -51,7 +22,8 @@
+ exit 1
+ fi
+
+-HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
++HTMLPARSER_LIB="/usr/share/java"
++HTMLPARSER_EXLIB="/usr/share/doc/libhtmlparser-java/examples/lib"
+
+-"$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 "$@"
+
+--- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/translate
++++ libhtmlparser-java-1.6.20060610.dfsg0/bin/translate
+@@ -1,34 +1,5 @@
+ #! /bin/sh
+
+-if [ -z "$HTMLPARSER_HOME" ] ; then
+-
+- ## resolve links - $0 may be a link to the home
+- PRG="$0"
+- progname=`basename "$0"`
+- saveddir=`pwd`
+-
+- # need this for relative symlinks
+- dirname_prg=`dirname "$PRG"`
+- cd "$dirname_prg"
+-
+- while [ -h "$PRG" ] ; do
+- ls=`ls -ld "$PRG"`
+- link=`expr "$ls" : '.*-> \(.*\)$'`
+- if expr "$link" : '/.*' > /dev/null; then
+- PRG="$link"
+- else
+- PRG=`dirname "$PRG"`"/$link"
+- fi
+- done
+-
+- HTMLPARSER_HOME=`dirname "$PRG"`/..
+-
+- cd "$saveddir"
+-
+- # make it fully qualified
+- HTMLPARSER_HOME=`cd "$HTMLPARSER_HOME" && pwd`
+-fi
+-
+ if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+@@ -55,13 +26,13 @@
+ LOCALCLASSPATH="$CLASSPATH"
+ fi
+
+-HTMLPARSER_LIB="${HTMLPARSER_HOME}/lib"
++HTMLPARSER_LIB="/usr/share/java"
+
+ # add in the parser .jar file
+ if [ -z "$LOCALCLASSPATH" ] ; then
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar"
+ else
+- LOCALCLASSPATH="${HTMLPARSER_LIB}/htmlparser.jar":"$LOCALCLASSPATH"
++ LOCALCLASSPATH="${HTMLPARSER_LIB}/libhtmlparser.jar":"$LOCALCLASSPATH"
+ fi
+
+ # handle 1.1x JDKs
Added: trunk/libhtmlparser-java/debian/patches/series
===================================================================
--- trunk/libhtmlparser-java/debian/patches/series (rev 0)
+++ trunk/libhtmlparser-java/debian/patches/series 2010-02-21 21:45:52 UTC (rev 11676)
@@ -0,0 +1,2 @@
+01_remove_jdk15-dependency.patch
+02_adjust_path_in_examples.patch
Modified: trunk/libhtmlparser-java/debian/rules
===================================================================
--- trunk/libhtmlparser-java/debian/rules 2010-02-21 21:37:32 UTC (rev 11675)
+++ trunk/libhtmlparser-java/debian/rules 2010-02-21 21:45:52 UTC (rev 11676)
@@ -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' \
Added: trunk/libhtmlparser-java/debian/source/format
===================================================================
--- trunk/libhtmlparser-java/debian/source/format (rev 0)
+++ trunk/libhtmlparser-java/debian/source/format 2010-02-21 21:45:52 UTC (rev 11676)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list