diff -u libservlet2.4-java-5.0.30/debian/rules libservlet2.4-java-5.0.30/debian/rules --- libservlet2.4-java-5.0.30/debian/rules +++ libservlet2.4-java-5.0.30/debian/rules @@ -33,10 +33,9 @@ install/libservlet2.4-java:: install -m 644 tmp/dist-jsp/lib/jsp-api.jar debian/$(cdbs_curpkg)/usr/share/java/jsp-api-2.0.jar - 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 +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 diff -u libservlet2.4-java-5.0.30/debian/control libservlet2.4-java-5.0.30/debian/control --- libservlet2.4-java-5.0.30/debian/control +++ libservlet2.4-java-5.0.30/debian/control @@ -1,6 +1,7 @@ Source: libservlet2.4-java Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Arnaud Vandyck , Michael Koch Build-Depends: debhelper (>= 4.2.30), cdbs, default-jdk-builddep, ant Standards-Version: 3.7.3 @@ -8,9 +9,9 @@ Package: libservlet2.4-java Architecture: all -Depends: gij | java-gcj-compat | java1-runtime | java2-runtime +Depends: default-jre-headless | java-gcj-compat | java1-runtime | java2-runtime 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. . @@ -27,0 +29,12 @@ + +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/. diff -u libservlet2.4-java-5.0.30/debian/changelog libservlet2.4-java-5.0.30/debian/changelog --- libservlet2.4-java-5.0.30/debian/changelog +++ libservlet2.4-java-5.0.30/debian/changelog @@ -1,3 +1,20 @@ +libservlet2.4-java (5.0.30-8ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #233958) + - Set Ubuntu maintainer address. + - Move examples and documentation into a new libservlet2.4-java-doc + + [ Onkar Shinde ] + - debian/control + * Change dependency 'gij' to 'default-jre-headless'. + + [ Loris-Guillaume Minoia ] + - debian/libservlet2.4-java.{postinst,prerm},rules + * Use alternatives for /usr/share/java/{servlet,jsp}-api.jar instead of + links. (LP: #198130) + + -- Onkar Shinde Thu, 22 May 2008 14:23:49 +0530 + libservlet2.4-java (5.0.30-8) unstable; urgency=low * Build-Depend on default-jdk-builddep. Closes: #477888 @@ -13,12 +30,27 @@ -- Michael Koch Tue, 19 Feb 2008 23:14:46 +0100 +libservlet2.4-java (5.0.30-6ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining changes are: + + Move examples and documentation into a new libservlet2.4-java-doc package. + + Set Ubuntu maintainer address. + + -- Michael Bienia Mon, 08 Oct 2007 21:52:46 +0200 + libservlet2.4-java (5.0.30-6) unstable; urgency=low * Fix XSS bug (CVE-2007-4724) in cal2.jsp. -- Michael Koch Sat, 06 Oct 2007 23:50:14 +0200 +libservlet2.4-java (5.0.30-5ubuntu1) gutsy; urgency=low + + * Move examples and documentation into a new libservlet2.4-java-doc package. + * Set Ubuntu maintainer address. + + -- Matthias Klose Fri, 05 Oct 2007 10:59:47 +0200 + libservlet2.4-java (5.0.30-5) unstable; urgency=low * Build a libservlet2.4-java-gcj package. reverted: --- libservlet2.4-java-5.0.30/debian/examples +++ libservlet2.4-java-5.0.30.orig/debian/examples @@ -1,2 +0,0 @@ -tmp/dist-jsp/examples/examples-jsp.war -tmp/dist-servlet-api/examples/examples-servlet.war diff -u libservlet2.4-java-5.0.30/debian/docs libservlet2.4-java-5.0.30/debian/docs --- libservlet2.4-java-5.0.30/debian/docs +++ libservlet2.4-java-5.0.30/debian/docs @@ -2,2 +1,0 @@ -tmp/dist-jsp/docs/api-jsp -tmp/dist-servlet-api/docs/api-servlet only in patch2: unchanged: --- libservlet2.4-java-5.0.30.orig/debian/libservlet2.4-java-doc.links +++ libservlet2.4-java-5.0.30/debian/libservlet2.4-java-doc.links @@ -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 only in patch2: unchanged: --- libservlet2.4-java-5.0.30.orig/debian/libservlet2.4-java.prerm +++ libservlet2.4-java-5.0.30/debian/libservlet2.4-java.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +case "$1" in + remove|upgrade|deconfigure) + update-alternatives --remove servlet-api /usr/share/java/servlet-api-2.4.jar + ;; +esac + +#DEBHELPER# + only in patch2: unchanged: --- libservlet2.4-java-5.0.30.orig/debian/libservlet2.4-java.postinst +++ libservlet2.4-java-5.0.30/debian/libservlet2.4-java.postinst @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + update-alternatives --install \ + /usr/share/java/servlet-api.jar servlet-api /usr/share/java/servlet-api-2.4.jar 2420 \ + --slave /usr/share/java/jsp-api.jar jsp-api /usr/share/java/jsp-api-2.0.jar + ;; +esac + +#DEBHELPER# only in patch2: unchanged: --- libservlet2.4-java-5.0.30.orig/debian/libservlet2.4-java-doc.install +++ libservlet2.4-java-5.0.30/debian/libservlet2.4-java-doc.install @@ -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/