[pkg-java] r18249 - trunk/libcommons-logging-java/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-07-13 23:36:26 +0000 (Sun, 13 Jul 2014)
New Revision: 18249

Modified:
   trunk/libcommons-logging-java/debian/changelog
   trunk/libcommons-logging-java/debian/control
   trunk/libcommons-logging-java/debian/maven.rules
   trunk/libcommons-logging-java/debian/rules
Log:
Build depend on libservlet3.1-java instead of libservlet3.0-java



Modified: trunk/libcommons-logging-java/debian/changelog
===================================================================
--- trunk/libcommons-logging-java/debian/changelog	2014-07-13 23:29:13 UTC (rev 18248)
+++ trunk/libcommons-logging-java/debian/changelog	2014-07-13 23:36:26 UTC (rev 18249)
@@ -3,6 +3,7 @@
   * New upstream release.
   * Refreshed the patches
   * debian/control:
+    - Build depend on libservlet3.1-java instead of libservlet3.0-java
     - Standards-Version updated to 3.9.5 (no changes)
     - Use canonical URLs for the Vcs-* fields
     - Removed the suggested dependency on libservlet3.0-java

Modified: trunk/libcommons-logging-java/debian/control
===================================================================
--- trunk/libcommons-logging-java/debian/control	2014-07-13 23:29:13 UTC (rev 18248)
+++ trunk/libcommons-logging-java/debian/control	2014-07-13 23:36:26 UTC (rev 18249)
@@ -10,7 +10,7 @@
                      libcommons-parent-java,
                      libexcalibur-logkit-java,
                      liblog4j1.2-java,
-                     libservlet3.0-java,
+                     libservlet3.1-java,
                      maven-repo-helper
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-logging-java

Modified: trunk/libcommons-logging-java/debian/maven.rules
===================================================================
--- trunk/libcommons-logging-java/debian/maven.rules	2014-07-13 23:29:13 UTC (rev 18248)
+++ trunk/libcommons-logging-java/debian/maven.rules	2014-07-13 23:36:26 UTC (rev 18249)
@@ -1,6 +1,6 @@
 junit junit jar s/3\..*/3.x/
 log4j log4j jar s/1\.2\..*/1.2.x/
-# force using servlet 3.0
-javax.servlet * * s/.*/3.0/
+# force using servlet 3.1
+javax.servlet * * s/.*/3.1/
 s/avalon-framework/org.apache.avalon/ avalon-framework jar s/.*/debian/
 

Modified: trunk/libcommons-logging-java/debian/rules
===================================================================
--- trunk/libcommons-logging-java/debian/rules	2014-07-13 23:29:13 UTC (rev 18248)
+++ trunk/libcommons-logging-java/debian/rules	2014-07-13 23:36:26 UTC (rev 18249)
@@ -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-3.0 junit ant-junit
+DEB_JARS		     := commons-logging log4j-1.2 excalibur-logkit avalon-framework servlet-api-3.1 junit ant-junit
 
 makebuilddir/lib$(PACKAGE)-java::
 	# copy MANIFEST.MF to src/main/resources/META-INF/ to include it in the jar