[pkg-java] r11222 - trunk/tomcat6/debian/patches

[Niels Thykier]

Author: nthykier-guest
Date: 2009-12-10 16:11:15 +0000 (Thu, 10 Dec 2009)
New Revision: 11222

Modified:
   trunk/tomcat6/debian/patches/jsp-api-OSGi.patch
   trunk/tomcat6/debian/patches/servlet-api-OSGi.patch
Log:
Corrected OSGi patches.

Modified: trunk/tomcat6/debian/patches/jsp-api-OSGi.patch
===================================================================
--- trunk/tomcat6/debian/patches/jsp-api-OSGi.patch	2009-12-10 10:15:06 UTC (rev 11221)
+++ trunk/tomcat6/debian/patches/jsp-api-OSGi.patch	2009-12-10 16:11:15 UTC (rev 11222)
@@ -1,11 +1,9 @@
 Description: Adds OSGi metadata needed by eclipse.
 
---- a/res/jsp-api.jar.manifest	2009-11-25 11:11:59.369284527 +0100
-+++ a/res/jsp-api.jar.manifest	2009-11-25 11:12:37.922284170 +0100
-@@ -9,3 +9,15 @@
- Implementation-Vendor: Apache Software Foundation
- X-Compile-Source-JDK: @source.jdk@
- X-Compile-Target-JDK: @target.jdk@
+--- a/res/jsp-api.jar.manifest	2009-12-10 10:55:17.285283489 +0100
++++ b/res/jsp-api.jar.manifest	2009-12-10 10:59:35.397771728 +0100
+@@ -1,4 +1,16 @@
+ Manifest-version: 1.0
 +Import-Package: javax.servlet; version=2.5,javax.servlet.http; version
 + =2.5,javax.servlet.resources; version=2.5
 +Bundle-ManifestVersion: 2
@@ -18,3 +16,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/tomcat6/debian/patches/servlet-api-OSGi.patch
===================================================================
--- trunk/tomcat6/debian/patches/servlet-api-OSGi.patch	2009-12-10 10:15:06 UTC (rev 11221)
+++ trunk/tomcat6/debian/patches/servlet-api-OSGi.patch	2009-12-10 16:11:15 UTC (rev 11222)
@@ -1,11 +1,9 @@
 Description: Adds OSGi metadata needed by eclipse.
 
---- a/res/servlet-api.jar.manifest	2009-11-25 11:05:45.854282997 +0100
-+++ b/res/servlet-api.jar.manifest	2009-11-25 11:09:51.062283823 +0100
-@@ -9,3 +9,12 @@
- Implementation-Vendor: Apache Software Foundation
- X-Compile-Source-JDK: @source.jdk@
- X-Compile-Target-JDK: @target.jdk@
+--- a/res/servlet-api.jar.manifest	2009-12-10 10:54:48.529282255 +0100
++++ b/res/servlet-api.jar.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.5",javax.servlet.http;version
 + ="2.5",javax.servlet.resources;version="2.5"
@@ -15,3 +13,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