[pkg-java] r12595 - trunk/jetty/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2010-06-20 18:27:46 +0000 (Sun, 20 Jun 2010)
New Revision: 12595

Modified:
   trunk/jetty/debian/changelog
   trunk/jetty/debian/compat
   trunk/jetty/debian/control
   trunk/jetty/debian/module.xml
Log:
Bumped dh compat to 7 and linked against some system javadocs.

Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog	2010-06-20 17:44:35 UTC (rev 12594)
+++ trunk/jetty/debian/changelog	2010-06-20 18:27:46 UTC (rev 12595)
@@ -4,6 +4,9 @@
     of jetty.
   * Remove all use of sudo in jetty.init. (Closes: #580639)
   * Fixed some formatting issues in the NEWS file.
+  * Bumped debhelper compat to 7.
+  * Made the javadoc link against system javadocs. This includes adding
+    Recommends on various java-doc packages.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 20 Jun 2010 14:49:32 +0200
 

Modified: trunk/jetty/debian/compat
===================================================================
--- trunk/jetty/debian/compat	2010-06-20 17:44:35 UTC (rev 12594)
+++ trunk/jetty/debian/compat	2010-06-20 18:27:46 UTC (rev 12595)
@@ -1 +1 @@
-6
+7

Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control	2010-06-20 17:44:35 UTC (rev 12594)
+++ trunk/jetty/debian/control	2010-06-20 18:27:46 UTC (rev 12595)
@@ -5,10 +5,10 @@
 Uploaders: Michael Koch <konqueror at gmx.de>, Thierry Carrez <thierry.carrez at ubuntu.com>,
  Ludovic Claude <ludovic.claude at laposte.net>, Torsten Werner <twerner at debian.org>,
  Niels Thykier <niels at thykier.net>, Pablo Duboue <pablo.duboue at gmail.com>
-Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), default-jdk, ant-optional, maven-repo-helper,
+Build-Depends: debhelper (>= 7), cdbs (>> 0.4.5.3), default-jdk, ant-optional, maven-repo-helper,
  libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java,
  libgnujaf-java, libcommons-daemon-java, junit, libgeronimo-jta-1.0.1b-spec-java,
- libtomcat6-java
+ libtomcat6-java, default-jdk-doc, libgnumail-java-doc, libservlet2.5-java-doc
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jetty
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jetty
@@ -28,6 +28,7 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
+Recommends: default-jdk-doc, libgnumail-java-doc, libservlet2.5-java-doc
 Suggests: libjetty-java
 Description: Javadoc for the Jetty API
  Jetty is an Open Source HTTP Servlet Server written in 100% Java.

Modified: trunk/jetty/debian/module.xml
===================================================================
--- trunk/jetty/debian/module.xml	2010-06-20 17:44:35 UTC (rev 12594)
+++ trunk/jetty/debian/module.xml	2010-06-20 18:27:46 UTC (rev 12595)
@@ -18,6 +18,9 @@
        <classpath>
          <path refid="classpath"/>
        </classpath>
+       <link href="/usr/share/doc/default-jdk-doc/api/" />
+       <link href="/usr/share/doc/libgnumail-java/api/" />
+       <link href="/usr/share/doc/libservlet2.5-java/api/" />
        <sourcepath>
          <pathelement path="${src.dir}"/>
        </sourcepath>