[pkg-java] r9521 - trunk/libcommons-net2-java/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-08-03 14:41:54 +0000 (Mon, 03 Aug 2009)
New Revision: 9521

Added:
   trunk/libcommons-net2-java/debian/libcommons-net2-java-doc.install
Removed:
   trunk/libcommons-net2-java/debian/libcommons-net2-java-doc.docs
Modified:
   trunk/libcommons-net2-java/debian/changelog
   trunk/libcommons-net2-java/debian/control
   trunk/libcommons-net2-java/debian/libcommons-net2-java-doc.doc-base
Log:
* 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

Modified: trunk/libcommons-net2-java/debian/changelog
===================================================================
--- trunk/libcommons-net2-java/debian/changelog	2009-08-03 14:33:26 UTC (rev 9520)
+++ trunk/libcommons-net2-java/debian/changelog	2009-08-03 14:41:54 UTC (rev 9521)
@@ -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

Modified: trunk/libcommons-net2-java/debian/control
===================================================================
--- trunk/libcommons-net2-java/debian/control	2009-08-03 14:33:26 UTC (rev 9520)
+++ trunk/libcommons-net2-java/debian/control	2009-08-03 14:41:54 UTC (rev 9521)
@@ -4,7 +4,7 @@
 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 @@
 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

Modified: trunk/libcommons-net2-java/debian/libcommons-net2-java-doc.doc-base
===================================================================
--- trunk/libcommons-net2-java/debian/libcommons-net2-java-doc.doc-base	2009-08-03 14:33:26 UTC (rev 9520)
+++ trunk/libcommons-net2-java/debian/libcommons-net2-java-doc.doc-base	2009-08-03 14:41:54 UTC (rev 9521)
@@ -6,5 +6,5 @@
 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/*

Deleted: trunk/libcommons-net2-java/debian/libcommons-net2-java-doc.docs
===================================================================
--- trunk/libcommons-net2-java/debian/libcommons-net2-java-doc.docs	2009-08-03 14:33:26 UTC (rev 9520)
+++ trunk/libcommons-net2-java/debian/libcommons-net2-java-doc.docs	2009-08-03 14:41:54 UTC (rev 9521)
@@ -1 +0,0 @@
-build/docs/api

Added: trunk/libcommons-net2-java/debian/libcommons-net2-java-doc.install
===================================================================
--- trunk/libcommons-net2-java/debian/libcommons-net2-java-doc.install	                        (rev 0)
+++ trunk/libcommons-net2-java/debian/libcommons-net2-java-doc.install	2009-08-03 14:41:54 UTC (rev 9521)
@@ -0,0 +1 @@
+build/docs/api usr/share/doc/libcommons-net2-java/