[knopflerfish-osgi] 01/02: drop java-doc package

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository knopflerfish-osgi.

commit 540068b2ea8450a479450c36b92de06ddddee0f6
Author: Felix Natter <fnatter at gmx.net>
Date:   Fri Mar 30 17:37:59 2018 +0200

    drop java-doc package
---
 debian/changelog                                    |  7 +++++++
 debian/control                                      | 20 +-------------------
 debian/libknopflerfish-osgi-java-doc.doc-base.api   | 10 ----------
 debian/libknopflerfish-osgi-java-doc.doc-base.intro |  9 ---------
 debian/libknopflerfish-osgi-java-doc.docs           |  2 --
 debian/libknopflerfish-osgi-java-doc.javadoc        |  1 -
 debian/rules                                        |  3 ---
 7 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2fa06f9..a9c7f6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+knopflerfish-osgi (6.1.1-2) unstable; urgency=medium
+
+  * Drop -java-doc package due to low popcon (Closes: #893221)
+  * Correct description (R5->R6)
+
+ -- Felix Natter <fnatter at gmx.net>  Fri, 30 Mar 2018 17:29:18 +0200
+
 knopflerfish-osgi (6.1.1-1) unstable; urgency=medium
 
   [ Felix Natter ]
diff --git a/debian/control b/debian/control
index 59f356c..321975e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,7 @@ Homepage: http://www.knopflerfish.org/
 Package: libknopflerfish-osgi-framework-java
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libknopflerfish-osgi-java-doc
-Description: Java framework implementing the OSGi R5 version
+Description: Java framework implementing the OSGi R6 version
  OSGi, Open Service Gateway Initiative, specifies an industry standard Java
  application platform, allowing multiple applications, to securely run in a
  single JVM. These programs can share resources as data, functionality and
@@ -25,20 +24,3 @@ Description: Java framework implementing the OSGi R5 version
  was the embedded market, but other uses are certainly possible.
  .
  This package specifically provides the framework JAR file.
-
-Package: libknopflerfish-osgi-java-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: iceweasel | firefox | www-browser
-Description: Java framework implementing the OSGi R5 version (docs)
- OSGi, Open Service Gateway Initiative, specifies an industry standard Java
- application platform, allowing multiple applications, to securely run in a
- single JVM. These programs can share resources as data, functionality and
- threads.
- .
- Applications areas for OSGi ranges from use as a service platform on embedded
- devices, to plugin mechanisms for larger programs. The initial goal of OSGi
- was the embedded market, but other uses are certainly possible.
- .
- This package contains the documentation, currently mainly for the framework.
diff --git a/debian/libknopflerfish-osgi-java-doc.doc-base.api b/debian/libknopflerfish-osgi-java-doc.doc-base.api
deleted file mode 100644
index c62673a..0000000
--- a/debian/libknopflerfish-osgi-java-doc.doc-base.api
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: knopflerfish-osgi-javadoc
-Title: API JavaDoc for Knopflerfish's OSGi implementation
-Author: The Knopflerfish Project
-Abstract: This the API JavaDoc for Knopflerfish's OSGi framework
- and the OSGi interface.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libknopflerfish-osgi-java-doc/api/index.html
-Files: /usr/share/doc/libknopflerfish-osgi-java-doc/api/*.html
diff --git a/debian/libknopflerfish-osgi-java-doc.doc-base.intro b/debian/libknopflerfish-osgi-java-doc.doc-base.intro
deleted file mode 100644
index ba805af..0000000
--- a/debian/libknopflerfish-osgi-java-doc.doc-base.intro
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: knopflerfish-osgi-framework-intro
-Title: Introduction to Knopflerfish's OSGi implementation
-Author: The Knopflerfish Project
-Abstract: Quickstart guide for using the Knopflerfish OSGi framework
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libknopflerfish-osgi-java-doc/framework.html
-Files: /usr/share/doc/libknopflerfish-osgi-java-doc/framework.html
diff --git a/debian/libknopflerfish-osgi-java-doc.docs b/debian/libknopflerfish-osgi-java-doc.docs
deleted file mode 100644
index af7de37..0000000
--- a/debian/libknopflerfish-osgi-java-doc.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-api/
-framework.html
diff --git a/debian/libknopflerfish-osgi-java-doc.javadoc b/debian/libknopflerfish-osgi-java-doc.javadoc
deleted file mode 100644
index eedd89b..0000000
--- a/debian/libknopflerfish-osgi-java-doc.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-api
diff --git a/debian/rules b/debian/rules
index 63e26fc..26f7e73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,6 @@ override_dh_auto_build:
 	dh_auto_build -- -f ant/bundletasks.xml build_bundle_tasks -Dasm.jar=/usr/share/java/asm-all.jar
 	dh_auto_build -- -f osgi/framework/build.xml jar
 
-	javadoc -locale en -encoding "UTF-8" -sourcepath osgi/framework/src -d api -subpackages org.knopflerfish:org.osgi
-	cp osgi/framework/doc/index.html framework.html
-
 override_dh_auto_clean:
 	-rm -Rf ant/classes
 	-rm -Rf ant/lib

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