[pkg-java] r16855 - trunk/derby/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-06-07 15:47:23 +0000 (Fri, 07 Jun 2013)
New Revision: 16855

Added:
   trunk/derby/debian/derby-doc.docs
Removed:
   trunk/derby/debian/derby-common.docs
   trunk/derby/debian/derby-demo.docs
   trunk/derby/debian/derby-javadoc.docs
Modified:
   trunk/derby/debian/changelog
   trunk/derby/debian/control
Log:
Merged the demo, common and javadoc packages into a single derby-doc package
Removed the Javadoc for the tests from the documentation package



Modified: trunk/derby/debian/changelog
===================================================================
--- trunk/derby/debian/changelog	2013-06-07 15:39:47 UTC (rev 16854)
+++ trunk/derby/debian/changelog	2013-06-07 15:47:23 UTC (rev 16855)
@@ -11,6 +11,8 @@
   * Renamed the derby-core package to libderby-java
   * Renamed the derby-client package to libderbyclient-java
   * Added a derby-tools package with the command line tools
+  * Merged the demo, common and javadoc packages into a single derby-doc package
+  * Removed the Javadoc for the tests from the documentation package
   * Installed Maven poms to /usr/share/maven-repo
   * Added the missing patch descriptions
 

Modified: trunk/derby/debian/control
===================================================================
--- trunk/derby/debian/control	2013-06-07 15:39:47 UTC (rev 16854)
+++ trunk/derby/debian/control	2013-06-07 15:47:23 UTC (rev 16855)
@@ -12,6 +12,7 @@
 Package: libderbyclient-java
 Architecture: all
 Depends: ${misc:Depends}
+Suggests: derby-tools, derby-doc
 Description: Apache Derby Client JDBC Driver
  The Derby network client provides network connectivity to the Derby Network
  Server. It is distributed as an additional jar file, derbyclient.jar, with an
@@ -22,30 +23,10 @@
  .
  The Derby Network Server is provided by the derby-core package.
 
-Package: derby-common
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: derby-core, derby-client, derby-javadoc, derby-demo
-Description: Embeddable relational database for Java, common files
- An open source relational database implemented entirely in Java.
-  * Derby has a small footprint -- about 2.6 megabytes for the base engine and
-    embedded JDBC driver.
-  * Derby is based on the Java, JDBC, and SQL standards.
-  * Derby provides an embedded JDBC driver that lets you embed Derby in any
-    Java-based solution.
-  * Derby also supports the more familiar client/server mode with the Derby
-    Network Client JDBC driver and Derby Network Server.
-  * Derby is easy to install, deploy, and use.
- .
- This package contains common information about Apache Derby.  The file
- index.html introduces the product and has references to further
- documentation, some of which is in the packages,
- derby-javadoc and derby-demo.
-
 Package: libderby-java
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libderbyclient-java, derby-javadoc, derby-demo
+Suggests: derby-doc
 Description: Apache Derby Database Engine and Embedded JDBC Driver
  Apache Derby is an open source relational database implemented entirely
  in Java.
@@ -86,28 +67,13 @@
   * SignatureChecker, a tool that identifies any SQL functions and procedures
     in a database that do not follow the SQL Standard argument matching rules.
 
-Package: derby-demo
+Package: derby-doc
 Architecture: all
-Section: devel
-Depends: ${misc:Depends}, derby-common, default-jre | java6-runtime
-Description: Apache Derby demo
- Demo software for Apache Derby.
+Section: doc
+Depends: ${misc:Depends}
+Description: Apache Derby API documentation and examples
+ Apache Derby is an open source relational database implemented entirely
+ in Java.
  .
- This package contains sample programs, database and templates.
-
-#Package: derby-doc
-#Architecture: all
-#Depends: ${shlibs:Depends}, ${misc:Depends}, derby-common
-#Description: Embeddable relational database for Java, documentation
-# Documentation for Apache Derby.
-# .
-# This package contains user documentation in both HTML and PDF formats.
-
-Package: derby-javadoc
-Architecture: all
-Section: devel
-Depends: ${misc:Depends}, derby-common
-Description: Apache Derby javadoc
- javadoc for Apache Derby
- .
- This package documents the API for JDBC.
+ This package contains a Javadoc documenting the API and demo software
+ for Apache Derby.

Deleted: trunk/derby/debian/derby-common.docs
===================================================================
--- trunk/derby/debian/derby-common.docs	2013-06-07 15:39:47 UTC (rev 16854)
+++ trunk/derby/debian/derby-common.docs	2013-06-07 15:47:23 UTC (rev 16855)
@@ -1,6 +0,0 @@
-published_api_overview.html
-releaseSummary.xml
-README
-NOTICE
-RELEASE-NOTES.html
-index.html

Deleted: trunk/derby/debian/derby-demo.docs
===================================================================
--- trunk/derby/debian/derby-demo.docs	2013-06-07 15:39:47 UTC (rev 16854)
+++ trunk/derby/debian/derby-demo.docs	2013-06-07 15:47:23 UTC (rev 16855)
@@ -1 +0,0 @@
-java/demo

Added: trunk/derby/debian/derby-doc.docs
===================================================================
--- trunk/derby/debian/derby-doc.docs	                        (rev 0)
+++ trunk/derby/debian/derby-doc.docs	2013-06-07 15:47:23 UTC (rev 16855)
@@ -0,0 +1,8 @@
+javadoc/engine
+javadoc/publishedapi
+java/demo
+published_api_overview.html
+releaseSummary.xml
+README
+NOTICE
+index.html

Deleted: trunk/derby/debian/derby-javadoc.docs
===================================================================
--- trunk/derby/debian/derby-javadoc.docs	2013-06-07 15:39:47 UTC (rev 16854)
+++ trunk/derby/debian/derby-javadoc.docs	2013-06-07 15:47:23 UTC (rev 16855)
@@ -1 +0,0 @@
-javadoc