[pkg-java] r12597 - in trunk/libgnumail-java/debian: . patches

[Niels Thykier]

Author: nthykier-guest
Date: 2010-06-20 19:10:59 +0000 (Sun, 20 Jun 2010)
New Revision: 12597

Added:
   trunk/libgnumail-java/debian/patches/javadoc-link.patch
Modified:
   trunk/libgnumail-java/debian/changelog
   trunk/libgnumail-java/debian/control
   trunk/libgnumail-java/debian/patches/series
   trunk/libgnumail-java/debian/rules
Log:
Linked javadoc, removed unused jar from d/rules and swapped the Suggests.

Modified: trunk/libgnumail-java/debian/changelog
===================================================================
--- trunk/libgnumail-java/debian/changelog	2010-06-20 18:53:31 UTC (rev 12596)
+++ trunk/libgnumail-java/debian/changelog	2010-06-20 19:10:59 UTC (rev 12597)
@@ -10,6 +10,9 @@
   * Replaced classpath-doc dependency with default-jdk-doc and reduced
     it to a recommends.
   * Converted source format to 3.0 (quilt).
+  * Removed reference to xalan2.jar in the build, it was not used.
+  * Fixed two misplaced suggests.
+  * Linked the javadoc against system installed javadocs.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 20 Jun 2010 20:41:27 +0200
 

Modified: trunk/libgnumail-java/debian/control
===================================================================
--- trunk/libgnumail-java/debian/control	2010-06-20 18:53:31 UTC (rev 12596)
+++ trunk/libgnumail-java/debian/control	2010-06-20 19:10:59 UTC (rev 12597)
@@ -5,7 +5,8 @@
 Uploaders: Michael Koch <konqueror at gmx.de>,
            Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), ant
-Build-Depends-Indep: default-jdk, libgnujaf-java, libgnuinet-java
+Build-Depends-Indep: default-jdk, libgnujaf-java, libgnuinet-java,
+ default-jdk-doc
 Standards-Version: 3.8.4
 Homepage: http://savannah.gnu.org/projects/classpathx
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgnumail-java
@@ -14,7 +15,7 @@
 Package: libgnumail-java
 Architecture: all
 Depends: libgnujaf-java, libgnuinet-java, ${misc:Depends}
-Suggests: libgnumail-java-doc
+Suggests: libgnumail-java
 Description: free implementation of the javamail API
  The javamail API provides abstract classes that model a mail 
  system. With the GNU free implementation of the javamail API, you can 
@@ -25,8 +26,8 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Recommends: default-jdk-doc
-Suggests: libgnumail-java
+Recommends: default-jdk-doc, libgnujaf-java, libgnuinet-java
+Suggests: libgnumail-java-doc
 Description: free implementation of the javamail API (Javadocs)
  The javamail API provides abstract classes that model a mail 
  system. With the GNU free implementation of the javamail API, you can 

Added: trunk/libgnumail-java/debian/patches/javadoc-link.patch
===================================================================
--- trunk/libgnumail-java/debian/patches/javadoc-link.patch	                        (rev 0)
+++ trunk/libgnumail-java/debian/patches/javadoc-link.patch	2010-06-20 19:10:59 UTC (rev 12597)
@@ -0,0 +1,14 @@
+Description: Links against system installed javadocs.
+
+--- a/build.xml	2010-06-20 20:54:48.576950829 +0200
++++ b/build.xml	2010-06-20 20:57:01.173018761 +0200
+@@ -229,6 +229,9 @@
+         <include name='gnu/mail/providers/mbox'/>
+         <include name='gnu/mail/providers/maildir'/>
+       </packageset>
++      <link href="/usr/share/doc/default-jdk-doc/api" />
++      <link href="/usr/share/doc/libgnuinet-java" />
++      <link href="/usr/share/doc/libgnujaf-java/apidoc" />
+     </javadoc>
+   </target>
+   

Modified: trunk/libgnumail-java/debian/patches/series
===================================================================
--- trunk/libgnumail-java/debian/patches/series	2010-06-20 18:53:31 UTC (rev 12596)
+++ trunk/libgnumail-java/debian/patches/series	2010-06-20 19:10:59 UTC (rev 12597)
@@ -1,2 +1,3 @@
 01_fix_classpath.patch
 gnumail-imaps.patch
+javadoc-link.patch

Modified: trunk/libgnumail-java/debian/rules
===================================================================
--- trunk/libgnumail-java/debian/rules	2010-06-20 18:53:31 UTC (rev 12596)
+++ trunk/libgnumail-java/debian/rules	2010-06-20 19:10:59 UTC (rev 12597)
@@ -6,7 +6,7 @@
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-trax xalan2 inetlib
+DEB_JARS             := ant-trax inetlib
 DEB_ANT_BUILD_TARGET := dist javadoc
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) \
                         -Dgnumail.jar=gnumail-$(VERSION).jar -Dproviders.jar=gnumail-providers-$(VERSION).jar \