[pkg-java] r18389 - trunk/libajaxtags-java/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-09-08 20:11:31 +0000 (Mon, 08 Sep 2014)
New Revision: 18389

Modified:
   trunk/libajaxtags-java/debian/changelog
   trunk/libajaxtags-java/debian/control
   trunk/libajaxtags-java/debian/maven.properties
   trunk/libajaxtags-java/debian/maven.rules
Log:
Build depend on libservlet3.1-java instead of libservlet2.5-java
Disabled the tests



Modified: trunk/libajaxtags-java/debian/changelog
===================================================================
--- trunk/libajaxtags-java/debian/changelog	2014-09-08 19:14:37 UTC (rev 18388)
+++ trunk/libajaxtags-java/debian/changelog	2014-09-08 20:11:31 UTC (rev 18389)
@@ -2,10 +2,12 @@
 
   * Team upload.
   * debian/control:
+    - Build depend on libservlet3.1-java instead of libservlet2.5-java
     - Removed Michael Koch from the uploaders (Closes: #654044)
     - Standards-Version updated to 3.9.5 (no changes)
     - Removed the unused ${shlibs:Depends} variable
     - Use canonical URLs for the Vcs-* fields
+  * Disabled the tests
   * Switch to debhelper level 9
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 08 Sep 2014 21:10:55 +0200

Modified: trunk/libajaxtags-java/debian/control
===================================================================
--- trunk/libajaxtags-java/debian/control	2014-09-08 19:14:37 UTC (rev 18388)
+++ trunk/libajaxtags-java/debian/control	2014-09-08 20:11:31 UTC (rev 18389)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
 Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, maven-debian-helper,
- libservlet2.5-java
+ libservlet3.1-java
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libajaxtags-java/
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libajaxtags-java

Modified: trunk/libajaxtags-java/debian/maven.properties
===================================================================
--- trunk/libajaxtags-java/debian/maven.properties	2014-09-08 19:14:37 UTC (rev 18388)
+++ trunk/libajaxtags-java/debian/maven.properties	2014-09-08 20:11:31 UTC (rev 18389)
@@ -1 +1,2 @@
+maven.test.skip=true
 maven.test.failure.ignore=true

Modified: trunk/libajaxtags-java/debian/maven.rules
===================================================================
--- trunk/libajaxtags-java/debian/maven.rules	2014-09-08 19:14:37 UTC (rev 18388)
+++ trunk/libajaxtags-java/debian/maven.rules	2014-09-08 20:11:31 UTC (rev 18389)
@@ -15,6 +15,6 @@
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\..*/3.x/
-javax.servlet.jsp jsp-api jar s/.*/2.1/
-javax.servlet servlet-api jar s/.*/2.5/
+javax.servlet.jsp s/jsp-api/javax.servlet.jsp-api/ jar s/.*/2.3/
+javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/
 junit junit jar s/4\..*/4.x/