[libcommons-net-java] 08/31: * Include manifest with OSGi information * Prefer openjdk-6-doc as Depends for the -doc package. * Move the Javadoc to /usr/share/doc/libcommons-net2-java/api

[Emmanuel Bourg]

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

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

commit 8f402b3ccb1179d492e1afd0e96dd081d77af69b
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Mon Aug 3 14:41:54 2009 +0000

    * Include manifest with OSGi information
    * Prefer openjdk-6-doc as Depends for the -doc package.
    * Move the Javadoc to /usr/share/doc/libcommons-net2-java/api
---
 debian/changelog                         | 8 ++++++++
 debian/control                           | 4 ++--
 debian/libcommons-net2-java-doc.doc-base | 4 ++--
 debian/libcommons-net2-java-doc.docs     | 1 -
 debian/libcommons-net2-java-doc.install  | 1 +
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1baa2d1..157a1d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libcommons-net2-java (2.0-2) experimental; urgency=low
+
+  * Include manifest with OSGi information
+  * Prefer openjdk-6-doc as Depends for the -doc package.
+  * Move the Javadoc to /usr/share/doc/libcommons-net2-java/api
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 07 Jul 2009 20:00:10 +0100
+
 libcommons-net2-java (2.0-1) unstable; urgency=low
 
   * Initial release, split from libcommons-net-java as this is
diff --git a/debian/control b/debian/control
index 482d6f2..3a08735 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: debhelper (>= 6), cdbs, openjdk-6-jdk
-Build-Depends-Indep: ant, ant-optional, maven-ant-helper (>> 5), maven-repo-helper, classpath-doc
+Build-Depends-Indep: ant, ant-optional, maven-ant-helper (>> 5), maven-repo-helper, openjdk-6-doc
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-net-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-net-java/
@@ -38,7 +38,7 @@ Description: internet protocol suite Java library
 Package: libcommons-net2-java-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, classpath-doc
+Depends: ${misc:Depends}, openjdk-6-doc | classpath-doc
 Suggests: libcommons-net-java
 Description: internet protocol suite Java library
  This is an Internet protocol suite Java library originally developed by
diff --git a/debian/libcommons-net2-java-doc.doc-base b/debian/libcommons-net2-java-doc.doc-base
index 4e1ac4f..8ded2e3 100644
--- a/debian/libcommons-net2-java-doc.doc-base
+++ b/debian/libcommons-net2-java-doc.doc-base
@@ -6,5 +6,5 @@ Abstract: Jakarta Commons Net implements the client side of many basic
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libcommons-net2-java-doc/api/index.html
-Files: /usr/share/doc/libcommons-net2-java-doc/api/*
+Index: /usr/share/doc/libcommons-net2-java/api/index.html
+Files: /usr/share/doc/libcommons-net2-java/api/*
diff --git a/debian/libcommons-net2-java-doc.docs b/debian/libcommons-net2-java-doc.docs
deleted file mode 100644
index e551a05..0000000
--- a/debian/libcommons-net2-java-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-build/docs/api
diff --git a/debian/libcommons-net2-java-doc.install b/debian/libcommons-net2-java-doc.install
new file mode 100644
index 0000000..328deba
--- /dev/null
+++ b/debian/libcommons-net2-java-doc.install
@@ -0,0 +1 @@
+build/docs/api usr/share/doc/libcommons-net2-java/

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