[pkg-java] r18384 - trunk/libjamon-java/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-09-08 18:36:23 +0000 (Mon, 08 Sep 2014)
New Revision: 18384

Modified:
   trunk/libjamon-java/debian/changelog
   trunk/libjamon-java/debian/control
   trunk/libjamon-java/debian/rules
Log:
Depend on libservlet3.1-java and libtomcat8-java instead of libservlet2.5-java and libtomcat6-java (Closes: #759636)



Modified: trunk/libjamon-java/debian/changelog
===================================================================
--- trunk/libjamon-java/debian/changelog	2014-09-08 18:29:39 UTC (rev 18383)
+++ trunk/libjamon-java/debian/changelog	2014-09-08 18:36:23 UTC (rev 18384)
@@ -1,6 +1,8 @@
 libjamon-java (2.7-5) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libservlet3.1-java and libtomcat8-java instead of
+    libservlet2.5-java and libtomcat6-java (Closes: #759636)
   * Switch to debhelper level 9
   * debian/rules: Removed the call to patchsys-quilt.mk
 

Modified: trunk/libjamon-java/debian/control
===================================================================
--- trunk/libjamon-java/debian/control	2014-09-08 18:29:39 UTC (rev 18383)
+++ trunk/libjamon-java/debian/control	2014-09-08 18:36:23 UTC (rev 18384)
@@ -3,8 +3,17 @@
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Luke Cycon <lcycon at gmail.com>
-Build-Depends: ant, quilt, cdbs, debhelper (>= 9),
- default-jdk, libgeronimo-interceptor-3.0-spec-java, libjetty-java, liblog4j1.2-java, libservlet2.5-java, libtomcat6-java, maven-repo-helper
+Build-Depends: ant,
+               cdbs,
+               debhelper (>= 9),
+               default-jdk,
+               libgeronimo-interceptor-3.0-spec-java,
+               libjetty-java,
+               liblog4j1.2-java,
+               libservlet3.1-java,
+               libtomcat8-java,
+               maven-repo-helper,
+               quilt
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libjamon-java/
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libjamon-java
@@ -12,7 +21,7 @@
 
 Package: libjamon-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Java API for easy monitoring production applications
  The Java Application Monitor (JAMon) is a free, simple, high
  performance, thread safe, Java API that allows developers to easily

Modified: trunk/libjamon-java/debian/rules
===================================================================
--- trunk/libjamon-java/debian/rules	2014-09-08 18:29:39 UTC (rev 18383)
+++ trunk/libjamon-java/debian/rules	2014-09-08 18:36:23 UTC (rev 18384)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS  := catalina geronimo-interceptor-3.0-spec jetty jetty-util log4j-1.2 servlet-api-2.5
+DEB_JARS  := tomcat8-catalina geronimo-interceptor-3.0-spec jetty jetty-util log4j-1.2 servlet-api-3.1
 
 install/libjamon-java::
 	mh_installpom -plibjamon-java debian/pom.xml