[libjaxen-java] 31/49: libjaxen-java (1.1.1-4) unstable; urgency=low

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libjaxen-java.

commit 3fee05dc1586726f4249ef829a8599193db4bc61
Author: Michael Koch <konqueror at gmx.de>
Date:   Thu Sep 24 21:44:43 2009 +0000

    libjaxen-java (1.1.1-4) unstable; urgency=low
    
      * (Build-)Depends on default-jdk (Closes: #508976).
        Thanks to Chris Cheney for the patch.
      * Split into library and doc pacakge (Closes: #513662).
      * Build-Depends on debhelper >= 7.
      * Remove Depends on java-virtual-machine.
      * Moved package to section 'java'.
      * Updated Standards-Version to 3.8.3.
    
     -- Michael Koch <konqueror at gmx.de>  Thu, 24 Sep 2009 22:18:53 +0200
---
 debian/changelog                                | 12 ++++++++++++
 debian/compat                                   |  2 +-
 debian/control                                  | 21 +++++++++++++++------
 debian/libjaxen-java-doc.dirs                   |  1 +
 debian/{doc-base => libjaxen-java-doc.doc-base} |  4 ++--
 debian/{docs => libjaxen-java-doc.docs}         |  0
 debian/libjaxen-java-doc.links                  |  1 +
 debian/{dirs => libjaxen-java.dirs}             |  0
 debian/rules                                    |  2 +-
 9 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c2ea9b..555e0fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libjaxen-java (1.1.1-4) unstable; urgency=low
+
+  * (Build-)Depends on default-jdk (Closes: #508976).
+    Thanks to Chris Cheney for the patch.
+  * Split into library and doc pacakge (Closes: #513662).
+  * Build-Depends on debhelper >= 7.
+  * Remove Depends on java-virtual-machine.
+  * Moved package to section 'java'.
+  * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de>  Thu, 24 Sep 2009 22:18:53 +0200
+
 libjaxen-java (1.1.1-3) unstable; urgency=low
 
   * Added XOM support. Closes: 427813
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 07664bd..3002cc1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,32 @@
 Source: libjaxen-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
-Build-Depends: cdbs, debhelper (>= 5), ant, ant-optional
-Build-Depends-Indep: java-gcj-compat-dev, junit, libjdom1-java, libxerces2-java, libdom4j-java, libxom-java
-Standards-Version: 3.7.3
+Build-Depends: cdbs, debhelper (>= 7), ant, ant-optional
+Build-Depends-Indep: default-jdk, junit, libdom4j-java, libjdom1-java, libxerces2-java, libxom-java
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjaxen-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjaxen-java
 Homepage: http://jaxen.org
 
 Package: libjaxen-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libxerces2-java
+Depends: default-jre-headless | java2-runtime-headless, libxerces2-java, ${misc:Depends}
 Recommends: libdom4j-java, libjdom1-java
-Suggests: java-virtual-machine
 Conflicts: libsaxpath-java
 Replaces: libsaxpath-java
 Description: Java XPath engine
  jaxen is a universal object model walker, capable of evaluating XPath
  expressions across multiple models. Currently supported are dom4j,
  JDOM, and DOM.
+
+Package: libjaxen-java-doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Java XPath engine - documentation
+ jaxen is a universal object model walker, capable of evaluating XPath
+ expressions across multiple models. Currently supported are dom4j,
+ JDOM, and DOM.
+ .
+ This package contains the API javadocs for jaxen.
diff --git a/debian/libjaxen-java-doc.dirs b/debian/libjaxen-java-doc.dirs
new file mode 100644
index 0000000..f6c4c0f
--- /dev/null
+++ b/debian/libjaxen-java-doc.dirs
@@ -0,0 +1 @@
+usr/share/doc/libjaxen-java
diff --git a/debian/doc-base b/debian/libjaxen-java-doc.doc-base
similarity index 63%
rename from debian/doc-base
rename to debian/libjaxen-java-doc.doc-base
index 3478687..690e94d 100644
--- a/debian/doc-base
+++ b/debian/libjaxen-java-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provided by the jaxen library.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libjaxen-java/api/index.html
-Files: /usr/share/doc/libjaxen-java/api/*
+Index: /usr/share/doc/libjaxen-java-doc/api/index.html
+Files: /usr/share/doc/libjaxen-java-doc/api/*
diff --git a/debian/docs b/debian/libjaxen-java-doc.docs
similarity index 100%
rename from debian/docs
rename to debian/libjaxen-java-doc.docs
diff --git a/debian/libjaxen-java-doc.links b/debian/libjaxen-java-doc.links
new file mode 100644
index 0000000..e692a99
--- /dev/null
+++ b/debian/libjaxen-java-doc.links
@@ -0,0 +1 @@
+usr/share/doc/libjaxen-java-doc/api usr/share/doc/libjaxen-java/api
diff --git a/debian/dirs b/debian/libjaxen-java.dirs
similarity index 100%
rename from debian/dirs
rename to debian/libjaxen-java.dirs
diff --git a/debian/rules b/debian/rules
index 3e3293d..bf5fb66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
 DEB_JARS := ant-junit junit xom
 DEB_ANT_BUILD_TARGET := dist
 

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