[libhtmlparser-java] 10/10: Update 03_remove-sourceforge-logo-from-javadoc.patch and fix more privacy

Markus Koschany apo at moszumanska.debian.org
Fri Mar 30 16:38:34 BST 2018 

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

apo pushed a commit to branch master
in repository libhtmlparser-java.

commit e0c67ff295afec73926d91c4a74addfecf30b70f
Author: Markus Koschany <apo at debian.org>
Date:   Fri Mar 30 17:30:40 2018 +0200

    Update 03_remove-sourceforge-logo-from-javadoc.patch and fix more privacy
    
    issues.
---
 debian/patches/01_remove_jdk15-dependency.patch    | 20 +++--
 debian/patches/02_adjust_path_in_examples.patch    | 90 +++++++++++++++-------
 .../03_remove-sourceforge-logo-from-javadoc.patch  | 54 ++++++++++++-
 debian/patches/encoding.patch                      |  2 +-
 4 files changed, 127 insertions(+), 39 deletions(-)

diff --git a/debian/patches/01_remove_jdk15-dependency.patch b/debian/patches/01_remove_jdk15-dependency.patch
index 39ac45f..46fee9c 100644
--- a/debian/patches/01_remove_jdk15-dependency.patch
+++ b/debian/patches/01_remove_jdk15-dependency.patch
@@ -1,8 +1,16 @@
-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 @@
+From: Tiago Saboga <tiagosaboga at gmail.com>
+Date: Fri, 30 Mar 2018 17:25:48 +0200
+Subject: No description.
+
+---
+ src/build.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/build.xml b/src/build.xml
+index 34389f0..96821f7 100644
+--- a/src/build.xml
++++ b/src/build.xml
+@@ -367,11 +367,11 @@ Update the Web Site
    </target>
  
    <!-- Create the Thumbelina jar -->
@@ -16,7 +24,7 @@ Description: No description.
        <include name="org/htmlparser/lexerapplications/thumbelina/**/*.java"/>
      </javac>
      <jar jarfile="${lib}/thumbelina.jar"
-@@ -386,7 +386,7 @@
+@@ -386,7 +386,7 @@ Update the Web Site
    </target>
    
    <!-- Create the FilterBuilder jar -->
diff --git a/debian/patches/02_adjust_path_in_examples.patch b/debian/patches/02_adjust_path_in_examples.patch
index 6220f17..2e74416 100644
--- a/debian/patches/02_adjust_path_in_examples.patch
+++ b/debian/patches/02_adjust_path_in_examples.patch
@@ -1,7 +1,23 @@
-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
+From: Tiago Saboga <tiagosaboga at gmail.com>
+Date: Fri, 30 Mar 2018 17:25:48 +0200
+Subject: No description.
+
+---
+ bin/beanybaby       | 35 +++--------------------------------
+ bin/filterbuilder   | 34 +++-------------------------------
+ bin/lexer           | 35 +++--------------------------------
+ bin/linkextractor   | 35 +++--------------------------------
+ bin/parser          | 35 +++--------------------------------
+ bin/sitecapturer    | 35 +++--------------------------------
+ bin/stringextractor | 35 +++--------------------------------
+ bin/thumbelina      | 34 +++-------------------------------
+ bin/translate       | 35 +++--------------------------------
+ 9 files changed, 27 insertions(+), 286 deletions(-)
+
+diff --git a/bin/beanybaby b/bin/beanybaby
+index be0530f..e70c90b 100755
+--- a/bin/beanybaby
++++ b/bin/beanybaby
 @@ -1,34 +1,5 @@
  #! /bin/sh
  
@@ -37,7 +53,7 @@ Description: No description.
  if [ -z "$JAVACMD" ] ; then 
    if [ -n "$JAVA_HOME"  ] ; then
      if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
-@@ -55,13 +26,13 @@
+@@ -55,13 +26,13 @@ if [ -n "$CLASSPATH" ] ; then
    LOCALCLASSPATH="$CLASSPATH"
  fi
  
@@ -54,8 +70,10 @@ Description: No description.
  fi
  
  # handle 1.1x JDKs
---- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/filterbuilder
-+++ libhtmlparser-java-1.6.20060610.dfsg0/bin/filterbuilder
+diff --git a/bin/filterbuilder b/bin/filterbuilder
+index 5170536..0800033 100755
+--- a/bin/filterbuilder
++++ b/bin/filterbuilder
 @@ -1,34 +1,5 @@
  #! /bin/sh
  
@@ -91,7 +109,7 @@ Description: No description.
  if [ -z "$JAVACMD" ] ; then 
    if [ -n "$JAVA_HOME"  ] ; then
      if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
-@@ -51,7 +22,8 @@
+@@ -51,7 +22,8 @@ if [ ! -x "$JAVACMD" ] ; then
    exit 1
  fi
  
@@ -102,8 +120,10 @@ Description: No description.
 -"$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
+diff --git a/bin/lexer b/bin/lexer
+index 9378d68..3aca776 100755
+--- a/bin/lexer
++++ b/bin/lexer
 @@ -1,34 +1,5 @@
  #! /bin/sh
  
@@ -139,7 +159,7 @@ Description: No description.
  if [ -z "$JAVACMD" ] ; then 
    if [ -n "$JAVA_HOME"  ] ; then
      if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
-@@ -55,13 +26,13 @@
+@@ -55,13 +26,13 @@ if [ -n "$CLASSPATH" ] ; then
    LOCALCLASSPATH="$CLASSPATH"
  fi
  
@@ -156,8 +176,10 @@ Description: No description.
  fi
  
  # handle 1.1x JDKs
---- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/linkextractor
-+++ libhtmlparser-java-1.6.20060610.dfsg0/bin/linkextractor
+diff --git a/bin/linkextractor b/bin/linkextractor
+index 82fe822..2c07138 100755
+--- a/bin/linkextractor
++++ b/bin/linkextractor
 @@ -1,34 +1,5 @@
  #! /bin/sh
  
@@ -193,7 +215,7 @@ Description: No description.
  if [ -z "$JAVACMD" ] ; then 
    if [ -n "$JAVA_HOME"  ] ; then
      if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
-@@ -55,13 +26,13 @@
+@@ -55,13 +26,13 @@ if [ -n "$CLASSPATH" ] ; then
    LOCALCLASSPATH="$CLASSPATH"
  fi
  
@@ -210,8 +232,10 @@ Description: No description.
  fi
  
  # handle 1.1x JDKs
---- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/parser
-+++ libhtmlparser-java-1.6.20060610.dfsg0/bin/parser
+diff --git a/bin/parser b/bin/parser
+index 67ec15b..fa00098 100755
+--- a/bin/parser
++++ b/bin/parser
 @@ -1,34 +1,5 @@
  #! /bin/sh
  
@@ -247,7 +271,7 @@ Description: No description.
  if [ -z "$JAVACMD" ] ; then 
    if [ -n "$JAVA_HOME"  ] ; then
      if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
-@@ -55,13 +26,13 @@
+@@ -55,13 +26,13 @@ if [ -n "$CLASSPATH" ] ; then
    LOCALCLASSPATH="$CLASSPATH"
  fi
  
@@ -264,8 +288,10 @@ Description: No description.
  fi
  
  # handle 1.1x JDKs
---- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/sitecapturer
-+++ libhtmlparser-java-1.6.20060610.dfsg0/bin/sitecapturer
+diff --git a/bin/sitecapturer b/bin/sitecapturer
+index 4910857..96b1ad6 100755
+--- a/bin/sitecapturer
++++ b/bin/sitecapturer
 @@ -1,34 +1,5 @@
  #! /bin/sh
  
@@ -301,7 +327,7 @@ Description: No description.
  if [ -z "$JAVACMD" ] ; then 
    if [ -n "$JAVA_HOME"  ] ; then
      if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
-@@ -55,13 +26,13 @@
+@@ -55,13 +26,13 @@ if [ -n "$CLASSPATH" ] ; then
    LOCALCLASSPATH="$CLASSPATH"
  fi
  
@@ -318,8 +344,10 @@ Description: No description.
  fi
  
  # handle 1.1x JDKs
---- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/stringextractor
-+++ libhtmlparser-java-1.6.20060610.dfsg0/bin/stringextractor
+diff --git a/bin/stringextractor b/bin/stringextractor
+index 5b43a42..6b3541e 100755
+--- a/bin/stringextractor
++++ b/bin/stringextractor
 @@ -1,34 +1,5 @@
  #! /bin/sh
  
@@ -355,7 +383,7 @@ Description: No description.
  if [ -z "$JAVACMD" ] ; then 
    if [ -n "$JAVA_HOME"  ] ; then
      if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
-@@ -55,13 +26,13 @@
+@@ -55,13 +26,13 @@ if [ -n "$CLASSPATH" ] ; then
    LOCALCLASSPATH="$CLASSPATH"
  fi
  
@@ -372,8 +400,10 @@ Description: No description.
  fi
  
  # handle 1.1x JDKs
---- libhtmlparser-java-1.6.20060610.dfsg0.orig/bin/thumbelina
-+++ libhtmlparser-java-1.6.20060610.dfsg0/bin/thumbelina
+diff --git a/bin/thumbelina b/bin/thumbelina
+index 664ae27..a86389f 100755
+--- a/bin/thumbelina
++++ b/bin/thumbelina
 @@ -1,34 +1,5 @@
  #! /bin/sh
  
@@ -409,7 +439,7 @@ Description: No description.
  if [ -z "$JAVACMD" ] ; then 
    if [ -n "$JAVA_HOME"  ] ; then
      if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
-@@ -51,7 +22,8 @@
+@@ -51,7 +22,8 @@ if [ ! -x "$JAVACMD" ] ; then
    exit 1
  fi
  
@@ -420,8 +450,10 @@ Description: No description.
 -"$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
+diff --git a/bin/translate b/bin/translate
+index 70dfaf6..031e7f5 100755
+--- a/bin/translate
++++ b/bin/translate
 @@ -1,34 +1,5 @@
  #! /bin/sh
  
@@ -457,7 +489,7 @@ Description: No description.
  if [ -z "$JAVACMD" ] ; then 
    if [ -n "$JAVA_HOME"  ] ; then
      if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
-@@ -55,13 +26,13 @@
+@@ -55,13 +26,13 @@ if [ -n "$CLASSPATH" ] ; then
    LOCALCLASSPATH="$CLASSPATH"
  fi
  
diff --git a/debian/patches/03_remove-sourceforge-logo-from-javadoc.patch b/debian/patches/03_remove-sourceforge-logo-from-javadoc.patch
index 95d07d0..c5fb0a1 100644
--- a/debian/patches/03_remove-sourceforge-logo-from-javadoc.patch
+++ b/debian/patches/03_remove-sourceforge-logo-from-javadoc.patch
@@ -1,9 +1,45 @@
-Description: Removed the SourceForge logo from the Javadoc to clear the Lintian privacy-breach-logo warning
-Author: Emmanuel Bourg <ebourg at apache.org>
+From: Emmanuel Bourg <ebourg at apache.org>
+Date: Fri, 30 Mar 2018 17:25:48 +0200
+Subject: 03_remove-sourceforge-logo-from-javadoc
+
 Forwarded: not-needed
+---
+ docs/mailinglists.html | 2 +-
+ docs/main.html         | 2 +-
+ src/build.xml          | 8 ++------
+ 3 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/docs/mailinglists.html b/docs/mailinglists.html
+index 5b223d1..2bd0b1d 100644
+--- a/docs/mailinglists.html
++++ b/docs/mailinglists.html
+@@ -15,7 +15,7 @@
+     Join this list if you are interested in new releases of HTML Parser.
+     Notifications of releases will be put on this list.<br>
+     Monitoring of intermediate releases is also possible by clicking on the
+-    <img src="http://images.sourceforge.net/images/ic/mail16d.png" alt="envelope icon">
++    <img src="" alt="envelope icon">
+     in the <em>Notes / Monitor</em> column of the <em>Latest File Releases</em>
+     list on the <a href="http://sourceforge.net/projects/htmlparser" target="_parent">project page</a>.
+   <p><a href="http://lists.sourceforge.net/lists/listinfo/htmlparser-user">
+diff --git a/docs/main.html b/docs/main.html
+index 59ea936..d9cb8bf 100644
+--- a/docs/main.html
++++ b/docs/main.html
+@@ -112,7 +112,7 @@
+     <a href="http://www.opensource.org/licenses/lgpl-license.html">LGPL license</a>.
+   <div align="right">
+       <a href="http://sourceforge.net/projects/htmlparser" target="_parent">
+-          <img src="http://sourceforge.net/sflogo.php?group_id=24399&type=1" width="88" height="31" border="0" alt="SourceForge.net">
++          <img src="" width="88" height="31" border="0" alt="SourceForge.net">
+       </a>
+   </div>
+ </body>
+diff --git a/src/build.xml b/src/build.xml
+index 96821f7..6d0d318 100644
 --- a/src/build.xml
 +++ b/src/build.xml
-@@ -444,8 +444,7 @@
+@@ -444,8 +444,7 @@ Update the Web Site
      <property name="javadoc.footer" value="&copy; 2005 Derrick Oswald<div align="right">${TODAY_STRING}</div>"/>
      <property name="javadoc.bottom" value="<table width='100%'><tr><td>HTML Parser is an open source library released under
      <a HREF="http://www.opensource.org/licenses/lgpl-license.html" target="_top">LGPL</a>.</td><td align='right'>
@@ -13,3 +49,15 @@ Forwarded: not-needed
      <javadoc packagenames="org.htmlparser.*"
             sourcepath="${src}"
             classpath="${classes}"
+@@ -488,10 +487,7 @@ Update the Web Site
+     <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>"/>
+     <property name="javadoc.footer" value="&copy; 2005 Derrick Oswald<div align="right">${TODAY_STRING}</div>"/>
+-    <property name="javadoc.bottom" value="<table width='100%'><tr><td>HTML Parser is an open source library released under
+-    <a HREF="http://www.opensource.org/licenses/lgpl-license.html" target="_top">LGPL</a>.</td><td align='right'>
+-    <a HREF="http://sourceforge.net/projects/htmlparser" target="_top">
+-    <img src="http://sourceforge.net/sflogo.php?group_id=24399&type=1" width="88" height="31" border="0" alt="SourceForge.net"></a></td></tr></table>"/>
++    <property name="javadoc.bottom" value=""/>
+     <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
+            docletpath="/home/derrick/htmlparser_cvs/htmlparser/doccheck1.2b2/doccheck.jar"
+            packagenames="org.htmlparser.*"
diff --git a/debian/patches/encoding.patch b/debian/patches/encoding.patch
index 7711313..35a1135 100644
--- a/debian/patches/encoding.patch
+++ b/debian/patches/encoding.patch
@@ -8,7 +8,7 @@ Bug-Debian: https://bugs.debian.org/893243
  1 file changed, 19 insertions(+), 8 deletions(-)
 
 diff --git a/src/build.xml b/src/build.xml
-index 2c9ca48..40b9469 100644
+index 6d0d318..79d34b5 100644
 --- a/src/build.xml
 +++ b/src/build.xml
 @@ -260,12 +260,15 @@ Update the Web Site

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

More information about the pkg-java-commits mailing list