[pkg-java] r15956 - trunk/libservlet2.4-java/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2012-04-17 04:11:23 +0000 (Tue, 17 Apr 2012)
New Revision: 15956

Modified:
   trunk/libservlet2.4-java/debian/changelog
   trunk/libservlet2.4-java/debian/control
   trunk/libservlet2.4-java/debian/rules
Log:
Reverting previous commit and going back to revision 14767

Modified: trunk/libservlet2.4-java/debian/changelog
===================================================================
--- trunk/libservlet2.4-java/debian/changelog	2012-04-17 04:02:59 UTC (rev 15955)
+++ trunk/libservlet2.4-java/debian/changelog	2012-04-17 04:11:23 UTC (rev 15956)
@@ -1,15 +1,3 @@
-libservlet2.4-java (5.5.33-2) UNRELEASED; urgency=low
-
-  * Team upload.
-  * Reintroduce this package in the archive to provide a proper transition
-    from libservlet2.4-java to libservlet2.5-java.
-  * Bump Standards-Version to 3.9.3. No changes were provided.
-  * Drop -doc package since it is not needed anymore.
-  * Remove Michael Koch <konqueror at gmx.de> from Uploaders list.
-    Thank you work on this package.
-
- -- Miguel Landaeta <miguel at miguel.cc>  Mon, 16 Apr 2012 19:00:15 -0430
-
 libservlet2.4-java (5.5.33-1) unstable; urgency=low
 
   * Team upload

Modified: trunk/libservlet2.4-java/debian/control
===================================================================
--- trunk/libservlet2.4-java/debian/control	2012-04-17 04:02:59 UTC (rev 15955)
+++ trunk/libservlet2.4-java/debian/control	2012-04-17 04:11:23 UTC (rev 15956)
@@ -2,20 +2,41 @@
 Priority: optional
 Section: java
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Niels Thykier <niels at thykier.net>
+Uploaders: Michael Koch <konqueror at gmx.de>,
+ Niels Thykier <niels at thykier.net>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, maven-repo-helper
 Build-Depends-Indep: default-jdk-doc
-Standards-Version: 3.9.3
+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: ${misc:Depends}, libservlet2.5-java
-Description: Servlet 2.4 and JSP 2.0 Java library transitional package
- Package to ease upgrading from older Servlet 2.4 library packages to the new
- Servlet 2.5 package.
+Depends: ${misc:Depends}
+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
+ server environment for Java code to run. Tomcat 5.5 is the reference
+ implementation for the Java Servlet 2.4 and JavaServer Pages 2.0 technologies.
  .
- This package can be purged at anytime once the libservlet2.5-java package has
- been installed.
+ The official Servlet 2.4 and JSP 2.0 specifications can be found at
+ http://java.sun.com/products/servlet/ and http://java.sun.com/products/jsp/.
+
+Package: libservlet2.4-java-doc
+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
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run. Tomcat 5.5 is the reference
+ implementation for the Java Servlet 2.4 and JavaServer Pages 2.0 technologies.
+ .
+ The official Servlet 2.4 and JSP 2.0 specifications can be found at
+ http://java.sun.com/products/servlet/ and http://java.sun.com/products/jsp/.
+ .
+ This package contains the java API documentation.

Modified: trunk/libservlet2.4-java/debian/rules
===================================================================
--- trunk/libservlet2.4-java/debian/rules	2012-04-17 04:02:59 UTC (rev 15955)
+++ trunk/libservlet2.4-java/debian/rules	2012-04-17 04:11:23 UTC (rev 15956)
@@ -18,6 +18,18 @@
 LIBRARY_PACKAGE := servlet
 API_VERSION     := 2.4
 
+install/libservlet2.4-java::
+	install -m 644 -D tmp/dist-jsp/lib/jsp-api.jar debian/$(cdbs_curpkg)/usr/share/java/jsp-api-2.0.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
+
+install/libservlet2.4-java-doc::
+	mv tmp/dist-jsp/docs/api tmp/dist-jsp/docs/api-jsp
+	mv tmp/dist-servlet-api/docs/api tmp/dist-servlet-api/docs/api-servlet
+	mv tmp/dist-jsp/examples/examples.war tmp/dist-jsp/examples/examples-jsp.war
+	mv tmp/dist-servlet-api/examples/examples.war tmp/dist-servlet-api/examples/examples-servlet.war
+
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download