[derby] 17/53: Merged the demo, common and javadoc packages into a single derby-doc package Removed the Javadoc for the tests from the documentation package

[Emmanuel Bourg]

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

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

commit 9db22a2e89de985e0e35ea0c8b45450f6f40e529
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 7 15:47:23 2013 +0000

    Merged the demo, common and javadoc packages into a single derby-doc package
    Removed the Javadoc for the tests from the documentation package
---
 debian/changelog                             |  2 ++
 debian/control                               | 54 ++++++----------------------
 debian/derby-demo.docs                       |  1 -
 debian/{derby-common.docs => derby-doc.docs} |  4 ++-
 debian/derby-javadoc.docs                    |  1 -
 5 files changed, 15 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 693e95b..f0c864b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ derby (10.10.1.1-1) UNRELEASED; urgency=low
   * 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
 
diff --git a/debian/control b/debian/control
index 0224be0..7d3b0f0 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Homepage: http://db.apache.org/derby/
 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 @@ Description: Apache Derby Client JDBC Driver
  .
  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 @@ Description: Apache Derby Tools
   * 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.
- .
- 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
+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 documents the API for JDBC.
+ This package contains a Javadoc documenting the API and demo software
+ for Apache Derby.
diff --git a/debian/derby-demo.docs b/debian/derby-demo.docs
deleted file mode 100644
index 5155de5..0000000
--- a/debian/derby-demo.docs
+++ /dev/null
@@ -1 +0,0 @@
-java/demo
diff --git a/debian/derby-common.docs b/debian/derby-doc.docs
similarity index 61%
rename from debian/derby-common.docs
rename to debian/derby-doc.docs
index 852075b..8337695 100644
--- a/debian/derby-common.docs
+++ b/debian/derby-doc.docs
@@ -1,6 +1,8 @@
+javadoc/engine
+javadoc/publishedapi
+java/demo
 published_api_overview.html
 releaseSummary.xml
 README
 NOTICE
-RELEASE-NOTES.html
 index.html
diff --git a/debian/derby-javadoc.docs b/debian/derby-javadoc.docs
deleted file mode 100644
index 863d673..0000000
--- a/debian/derby-javadoc.docs
+++ /dev/null
@@ -1 +0,0 @@
-javadoc

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