[pkg-java] r10775 - trunk/jericho-html/debian

[Michael Koch]

Author: mkoch
Date: 2009-10-05 18:55:12 +0000 (Mon, 05 Oct 2009)
New Revision: 10775

Modified:
   trunk/jericho-html/debian/
   trunk/jericho-html/debian/build.xml
   trunk/jericho-html/debian/changelog
   trunk/jericho-html/debian/control
   trunk/jericho-html/debian/orig-tar.sh
   trunk/jericho-html/debian/rules
Log:
jericho-html (3.1-1) UNRELEASED; urgency=low

  * New upstream release.
  * Build-Depends on default-jdk.
  * Build-Depends on debhelper >= 7.
  * Fixed debian/orig-tar.sh to put file outside of current package.
  * Moved package to section 'java'.
  * Added myself to Uploaders.
  * Updated Standards-Version to 3.8.3.

 -- Michael Koch <konqueror at gmx.de>  Sat, 03 Oct 2009 08:39:23 +0200




Property changes on: trunk/jericho-html/debian
___________________________________________________________________
Added: svn:ignore
   + files
libjericho-html-java
stamp-*
*.log
*.substvars


Modified: trunk/jericho-html/debian/build.xml
===================================================================
--- trunk/jericho-html/debian/build.xml	2009-10-05 18:21:26 UTC (rev 10774)
+++ trunk/jericho-html/debian/build.xml	2009-10-05 18:55:12 UTC (rev 10775)
@@ -13,9 +13,9 @@
   <target name="doc"
     description="create documentation">
     <javadoc Windowtitle="Jericho HTML Parser ${project.version}"
-      Use="true" stylesheetfile="src/css/javadoc.css"
-      packagenames="au.id.jericho.lib.html"
-      group="Core Package au.id.jericho.lib.html"
+      Use="true"
+      packagenames="net.htmlparser.jericho"
+      group="Core Package net.htmlparser.jericho"
       sourcepath="src/java" destdir="doc/api"/>
   </target>
 
@@ -42,6 +42,7 @@
 
   <target name="clean"
      description="clean up the build dir">
+     <delete file="jericho-html.jar"/>
      <delete dir="build"/>
      <delete dir="doc"/>
      <delete dir="samples/CommandLine/bin"/>

Modified: trunk/jericho-html/debian/changelog
===================================================================
--- trunk/jericho-html/debian/changelog	2009-10-05 18:21:26 UTC (rev 10774)
+++ trunk/jericho-html/debian/changelog	2009-10-05 18:55:12 UTC (rev 10775)
@@ -1,3 +1,15 @@
+jericho-html (3.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Build-Depends on default-jdk.
+  * Build-Depends on debhelper >= 7.
+  * Fixed debian/orig-tar.sh to put file outside of current package.
+  * Moved package to section 'java'.
+  * Added myself to Uploaders.
+  * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 03 Oct 2009 08:39:23 +0200
+
 jericho-html (2.6-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/jericho-html/debian/control
===================================================================
--- trunk/jericho-html/debian/control	2009-10-05 18:21:26 UTC (rev 10774)
+++ trunk/jericho-html/debian/control	2009-10-05 18:55:12 UTC (rev 10775)
@@ -1,21 +1,18 @@
 Source: jericho-html
-Section: libs
+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>
-Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, java-gcj-compat-dev, libslf4j-java,
- libcommons-logging-java, liblog4j1.2-java 
-Standards-Version: 3.8.0
+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
 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
 
 Package: libjericho-html-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends},
- kaffe-pthreads | java1-runtime | java2-runtime
-Suggests: java-virtual-machine
+Depends: default-jre | java1-runtime | java2-runtime, ${shlibs: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

Modified: trunk/jericho-html/debian/orig-tar.sh
===================================================================
--- trunk/jericho-html/debian/orig-tar.sh	2009-10-05 18:21:26 UTC (rev 10774)
+++ trunk/jericho-html/debian/orig-tar.sh	2009-10-05 18:55:12 UTC (rev 10775)
@@ -6,7 +6,7 @@
 unzip $3
 rm -rf jericho-html-$2/bin jericho-html-$2/doc jericho-html-$2/lib \
   jericho-html-$2/samples/CommandLine/bin
-tar -c -z -f jericho-html_$2.orig.tar.gz jericho-html-$2
+tar -c -z -f ../jericho-html_$2.orig.tar.gz jericho-html-$2
 rm -rf jericho-html-$2 $3
 
 # move to directory 'tarballs'

Modified: trunk/jericho-html/debian/rules
===================================================================
--- trunk/jericho-html/debian/rules	2009-10-05 18:21:26 UTC (rev 10774)
+++ trunk/jericho-html/debian/rules	2009-10-05 18:55:12 UTC (rev 10775)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME              := /usr/lib/jvm/java-gcj
+JAVA_HOME              := /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE      := debian/build.xml
 DEB_ANT_BUILD_TARGET   := build doc
 DEB_JARS               := commons-logging log4j-1.2 slf4j-api
@@ -16,4 +16,3 @@
 
 get-orig-source:
 	uscan --upstream-version 0
-