[pkg-java] r12731 - in trunk/libservlet2.4-java/debian: . patches

Niels Thykier nthykier-guest at alioth.debian.org
Wed Jul 7 16:20:39 UTC 2010 

Author: nthykier-guest
Date: 2010-07-07 16:20:36 +0000 (Wed, 07 Jul 2010)
New Revision: 12731

Added:
   trunk/libservlet2.4-java/debian/patches/javadoc-link.patch
Modified:
   trunk/libservlet2.4-java/debian/changelog
   trunk/libservlet2.4-java/debian/control
   trunk/libservlet2.4-java/debian/patches/series
   trunk/libservlet2.4-java/debian/rules
Log:
libservlet2.4-java (5.0.30-13) UNRELEASED; urgency=low

  * Replaced B-D on default-jdk-builddep with default-jdk and
    gcj-native-helper.
  * Removed Depends on JREs for library packages - no longer required.
  * Bumped Standards-Versions to 3.9.0 - no changes required.
  * Removed Arnaud Vandyck from uploaders - thanks for your work on
    this package in the past.
  * Link javadoc to system javadocs.
  * Provide and replace libservlet2.3-java.

 -- Niels Thykier <niels at thykier.net>  Wed, 07 Jul 2010 17:37:47 +0200


Modified: trunk/libservlet2.4-java/debian/changelog
===================================================================
--- trunk/libservlet2.4-java/debian/changelog	2010-07-05 20:31:43 UTC (rev 12730)
+++ trunk/libservlet2.4-java/debian/changelog	2010-07-07 16:20:36 UTC (rev 12731)
@@ -1,3 +1,16 @@
+libservlet2.4-java (5.0.30-13) UNRELEASED; urgency=low
+
+  * Replaced B-D on default-jdk-builddep with default-jdk and
+    gcj-native-helper.
+  * Removed Depends on JREs for library packages - no longer required.
+  * Bumped Standards-Versions to 3.9.0 - no changes required.
+  * Removed Arnaud Vandyck from uploaders - thanks for your work on
+    this package in the past.
+  * Link javadoc to system javadocs.
+  * Provide and replace libservlet2.3-java.
+
+ -- Niels Thykier <niels at thykier.net>  Wed, 07 Jul 2010 17:37:47 +0200
+
 libservlet2.4-java (5.0.30-12) unstable; urgency=low
 
   * Change Build-Depends: ant1.7 because gij fails with bus error when

Modified: trunk/libservlet2.4-java/debian/control
===================================================================
--- trunk/libservlet2.4-java/debian/control	2010-07-05 20:31:43 UTC (rev 12730)
+++ trunk/libservlet2.4-java/debian/control	2010-07-07 16:20:36 UTC (rev 12731)
@@ -2,20 +2,22 @@
 Priority: optional
 Section: java
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>,
+Uploaders: Michael Koch <konqueror at gmx.de>,
  Niels Thykier <niels at thykier.net>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk-builddep, ant1.7, maven-repo-helper
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, gcj-native-helper, ant1.7, maven-repo-helper
+Build-Depends-Indep: default-jdk-doc
+Standards-Version: 3.9.0
 Homepage: http://jakarta.apache.org/tomcat/index.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libservlet2.4-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libservlet2.4-java
 
 Package: libservlet2.4-java
 Architecture: all
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless |
-         java5-runtime-headless | java6-runtime-headless,
-         ${misc:Depends}
+Depends: ${misc:Depends}
 Suggests: libservlet2.4-java-gcj
+Conflicts: libservlet2.3-java
+Provides: libservlet2.3-java
+Replaces: libservlet2.3-java
 Description: Servlet 2.4 and JSP 2.0 Java library
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
@@ -40,6 +42,7 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
+Recommends: default-jdk-doc
 Replaces: libservlet2.4-java (<< 5.0.30-5ubuntu1)
 Suggests: libservlet2.4-java
 Description: Servlet 2.4 and JSP 2.0 Java documentation

Added: trunk/libservlet2.4-java/debian/patches/javadoc-link.patch
===================================================================
--- trunk/libservlet2.4-java/debian/patches/javadoc-link.patch	                        (rev 0)
+++ trunk/libservlet2.4-java/debian/patches/javadoc-link.patch	2010-07-07 16:20:36 UTC (rev 12731)
@@ -0,0 +1,29 @@
+Description: Link javadoc against system javadoc
+Author: Niels Thykier <niels at thykier.net>
+
+--- a/jsr152/build.xml	2010-07-07 17:56:40.368937457 +0200
++++ b/jsr152/build.xml	2010-07-07 17:57:09.252942815 +0200
+@@ -102,7 +102,9 @@
+              use="true"
+              windowtitle="JavaServer Pages API Documentation"
+              doctitle="JavaServer Pages API Documentation"
+-             bottom="Copyright &amp;copy; 1999-2002 The Apache Software Foundation.  All Rights Reserved."/>
++             bottom="Copyright &amp;copy; 1999-2002 The Apache Software Foundation.  All Rights Reserved.">
++      <link href="/usr/share/doc/default-jdk-doc/api" />
++    </javadoc>
+ 
+   </target>
+ 
+--- a/jsr154/build.xml	2010-07-07 17:57:45.896951882 +0200
++++ b/jsr154/build.xml	2010-07-07 17:58:29.860935203 +0200
+@@ -93,7 +93,9 @@
+              use="true"
+              windowtitle="Servlet API Documentation"
+              doctitle="Servlet API Documentation"
+-             bottom="Copyright &amp;copy; 1999-2002 The Apache Software Foundation.  All Rights Reserved."/>
++             bottom="Copyright &amp;copy; 1999-2002 The Apache Software Foundation.  All Rights Reserved.">
++      <link href="/usr/share/doc/default-jdk-doc/api" />
++    </javadoc>
+ 
+   </target>
+ 

Modified: trunk/libservlet2.4-java/debian/patches/series
===================================================================
--- trunk/libservlet2.4-java/debian/patches/series	2010-07-05 20:31:43 UTC (rev 12730)
+++ trunk/libservlet2.4-java/debian/patches/series	2010-07-07 16:20:36 UTC (rev 12731)
@@ -1,3 +1,4 @@
 cve-2007-4724.patch
 jsp-api-OSGi.patch
 servlet-api-OSGi.patch
+javadoc-link.patch

Modified: trunk/libservlet2.4-java/debian/rules
===================================================================
--- trunk/libservlet2.4-java/debian/rules	2010-07-05 20:31:43 UTC (rev 12730)
+++ trunk/libservlet2.4-java/debian/rules	2010-07-07 16:20:36 UTC (rev 12731)
@@ -30,6 +30,7 @@
 	ln -s jsp-api-2.0.jar debian/$(cdbs_curpkg)/usr/share/java/jsp-api.jar
 	install -m 644 tmp/dist-servlet-api/lib/servlet-api.jar debian/$(cdbs_curpkg)/usr/share/java/servlet-api-2.4.jar
 	ln -s servlet-api-2.4.jar debian/$(cdbs_curpkg)/usr/share/java/servlet-api.jar
+	ln -s servlet-api-2.4.jar debian/$(cdbs_curpkg)/usr/share/java/servlet-api-2.3.jar
 	mh_installpom -plibservlet2.4-java $(CURDIR)/debian/pom.xml
 	mh_installjar -plibservlet2.4-java -l $(CURDIR)/debian/pom.xml \
 		tmp/dist-servlet-api/lib/servlet-api.jar

More information about the pkg-java-commits mailing list