[jetty9] 114/135: Removed 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 jetty9.

commit 933e324f353799ffc2e495905a0e3a3c41b2f4db
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Dec 1 15:19:16 2015 +0100

    Removed the documentation package
---
 debian/TODO                        |  4 ----
 debian/control                     | 19 +------------------
 debian/jetty9.links                |  1 -
 debian/libjetty9-java-doc.doc-base |  9 ---------
 debian/libjetty9-java-doc.install  |  1 -
 debian/patches/aggregate-doc.patch | 14 --------------
 debian/patches/series              |  1 -
 debian/root-webapp/index.html      |  2 --
 8 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 5c04fbf..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-TODO list for Jetty in Debian
------------------------------
-
-* Link the Javadoc with the default-jdk-doc
diff --git a/debian/control b/debian/control
index 3cc4bab..0932ee6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Jakub Adam <jakub.adam at ktknet.cz>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: ant-optional,
                debhelper (>= 9),
                default-jdk,
-               default-jdk-doc,
                dh-exec,
                glassfish-jmac-api (>= 1:2.1.1-b31g-2),
                javahelper,
@@ -18,7 +17,6 @@ Build-Depends: ant-optional,
                libjetty-java,
                libjstl1.1-java,
                libmaven-bundle-plugin-java,
-               libmaven-javadoc-plugin-java,
                libmockito-java,
                libservlet3.0-java (>= 7.0.40-2),
                libtomcat7-java (>= 7.0.56-1~),
@@ -32,7 +30,7 @@ Homepage: http://www.eclipse.org/jetty/
 Package: libjetty9-java
 Architecture: all
 Depends: ${misc:Depends}, libservlet3.0-java
-Suggests: jetty9, libjetty9-java-doc
+Suggests: jetty9
 Description: Java servlet engine and webserver -- core libraries
  Jetty is an Open Source HTTP Servlet Server written in 100% Java.
  It is designed to be light weight, high performance, embeddable,
@@ -41,20 +39,6 @@ Description: Java servlet engine and webserver -- core libraries
  .
  This package contains the core libraries
 
-Package: libjetty9-java-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: default-jdk-doc, libmail-java-doc, libservlet3.0-java-doc
-Suggests: libjetty9-java
-Description: Javadoc for the Jetty API
- Jetty is an Open Source HTTP Servlet Server written in 100% Java.
- It is designed to be light weight, high performance, embeddable,
- extensible and flexible, thus making it an ideal platform for serving
- dynamic HTTP requests from any Java application.
- .
- This package contains the Javadoc for libjetty9-java.
-
 Package: libjetty9-extra-java
 Architecture: all
 Depends: libasm4-java,
@@ -84,7 +68,6 @@ Depends: adduser,
          libjetty9-extra-java (>= ${source:Version}),
          ${misc:Depends}
 Recommends: authbind
-Suggests: libjetty9-java-doc (>= ${source:Version})
 Description: Java servlet engine and webserver
  Jetty is an Open Source HTTP Servlet Server written in 100% Java.
  It is designed to be light weight, high performance, embeddable,
diff --git a/debian/jetty9.links b/debian/jetty9.links
index 7c7d7a8..13a2802 100644
--- a/debian/jetty9.links
+++ b/debian/jetty9.links
@@ -4,4 +4,3 @@ etc/jetty9              usr/share/jetty9/etc
 etc/jetty9/contexts     usr/share/jetty9/contexts
 etc/jetty9/start.ini    usr/share/jetty9/start.ini
 etc/jetty9/policy       usr/share/jetty9/lib/policy
-usr/share/doc/libjetty9-java/api usr/share/jetty9/javadoc
diff --git a/debian/libjetty9-java-doc.doc-base b/debian/libjetty9-java-doc.doc-base
deleted file mode 100644
index cd35803..0000000
--- a/debian/libjetty9-java-doc.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libjetty9-java
-Title: API Javadoc for jetty
-Author: Mortbay Consulting
-Abstract: This is the API Javadoc provided by Jetty.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjetty9-java/api/index.html
-Files: /usr/share/doc/libjetty9-java/api/*
diff --git a/debian/libjetty9-java-doc.install b/debian/libjetty9-java-doc.install
deleted file mode 100644
index 611927e..0000000
--- a/debian/libjetty9-java-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-target/site/apidocs/* usr/share/doc/libjetty9-java/api
diff --git a/debian/patches/aggregate-doc.patch b/debian/patches/aggregate-doc.patch
deleted file mode 100644
index f7a11d4..0000000
--- a/debian/patches/aggregate-doc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Thu, 12 Apr 2012 22:46:39 +0200
-Subject: aggregate-doc
---- a/pom.xml
-+++ b/pom.xml
-@@ -330,6 +330,8 @@
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-javadoc-plugin</artifactId>
-           <configuration>
-+            <aggregate>true</aggregate>
-+            <outputDirectory>${project.build.directory}/api</outputDirectory>
-             <docfilessubdirs>true</docfilessubdirs>
-             <detectLinks>false</detectLinks>
-             <detectJavaApiLink>true</detectJavaApiLink>
diff --git a/debian/patches/series b/debian/patches/series
index ab91aaf..f49b3d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 maven-bundle-plugin-version.patch
-aggregate-doc.patch
diff --git a/debian/root-webapp/index.html b/debian/root-webapp/index.html
index 22076aa..981a950 100644
--- a/debian/root-webapp/index.html
+++ b/debian/root-webapp/index.html
@@ -19,7 +19,5 @@ Furthermore, as a pure java component, Jetty can be simply included in your
 application for demonstration, distribution or deployment. Jetty is available
 on all Java supported platforms.  </p>
 
-<P align="justify">
-You can also visit Jetty's <a href="javadoc/">Javadoc</a>
 </BODY>
 </HTML>

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