[jericho-html] 04/26: * New upstream version * Separate out Build-Depends and Build-Depends-Indep * Add libslf4j-java to Build-Depends-Indep * Add myself to Uploaders * Modify build process to avoid hardcoding upstream version * Fix doc-base file; move apidocs to api subfolder

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jericho-html.

commit c0d5e1f67ff1be521eeabbbe7ffcdc3defe5320e
Author: Varun Hiremath <varun at debian.org>
Date:   Sun Feb 24 07:12:39 2008 +0000

    * New upstream version
    * Separate out Build-Depends and Build-Depends-Indep
    * Add libslf4j-java to Build-Depends-Indep
    * Add myself to Uploaders
    * Modify build process to avoid hardcoding upstream version
    * Fix doc-base file; move apidocs to api subfolder
---
 debian/ant.properties |  2 +-
 debian/changelog      | 13 ++++++++++---
 debian/control        |  7 ++++---
 debian/copyright      |  3 +--
 debian/doc-base       |  5 ++---
 debian/docs           |  1 +
 debian/rules          |  6 ++++--
 7 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index 1a20131..9e4f9a5 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,4 +1,4 @@
-project.version=2.3
+jarfile=jericho-html.jar
 installdir=/usr/share/java
 installdocdir=/usr/share/doc/libjericho-html-java
 
diff --git a/debian/changelog b/debian/changelog
index 0b13728..24a195e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 jericho-html (2.5-1) UNRELEASED; urgency=low
 
-  UNRELEASED (needs slf4j first)
-  * new upstream version
+  [ Torsten Werner ]
+  * New upstream version
   * Move package to Alioth.
   * Add Vcs and Homepage headers.
   * Move build.xml to debian directory.
@@ -9,7 +9,14 @@ jericho-html (2.5-1) UNRELEASED; urgency=low
   * Bump up Standards-Version: 3.7.3 (no changes needed).
   * Add missing Build-Depends.
 
- -- Torsten Werner <twerner at debian.org>  Sun, 16 Dec 2007 11:23:44 +0100
+  [ Varun Hiremath ]
+  * Separate out Build-Depends and Build-Depends-Indep
+  * Add libslf4j-java to Build-Depends-Indep
+  * Add myself to Uploaders
+  * Modify build process to avoid hardcoding upstream version
+  * Fix doc-base file; move apidocs to api subfolder
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 24 Feb 2008 12:42:22 +0530
 
 jericho-html (2.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 84ab024..57e6659 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@ Source: jericho-html
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 5), java-gcj-compat-dev,
- libcommons-logging-java, liblog4j1.2-java
+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.7.3
 Homepage: http://jerichohtml.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jericho-html/
diff --git a/debian/copyright b/debian/copyright
index 5c8417f..34fec7b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,8 +5,7 @@ It was downloaded from http://jerichohtml.sourceforge.net/
 
 Upstream Author: Martin Jericho <mart3862 at yahoo.com.au>
 
-Copyright: 
-(C) 2006 Martin Jericho <mart3862 at yahoo.com.au>
+Copyright: (C) 2006 Martin Jericho <mart3862 at yahoo.com.au>
 
 License:
 
diff --git a/debian/doc-base b/debian/doc-base
index 65bcfb7..4c4c937 100644
--- a/debian/doc-base
+++ b/debian/doc-base
@@ -5,6 +5,5 @@ Abstract: User manual for libjericho-html-java.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libjericho-html-java/index.html
-Files: /usr/share/doc/libjericho-html-java/*.html
- 
+Index: /usr/share/doc/libjericho-html-java/api/index.html
+Files: /usr/share/doc/libjericho-html-java/api/*.html
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..a37585e
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+doc/api
diff --git a/debian/rules b/debian/rules
index bfdf61c..8fbae2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 JAVA_HOME              := /usr/lib/jvm/java-gcj
 DEB_ANT_BUILDFILE      := debian/build.xml
-DEB_ANT_INSTALL_TARGET := install -Ddestdir=$(DEB_DESTDIR)
-DEB_JARS               := commons-logging log4j-1.2
+DEB_ANT_BUILD_TARGET   := build doc
+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
 

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