[pkg-java] r16489 - in trunk/libcommons-logging-java/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-04-04 12:52:48 +0000 (Thu, 04 Apr 2013)
New Revision: 16489

Modified:
   trunk/libcommons-logging-java/debian/ant.properties
   trunk/libcommons-logging-java/debian/changelog
   trunk/libcommons-logging-java/debian/control
   trunk/libcommons-logging-java/debian/maven.rules
   trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch
   trunk/libcommons-logging-java/debian/rules
Log:
Upgraded the dependency on the Servlet API (2.5 -> 3.0)

Modified: trunk/libcommons-logging-java/debian/ant.properties
===================================================================
--- trunk/libcommons-logging-java/debian/ant.properties	2013-04-04 12:40:08 UTC (rev 16488)
+++ trunk/libcommons-logging-java/debian/ant.properties	2013-04-04 12:52:48 UTC (rev 16489)
@@ -3,5 +3,5 @@
 logkit.jar=/usr/share/java/excalibur-logkit.jar
 avalon-framework.jar=/usr/share/java/avalon-framework.jar
 junit.jar=/usr/share/java/junit.jar
-servletapi.jar=/usr/share/java/servlet-api-2.5.jar
+servletapi.jar=/usr/share/java/servlet-api-3.0.jar
 test.failonerror=false

Modified: trunk/libcommons-logging-java/debian/changelog
===================================================================
--- trunk/libcommons-logging-java/debian/changelog	2013-04-04 12:40:08 UTC (rev 16488)
+++ trunk/libcommons-logging-java/debian/changelog	2013-04-04 12:52:48 UTC (rev 16489)
@@ -5,9 +5,10 @@
   * Updated Standards-Version to 3.9.4: no changes needed.
   * Refreshed the patches
   * Fixed the outdated OSGi metadata
+  * Upgraded the dependency on the Servlet API (2.5 -> 3.0)
   * debian/copyright: converted to DEP5 format, updated the contributors
 
- -- Emmanuel Bourg <ebourg at apache.org>  Thu, 04 Apr 2013 13:27:23 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 04 Apr 2013 14:48:38 +0200
 
 libcommons-logging-java (1.1.1-9) unstable; urgency=low
 

Modified: trunk/libcommons-logging-java/debian/control
===================================================================
--- trunk/libcommons-logging-java/debian/control	2013-04-04 12:40:08 UTC (rev 16488)
+++ trunk/libcommons-logging-java/debian/control	2013-04-04 12:52:48 UTC (rev 16489)
@@ -10,7 +10,7 @@
                      libcommons-parent-java,
                      libexcalibur-logkit-java,
                      liblog4j1.2-java,
-                     libservlet2.5-java,
+                     libservlet3.0-java,
                      maven-repo-helper
 Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-logging-java
@@ -24,7 +24,7 @@
           libcommons-logging-java-doc,
           libexcalibur-logkit-java,
           liblog4j1.2-java,
-          libservlet2.5-java
+          libservlet3.0-java
 Description: commmon wrapper interface for several logging APIs
  Provides a simple, component oriented interface together with wrappers for
  several existing java logging systems. The user can choose at runtime which

Modified: trunk/libcommons-logging-java/debian/maven.rules
===================================================================
--- trunk/libcommons-logging-java/debian/maven.rules	2013-04-04 12:40:08 UTC (rev 16488)
+++ trunk/libcommons-logging-java/debian/maven.rules	2013-04-04 12:52:48 UTC (rev 16489)
@@ -1,5 +1,6 @@
 junit junit jar s/3\..*/3.x/
 log4j log4j jar s/1\.2\..*/1.2.x/
-# force using servlet 2.5
-javax.servlet * * s/.*/2.5/
+# force using servlet 3.0
+javax.servlet * * s/.*/3.0/
 s/avalon-framework/org.apache.avalon/ avalon-framework jar s/.*/debian/
+

Modified: trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch
===================================================================
--- trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch	2013-04-04 12:40:08 UTC (rev 16488)
+++ trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch	2013-04-04 12:52:48 UTC (rev 16489)
@@ -6,4 +6,4 @@
   .0)",org.apache.avalon.framework.logger;resolution:=optional;version=
   "[4.1.3,4.1.5]",org.apache.log;resolution:=optional;version="[1.0.1,1
   .0.1]",org.apache.log4j;resolution:=optional;version="[1.2.15,2.0.0)"
-+Class-Path: avalon-framework.jar excalibur-logkit.jar log4j-1.2.jar servlet-api-2.5.jar
++Class-Path: avalon-framework.jar excalibur-logkit.jar log4j-1.2.jar servlet-api-3.0.jar

Modified: trunk/libcommons-logging-java/debian/rules
===================================================================
--- trunk/libcommons-logging-java/debian/rules	2013-04-04 12:40:08 UTC (rev 16488)
+++ trunk/libcommons-logging-java/debian/rules	2013-04-04 12:52:48 UTC (rev 16489)
@@ -7,7 +7,7 @@
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME		     := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := dist
-DEB_JARS		     := commons-logging log4j-1.2 excalibur-logkit avalon-framework servlet-api-2.5 junit ant-junit
+DEB_JARS		     := commons-logging log4j-1.2 excalibur-logkit avalon-framework servlet-api-3.0 junit ant-junit
 
 makebuilddir/lib$(PACKAGE)-java::
 	# copy MANIFEST.MF to src/main/resources/META-INF/ to include it in the jar