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

Torsten Werner twerner at alioth.debian.org
Thu Sep 8 16:03:48 UTC 2011 

Author: twerner
Date: 2011-09-08 16:03:47 +0000 (Thu, 08 Sep 2011)
New Revision: 14762

Added:
   trunk/libservlet2.4-java/debian/orig-tar.sh
   trunk/libservlet2.4-java/debian/patches/0001-add-OSGi-to-jsp-api.patch
   trunk/libservlet2.4-java/debian/patches/0002-add-OSGi-to-servlet-api.patch
Removed:
   trunk/libservlet2.4-java/debian/patches/cve-2007-4724.patch
   trunk/libservlet2.4-java/debian/patches/jsp-api-OSGi.patch
   trunk/libservlet2.4-java/debian/patches/servlet-api-OSGi.patch
Modified:
   trunk/libservlet2.4-java/debian/changelog
   trunk/libservlet2.4-java/debian/patches/series
   trunk/libservlet2.4-java/debian/rules
   trunk/libservlet2.4-java/debian/watch
Log:
* Team upload
* New upstream release.
* Update debian/watch to point to svn tree and implement download through
  debian/orig-tar.sh.
* Refresh patches.

Modified: trunk/libservlet2.4-java/debian/changelog
===================================================================
--- trunk/libservlet2.4-java/debian/changelog	2011-09-08 15:26:14 UTC (rev 14761)
+++ trunk/libservlet2.4-java/debian/changelog	2011-09-08 16:03:47 UTC (rev 14762)
@@ -1,5 +1,8 @@
-libservlet2.4-java (5.0.30-13) UNRELEASED; urgency=low
+libservlet2.4-java (5.5.33-1) UNRELEASED; urgency=low
 
+  * Team upload
+
+  [ Niels Thykier ]
   * Replaced B-D on default-jdk-builddep with default-jdk and
     gcj-native-helper.
   * Removed Depends on JREs for library packages - no longer required.
@@ -8,8 +11,14 @@
     this package in the past.
   * Link javadoc to system javadocs.
 
- -- Niels Thykier <niels at thykier.net>  Wed, 07 Jul 2010 18:22:11 +0200
+  [ Torsten Werner ]
+  * New upstream release.
+  * Update debian/watch to point to svn tree and implement download through
+    debian/orig-tar.sh.
+  * Refresh patches.
 
+ -- Torsten Werner <twerner at debian.org>  Thu, 08 Sep 2011 17:49:27 +0200
+
 libservlet2.4-java (5.0.30-12) unstable; urgency=low
 
   * Change Build-Depends: ant1.7 because gij fails with bus error when

Added: trunk/libservlet2.4-java/debian/orig-tar.sh
===================================================================
--- trunk/libservlet2.4-java/debian/orig-tar.sh	                        (rev 0)
+++ trunk/libservlet2.4-java/debian/orig-tar.sh	2011-09-08 16:03:47 UTC (rev 14762)
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../libservlet2.4-java_$VERSION.orig.tar.gz
+DIR=libservlet2.4-java-$VERSION
+TAG=$(echo "TOMCAT_$VERSION" | sed -re's,\.,_,g')
+
+svn export http://svn.apache.org/repos/asf/tomcat/tc5.5.x/tags/${TAG}/servletapi $DIR
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir && echo "moved $TAR to $origDir"
+fi


Property changes on: trunk/libservlet2.4-java/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Copied: trunk/libservlet2.4-java/debian/patches/0001-add-OSGi-to-jsp-api.patch (from rev 14759, trunk/libservlet2.4-java/debian/patches/jsp-api-OSGi.patch)
===================================================================
--- trunk/libservlet2.4-java/debian/patches/0001-add-OSGi-to-jsp-api.patch	                        (rev 0)
+++ trunk/libservlet2.4-java/debian/patches/0001-add-OSGi-to-jsp-api.patch	2011-09-08 16:03:47 UTC (rev 14762)
@@ -0,0 +1,30 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Thu, 8 Sep 2011 17:52:47 +0200
+Subject: add OSGi to jsp-api
+
+---
+ jsr152/src/etc/manifest |   12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/jsr152/src/etc/manifest b/jsr152/src/etc/manifest
+index 394843e..a47e520 100644
+--- a/jsr152/src/etc/manifest
++++ b/jsr152/src/etc/manifest
+@@ -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
++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
+ 
+ Name: javax/servlet/jsp/
+ Specification-Title: Java API for JavaServer Pages
+-- 

Copied: trunk/libservlet2.4-java/debian/patches/0002-add-OSGi-to-servlet-api.patch (from rev 14759, trunk/libservlet2.4-java/debian/patches/servlet-api-OSGi.patch)
===================================================================
--- trunk/libservlet2.4-java/debian/patches/0002-add-OSGi-to-servlet-api.patch	                        (rev 0)
+++ trunk/libservlet2.4-java/debian/patches/0002-add-OSGi-to-servlet-api.patch	2011-09-08 16:03:47 UTC (rev 14762)
@@ -0,0 +1,27 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Thu, 8 Sep 2011 17:52:47 +0200
+Subject: add OSGi to servlet-api
+
+---
+ jsr154/src/etc/manifest |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/jsr154/src/etc/manifest b/jsr154/src/etc/manifest
+index 0b57698..5d2ee3e 100644
+--- a/jsr154/src/etc/manifest
++++ b/jsr154/src/etc/manifest
+@@ -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"
++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
+ 
+ Name: javax/servlet/
+ Specification-Title: Java API for Servlets
+-- 

Deleted: trunk/libservlet2.4-java/debian/patches/cve-2007-4724.patch
===================================================================
--- trunk/libservlet2.4-java/debian/patches/cve-2007-4724.patch	2011-09-08 15:26:14 UTC (rev 14761)
+++ trunk/libservlet2.4-java/debian/patches/cve-2007-4724.patch	2011-09-08 16:03:47 UTC (rev 14762)
@@ -1,13 +0,0 @@
-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:
- <BR> <h3> Date <%= table.getDate() %>
--<BR> Time <%= time %> </h3>
-+<BR> Time <%= util.HTMLFilter.filter(time) %> </h3>
- </FONT>
- <FORM METHOD=POST ACTION=cal1.jsp>
- <BR> 

Deleted: trunk/libservlet2.4-java/debian/patches/jsp-api-OSGi.patch
===================================================================
--- trunk/libservlet2.4-java/debian/patches/jsp-api-OSGi.patch	2011-09-08 15:26:14 UTC (rev 14761)
+++ trunk/libservlet2.4-java/debian/patches/jsp-api-OSGi.patch	2011-09-08 16:03:47 UTC (rev 14762)
@@ -1,21 +0,0 @@
-Description: Adds OSGi metadata needed by eclipse.
-
---- 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
-+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
- 
- Name: javax/servlet/jsp/
- Specification-Title: Java API for JavaServer Pages

Modified: trunk/libservlet2.4-java/debian/patches/series
===================================================================
--- trunk/libservlet2.4-java/debian/patches/series	2011-09-08 15:26:14 UTC (rev 14761)
+++ trunk/libservlet2.4-java/debian/patches/series	2011-09-08 16:03:47 UTC (rev 14762)
@@ -1,4 +1,2 @@
-cve-2007-4724.patch
-jsp-api-OSGi.patch
-servlet-api-OSGi.patch
-javadoc-link.patch
+0001-add-OSGi-to-jsp-api.patch
+0002-add-OSGi-to-servlet-api.patch

Deleted: trunk/libservlet2.4-java/debian/patches/servlet-api-OSGi.patch
===================================================================
--- trunk/libservlet2.4-java/debian/patches/servlet-api-OSGi.patch	2011-09-08 15:26:14 UTC (rev 14761)
+++ trunk/libservlet2.4-java/debian/patches/servlet-api-OSGi.patch	2011-09-08 16:03:47 UTC (rev 14762)
@@ -1,18 +0,0 @@
-Description: Adds OSGi metadata needed by eclipse.
-
---- 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"
-+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
- 
- Name: javax/servlet/
- Specification-Title: Java API for Servlets

Modified: trunk/libservlet2.4-java/debian/rules
===================================================================
--- trunk/libservlet2.4-java/debian/rules	2011-09-08 15:26:14 UTC (rev 14761)
+++ trunk/libservlet2.4-java/debian/rules	2011-09-08 16:03:47 UTC (rev 14762)
@@ -44,3 +44,7 @@
 install/libservlet2.4-java-gcj:: install/libservlet2.4-java
 	dh_nativejava -plibservlet2.4-java-gcj
 endif
+
+get-orig-source:
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
+

Modified: trunk/libservlet2.4-java/debian/watch
===================================================================
--- trunk/libservlet2.4-java/debian/watch	2011-09-08 15:26:14 UTC (rev 14761)
+++ trunk/libservlet2.4-java/debian/watch	2011-09-08 16:03:47 UTC (rev 14762)
@@ -1,2 +1,4 @@
 version=3
-http://www.apache.org/dist/tomcat/tomcat-5/v(5\.5\.\d*)/src/apache-tomcat-(5\.5\.\d*)-src\.tar\.gz debian uupdate
+
+http://svn.apache.org/repos/asf/tomcat/tc5.5.x/tags/ TOMCAT_(\d+)_(\d+)_(\d+)/ \
+    debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list