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

[Niels Thykier]

Author: nthykier-guest
Date: 2009-12-10 10:02:17 +0000 (Thu, 10 Dec 2009)
New Revision: 11220

Modified:
   trunk/libservlet2.4-java/debian/changelog
   trunk/libservlet2.4-java/debian/patches/jsp-api-OSGi.patch
   trunk/libservlet2.4-java/debian/patches/servlet-api-OSGi.patch
Log:
Corrected OSGi metadata

Modified: trunk/libservlet2.4-java/debian/changelog
===================================================================
--- trunk/libservlet2.4-java/debian/changelog	2009-12-09 22:49:41 UTC (rev 11219)
+++ trunk/libservlet2.4-java/debian/changelog	2009-12-10 10:02:17 UTC (rev 11220)
@@ -1,3 +1,9 @@
+libservlet2.4-java (5.0.30-10) unstable; urgency=low
+
+  * Corrected the placement of the OSGi metadata in the manifest.
+
+ -- Niels Thykier <niels at thykier.net>  Thu, 10 Dec 2009 11:02:03 +0100
+
 libservlet2.4-java (5.0.30-9) unstable; urgency=low
 
   [ Matthias Klose ]

Modified: trunk/libservlet2.4-java/debian/patches/jsp-api-OSGi.patch
===================================================================
--- trunk/libservlet2.4-java/debian/patches/jsp-api-OSGi.patch	2009-12-09 22:49:41 UTC (rev 11219)
+++ trunk/libservlet2.4-java/debian/patches/jsp-api-OSGi.patch	2009-12-10 10:02:17 UTC (rev 11220)
@@ -1,12 +1,7 @@
-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.0. at implementation.revision@
- Implementation-Vendor: Apache Software Foundation
--
+--- a/jsr152/src/etc/manifest	2009-12-10 10:55:17.285283489 +0100
++++ b/jsr152/src/etc/manifest	2009-12-10 10:59:35.397771728 +0100
+@@ -1,4 +1,16 @@
+ Manifest-version: 1.0
 +Import-Package: javax.servlet; version=2.4,javax.servlet.http; version
 + =2.4,javax.servlet.resources; version=2.4
 +Bundle-ManifestVersion: 2
@@ -19,3 +14,6 @@
 +Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
 +Bundle-Localization: plugin
 +Bundle-Vendor: Apache Software Foundation
+ 
+ Name: javax/servlet/jsp/
+ Specification-Title: Java API for JavaServer Pages

Modified: trunk/libservlet2.4-java/debian/patches/servlet-api-OSGi.patch
===================================================================
--- trunk/libservlet2.4-java/debian/patches/servlet-api-OSGi.patch	2009-12-09 22:49:41 UTC (rev 11219)
+++ trunk/libservlet2.4-java/debian/patches/servlet-api-OSGi.patch	2009-12-10 10:02:17 UTC (rev 11220)
@@ -1,12 +1,7 @@
-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.4. at implementation.revision@
- Implementation-Vendor: Apache Software Foundation
--
+--- a/jsr154/src/etc/manifest	2009-12-10 10:54:48.529282255 +0100
++++ b/jsr154/src/etc/manifest	2009-12-10 11:00:11.230145721 +0100
+@@ -1,4 +1,13 @@
+ Manifest-version: 1.0
 +Bundle-ManifestVersion: 2
 +Export-Package: javax.servlet;version="2.4",javax.servlet.http;version
 + ="2.4",javax.servlet.resources;version="2.4"
@@ -16,3 +11,6 @@
 +Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
 +Bundle-Localization: plugin
 +Bundle-Vendor: Apache Software Foundation
+ 
+ Name: javax/servlet/
+ Specification-Title: Java API for Servlets