[pkg-java] r17213 - in trunk/libcommons-el-java/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-09-10 09:18:54 +0000 (Tue, 10 Sep 2013)
New Revision: 17213

Modified:
   trunk/libcommons-el-java/debian/ant.properties
   trunk/libcommons-el-java/debian/changelog
   trunk/libcommons-el-java/debian/control
   trunk/libcommons-el-java/debian/patches/0004-add-OSGi-metadata.patch
   trunk/libcommons-el-java/debian/rules
Log:
Updated Standards-Version to 3.9.4 (no changes)
Removed Michael Koch from the uploaders (Closes: #654054)
Use canonical URLs for the Vcs-* fields
Transition to libservlet3.0-java




Modified: trunk/libcommons-el-java/debian/ant.properties
===================================================================
--- trunk/libcommons-el-java/debian/ant.properties	2013-09-10 05:02:46 UTC (rev 17212)
+++ trunk/libcommons-el-java/debian/ant.properties	2013-09-10 09:18:54 UTC (rev 17213)
@@ -1,3 +1,3 @@
-jsp-api.jar=/usr/share/java/servlet-2.4.jar
+jsp-api.jar=/usr/share/java/servlet-3.0.jar
 junit.jar=/usr/share/java/junit.jar
 build.sysclasspath=only

Modified: trunk/libcommons-el-java/debian/changelog
===================================================================
--- trunk/libcommons-el-java/debian/changelog	2013-09-10 05:02:46 UTC (rev 17212)
+++ trunk/libcommons-el-java/debian/changelog	2013-09-10 09:18:54 UTC (rev 17213)
@@ -1,3 +1,13 @@
+libcommons-el-java (1.0-8) unstable; urgency=low
+
+  * debian/control:
+    - Updated Standards-Version to 3.9.4 (no changes)
+    - Removed Michael Koch from the uploaders (Closes: #654054)
+    - Use canonical URLs for the Vcs-* fields
+  * Transition to libservlet3.0-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 10 Sep 2013 11:13:19 +0200
+
 libcommons-el-java (1.0-7) unstable; urgency=low
 
   * Team upload.

Modified: trunk/libcommons-el-java/debian/control
===================================================================
--- trunk/libcommons-el-java/debian/control	2013-09-10 05:02:46 UTC (rev 17212)
+++ trunk/libcommons-el-java/debian/control	2013-09-10 09:18:54 UTC (rev 17213)
@@ -2,18 +2,18 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>, Niels Thykier <niels at thykier.net>
+Uploaders: Niels Thykier <niels at thykier.net>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant
-Build-Depends-Indep: junit (>= 3.8.1), libservlet2.5-java
-Standards-Version: 3.9.1
+Build-Depends-Indep: junit (>= 3.8.1), libservlet3.0-java
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-el-java
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-el-java
 Homepage: http://commons.apache.org/el/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-el-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-el-java
 
 Package: libcommons-el-java
 Architecture: all
-Depends: libservlet2.5-java, ${misc:Depends}
-Description: Implementation of the JSP2.0 Expression Language interpreter
+Depends: libservlet3.0-java, ${misc:Depends}
+Description: Implementation of the JSP 2.0 Expression Language interpreter
  The JSP 2.0 specification provides a portable API for evaluating "EL
  Expressions": The classes and interfaces in the javax.servlet.jsp.el
  package describe and define programmatic access to the Expression

Modified: trunk/libcommons-el-java/debian/patches/0004-add-OSGi-metadata.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/0004-add-OSGi-metadata.patch	2013-09-10 05:02:46 UTC (rev 17212)
+++ trunk/libcommons-el-java/debian/patches/0004-add-OSGi-metadata.patch	2013-09-10 09:18:54 UTC (rev 17213)
@@ -6,18 +6,16 @@
  src/conf/MANIFEST.MF |   13 +++++++++++++
  1 files changed, 13 insertions(+), 0 deletions(-)
 
-diff --git a/src/conf/MANIFEST.MF b/src/conf/MANIFEST.MF
-index 5d0b47f..c908af5 100644
 --- a/src/conf/MANIFEST.MF
 +++ b/src/conf/MANIFEST.MF
-@@ -5,3 +5,16 @@ Specification-Version: 2.0
+@@ -5,3 +5,16 @@
  Implementation-Title: org.apache.commons.el
  Implementation-Vendor: Apache Software Foundation
  Implementation-Version: 1.0
-+Import-Package: javax.servlet;version="2.5",javax.servlet.http;version
-+ ="2.5",javax.servlet.jsp;version="2.1",javax.servlet.jsp.el;version="
-+ 2.1",javax.servlet.jsp.resources;version="2.1",javax.servlet.jsp.tage
-+ xt;version="2.1",javax.servlet.resources;version="2.5"
++Import-Package: javax.servlet;version="3.0",javax.servlet.http;version
++ ="3.0",javax.servlet.jsp;version="2.2",javax.servlet.jsp.el;version="
++ 2.2",javax.servlet.jsp.resources;version="2.2",javax.servlet.jsp.tage
++ xt;version="2.2",javax.servlet.resources;version="3.0"
 +Bundle-ManifestVersion: 2
 +Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commo
 + ns.el.parser;version="1.0.0"
@@ -27,4 +25,3 @@
 +Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
 +Bundle-Localization: plugin
 +Bundle-Vendor: Apache Software Foundation
--- 

Modified: trunk/libcommons-el-java/debian/rules
===================================================================
--- trunk/libcommons-el-java/debian/rules	2013-09-10 05:02:46 UTC (rev 17212)
+++ trunk/libcommons-el-java/debian/rules	2013-09-10 09:18:54 UTC (rev 17213)
@@ -13,7 +13,7 @@
 
 JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
-DEB_JARS := servlet-api-2.5 jsp-api-2.1 junit
+DEB_JARS := servlet-api-3.0 jsp-api-2.2 junit
 DEB_ANT_BUILD_TARGET := jar-only javadoc
 
 # Additional options to pass to the Java virtual machine