Author: doko
Date: 2008-07-31 11:29:58 +0000 (Thu, 31 Jul 2008)
New Revision: 6825
Added:
trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.install
trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.links
Modified:
trunk/libservlet2.4-java/debian/changelog
trunk/libservlet2.4-java/debian/control
trunk/libservlet2.4-java/debian/docs
trunk/libservlet2.4-java/debian/examples
trunk/libservlet2.4-java/debian/rules
Log:
* Depend on default-jre-headless.
* Merge from Ubuntu:
- Move examples and documentation into a new libservlet2.4-java-doc package.
Modified: trunk/libservlet2.4-java/debian/changelog
===================================================================
--- trunk/libservlet2.4-java/debian/changelog 2008-07-31 11:23:52 UTC (rev
6824)
+++ trunk/libservlet2.4-java/debian/changelog 2008-07-31 11:29:58 UTC (rev
6825)
@@ -1,3 +1,11 @@
+libservlet2.4-java (5.0.30-9) UNRELEASED; urgency=low
+
+ * Depend on default-jre-headless.
+ * Merge from Ubuntu:
+ - Move examples and documentation into a new libservlet2.4-java-doc
package.
+
+ -- Matthias Klose <[EMAIL PROTECTED]> Thu, 31 Jul 2008 11:25:53 +0000
+
libservlet2.4-java (5.0.30-8) unstable; urgency=low
* Build-Depend on default-jdk-builddep. Closes: #477888
Modified: trunk/libservlet2.4-java/debian/control
===================================================================
--- trunk/libservlet2.4-java/debian/control 2008-07-31 11:23:52 UTC (rev
6824)
+++ trunk/libservlet2.4-java/debian/control 2008-07-31 11:29:58 UTC (rev
6825)
@@ -8,9 +8,9 @@
Package: libservlet2.4-java
Architecture: all
-Depends: gij | java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
Suggests: libservlet2.4-java-gcj
-Description: Servlet 2.4 and JSP 2.0 Java classes and documentation
+Description: Servlet 2.4 and JSP 2.0 Java library.
For more information about Java servlets please take a look at the Tomcat
home page at http://jakarta.apache.org/tomcat/index.html.
.
@@ -25,3 +25,15 @@
home page at http://jakarta.apache.org/tomcat/index.html.
.
This package contains the natively compiled code for use by gij.
+
+Package: libservlet2.4-java-doc
+Architecture: all
+Section: doc
+Replaces: libservlet2.4-java (<< 5.0.30-5ubuntu1)
+Suggests: libservlet2.4-java
+Description: Servlet 2.4 and JSP 2.0 Java documentation
+ For more information about Java servlets please take a look at the Tomcat
+ home page at http://jakarta.apache.org/tomcat/index.html.
+ .
+ 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/.
Modified: trunk/libservlet2.4-java/debian/docs
===================================================================
--- trunk/libservlet2.4-java/debian/docs 2008-07-31 11:23:52 UTC (rev
6824)
+++ trunk/libservlet2.4-java/debian/docs 2008-07-31 11:29:58 UTC (rev
6825)
@@ -1,3 +1 @@
jsr154/README.txt
-tmp/dist-jsp/docs/api-jsp
-tmp/dist-servlet-api/docs/api-servlet
Modified: trunk/libservlet2.4-java/debian/examples
===================================================================
--- trunk/libservlet2.4-java/debian/examples 2008-07-31 11:23:52 UTC (rev
6824)
+++ trunk/libservlet2.4-java/debian/examples 2008-07-31 11:29:58 UTC (rev
6825)
@@ -1,2 +0,0 @@
-tmp/dist-jsp/examples/examples-jsp.war
-tmp/dist-servlet-api/examples/examples-servlet.war
Added: trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.install
===================================================================
--- trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.install
(rev 0)
+++ trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.install
2008-07-31 11:29:58 UTC (rev 6825)
@@ -0,0 +1,4 @@
+tmp/dist-jsp/docs/api-jsp
usr/share/doc/libservlet2.4-java/
+tmp/dist-servlet-api/docs/api-servlet
usr/share/doc/libservlet2.4-java/
+tmp/dist-jsp/examples/examples-jsp.war
usr/share/doc/libservlet2.4-java/examples/
+tmp/dist-servlet-api/examples/examples-servlet.war
usr/share/doc/libservlet2.4-java/examples/
Added: trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.links
===================================================================
--- trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.links
(rev 0)
+++ trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.links
2008-07-31 11:29:58 UTC (rev 6825)
@@ -0,0 +1,3 @@
+usr/share/doc/libservlet2.4-java/api-js
usr/share/doc/libservlet2.4-java-doc/api-jsp
+usr/share/doc/libservlet2.4-java/api-servlet
usr/share/doc/libservlet2.4-java-doc/api-servlet
+usr/share/doc/libservlet2.4-java/examples
usr/share/doc/libservlet2.4-java-doc/examples
Modified: trunk/libservlet2.4-java/debian/rules
===================================================================
--- trunk/libservlet2.4-java/debian/rules 2008-07-31 11:23:52 UTC (rev
6824)
+++ trunk/libservlet2.4-java/debian/rules 2008-07-31 11:29:58 UTC (rev
6825)
@@ -37,6 +37,7 @@
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
+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
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
