Author: nthykier-guest Date: 2009-11-25 11:59:43 +0000 (Wed, 25 Nov 2009) New Revision: 11124
Added: trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.doc-base.1 trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.doc-base.2 trunk/libservlet2.4-java/debian/patches/jsp-api-OSGi.patch trunk/libservlet2.4-java/debian/patches/series trunk/libservlet2.4-java/debian/patches/servlet-api-OSGi.patch trunk/libservlet2.4-java/debian/source/ trunk/libservlet2.4-java/debian/source/format Modified: trunk/libservlet2.4-java/debian/changelog trunk/libservlet2.4-java/debian/patches/cve-2007-4724.patch trunk/libservlet2.4-java/debian/rules Log: [Niels Thykier] ... * Removed unused parts of the rules file. * Added OSGi metadata to the manifests. * Converted to source format to 3.0 (quilt). - Updated existing patch to apply correctly when using quilt. * Added short description to existing patch. Modified: trunk/libservlet2.4-java/debian/changelog =================================================================== --- trunk/libservlet2.4-java/debian/changelog 2009-11-24 23:05:51 UTC (rev 11123) +++ trunk/libservlet2.4-java/debian/changelog 2009-11-25 11:59:43 UTC (rev 11124) @@ -19,6 +19,11 @@ the previous. * Added a clause clarifying that the "doc" package only contains the java API. + * Removed unused parts of the rules file. + * Added OSGi metadata to the manifests. + * Converted to source format to 3.0 (quilt). + - Updated existing patch to apply correctly when using quilt. + * Added short description to existing patch. -- Niels Thykier <ni...@thykier.net> Tue, 24 Nov 2009 23:45:17 +0100 Added: trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.doc-base.1 =================================================================== --- trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.doc-base.1 (rev 0) +++ trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.doc-base.1 2009-11-25 11:59:43 UTC (rev 11124) @@ -0,0 +1,10 @@ +Document: libservlet2.4-servlet-api +Title: Javadoc for servlet +Author: Jakarta Apache Group +Abstract: The javadoc API for the Apache Tomcat + servlet implementation. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libservlet2.4-java/api-servlet/index.html +Files: /usr/share/doc/libservlet2.4-java/api-servlet/* Added: trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.doc-base.2 =================================================================== --- trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.doc-base.2 (rev 0) +++ trunk/libservlet2.4-java/debian/libservlet2.4-java-doc.doc-base.2 2009-11-25 11:59:43 UTC (rev 11124) @@ -0,0 +1,10 @@ +Document: libservlet2.4-servlet-jsp +Title: Javadoc for servlet +Author: Jakarta Apache Group +Abstract: The javadoc API for the Apache Tomcat + JavaServer Pages implementation. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libservlet2.4-java/api-jsp/index.html +Files: /usr/share/doc/libservlet2.4-java/api-jsp/* Modified: trunk/libservlet2.4-java/debian/patches/cve-2007-4724.patch =================================================================== --- trunk/libservlet2.4-java/debian/patches/cve-2007-4724.patch 2009-11-24 23:05:51 UTC (rev 11123) +++ trunk/libservlet2.4-java/debian/patches/cve-2007-4724.patch 2009-11-25 11:59:43 UTC (rev 11124) @@ -1,5 +1,7 @@ ---- ./jsr152/examples/cal/cal2.jsp.orig 2007-10-06 23:46:52.000000000 +0200 -+++ ./jsr152/examples/cal/cal2.jsp 2007-10-06 23:48:07.000000000 +0200 +Description: Fixes CVE-2007-4724. + +--- a/jsr152/examples/cal/cal2.jsp 2007-10-06 23:46:52.000000000 +0200 ++++ b/jsr152/examples/cal/cal2.jsp 2007-10-06 23:48:07.000000000 +0200 @@ -29,7 +29,7 @@ <FONT SIZE=5> Please add the following event: Added: trunk/libservlet2.4-java/debian/patches/jsp-api-OSGi.patch =================================================================== --- trunk/libservlet2.4-java/debian/patches/jsp-api-OSGi.patch (rev 0) +++ trunk/libservlet2.4-java/debian/patches/jsp-api-OSGi.patch 2009-11-25 11:59:43 UTC (rev 11124) @@ -0,0 +1,21 @@ +Description: Adds OSGi metadata needed by eclipse. + +--- a/jsr152/src/etc/manifest 2009-11-25 11:11:59.369284527 +0100 ++++ b/jsr152/src/etc/manifest 2009-11-25 11:12:37.922284170 +0100 +@@ -7,4 +7,15 @@ + Implementation-Title: javax.servlet.jsp + Implementation-Version: 2...@implementation.revision@ + Implementation-Vendor: Apache Software Foundation +- ++Import-Package: javax.servlet; version=2.4,javax.servlet.http; version ++ =2.4,javax.servlet.resources; version=2.4 ++Bundle-ManifestVersion: 2 ++Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; v ++ ersion=2.0,javax.servlet.jsp.resources; version=2.0,javax.servlet.jsp ++ .tagext; version=2.0 ++Bundle-Version: 2.0.0.v200806031607 ++Bundle-SymbolicName: javax.servlet.jsp ++Bundle-Name: Java Server Pages API Bundle ++Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 ++Bundle-Localization: plugin ++Bundle-Vendor: Apache Software Foundation Added: trunk/libservlet2.4-java/debian/patches/series =================================================================== --- trunk/libservlet2.4-java/debian/patches/series (rev 0) +++ trunk/libservlet2.4-java/debian/patches/series 2009-11-25 11:59:43 UTC (rev 11124) @@ -0,0 +1,3 @@ +cve-2007-4724.patch +jsp-api-OSGi.patch +servlet-api-OSGi.patch Added: trunk/libservlet2.4-java/debian/patches/servlet-api-OSGi.patch =================================================================== --- trunk/libservlet2.4-java/debian/patches/servlet-api-OSGi.patch (rev 0) +++ trunk/libservlet2.4-java/debian/patches/servlet-api-OSGi.patch 2009-11-25 11:59:43 UTC (rev 11124) @@ -0,0 +1,18 @@ +Description: Adds OSGi metadata needed by eclipse. + +--- a/jsr154/src/etc/manifest 2009-11-25 11:05:45.854282997 +0100 ++++ b/jsr154/src/etc/manifest 2009-11-25 11:09:51.062283823 +0100 +@@ -7,4 +7,12 @@ + Implementation-Title: javax.servlet + Implementation-Version: 2...@implementation.revision@ + Implementation-Vendor: Apache Software Foundation +- ++Bundle-ManifestVersion: 2 ++Export-Package: javax.servlet;version="2.4",javax.servlet.http;version ++ ="2.4",javax.servlet.resources;version="2.4" ++Bundle-Version: 2.4.0.v200806031604 ++Bundle-SymbolicName: javax.servlet ++Bundle-Name: Servlet API Bundle ++Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 ++Bundle-Localization: plugin ++Bundle-Vendor: Apache Software Foundation Modified: trunk/libservlet2.4-java/debian/rules =================================================================== --- trunk/libservlet2.4-java/debian/rules 2009-11-24 23:05:51 UTC (rev 11123) +++ trunk/libservlet2.4-java/debian/rules 2009-11-25 11:59:43 UTC (rev 11124) @@ -10,7 +10,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/gcj/debian_defaults ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) @@ -23,12 +22,6 @@ DEB_ANT_BUILDFILE := debian/build.xml ANT_OPTS = -Dant.build.javac.source=1.4 -# Additional options to pass to the Java virtual machine -#ANT_OPTS := -verify * - -# Additional command-line arguments for Ant -#ANT_ARGS := -verbose - LIBRARY_PACKAGE := servlet API_VERSION := 2.4 @@ -43,13 +36,7 @@ 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 -# mkdir debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples -# install -m 664 tmp/dist-jsp/examples/examples.war debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/examples-jsp.war -# install -m 664 tmp/dist-servlet-api/examples/examples.war debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/examples-servlet.war -# install -m 664 tmp/dist-jsp/docs/api debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/api-jsp -# install -m 664 tmp/dist-servlet-api/docs/api debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/api-servlet - ifeq ($(with_gcj_native),yes) install/libservlet2.4-java-gcj:: install/libservlet2.4-java dh_nativejava -plibservlet2.4-java-gcj Added: trunk/libservlet2.4-java/debian/source/format =================================================================== --- trunk/libservlet2.4-java/debian/source/format (rev 0) +++ trunk/libservlet2.4-java/debian/source/format 2009-11-25 11:59:43 UTC (rev 11124) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits