[pkg-java] r18567 - trunk/mina2/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-10-25 21:37:43 +0000 (Sat, 25 Oct 2014)
New Revision: 18567

Modified:
   trunk/mina2/debian/changelog
   trunk/mina2/debian/control
   trunk/mina2/debian/rules
Log:
Depend on libtomcat8-java instead of libtomcat7-java



Modified: trunk/mina2/debian/changelog
===================================================================
--- trunk/mina2/debian/changelog	2014-10-25 20:20:40 UTC (rev 18566)
+++ trunk/mina2/debian/changelog	2014-10-25 21:37:43 UTC (rev 18567)
@@ -1,3 +1,9 @@
+mina2 (2.0.7+dfsg-2) UNRELEASED; urgency=medium
+
+  * Depend on libtomcat8-java instead of libtomcat7-java (Closes: #759644)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 25 Oct 2014 23:35:33 +0200
+
 mina2 (2.0.7+dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/mina2/debian/control
===================================================================
--- trunk/mina2/debian/control	2014-10-25 20:20:40 UTC (rev 18566)
+++ trunk/mina2/debian/control	2014-10-25 21:37:43 UTC (rev 18567)
@@ -5,7 +5,7 @@
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 7), ant, cdbs, default-jdk
 Build-Depends-Indep: libslf4j-java, libjzlib-java,
-  libmx4j-java, libspring-beans-java, libtomcat7-java, libognl-java, librxtx-java,
+  libmx4j-java, libspring-beans-java, libtomcat8-java, libognl-java, librxtx-java,
   maven-repo-helper
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/mina2
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/mina2
@@ -15,7 +15,7 @@
 Package: libmina2-java
 Architecture: all
 Depends: ${misc:Depends}, libslf4j-java
-Recommends: libjzlib-java, libmx4j-java, libtomcat7-java, libognl-java
+Recommends: libjzlib-java, libmx4j-java, libtomcat8-java, libognl-java
 Suggests: libmina-java-doc, libspring-beans-java
 Description: Java network application framework
  Apache MINA is a network application framework which helps users develop high

Modified: trunk/mina2/debian/rules
===================================================================
--- trunk/mina2/debian/rules	2014-10-25 20:20:40 UTC (rev 18566)
+++ trunk/mina2/debian/rules	2014-10-25 21:37:43 UTC (rev 18567)
@@ -6,7 +6,7 @@
 JAVA_HOME := /usr/lib/jvm/default-java
 
 DEB_JARS  := slf4j-api jzlib mx4j spring3-core spring3-beans ognl \
-             /usr/share/tomcat7/lib/tomcat-coyote.jar \
+             /usr/share/java/tomcat8-jni.jar \
              RXTXcomm.jar
 DEB_ANT_BUILDFILE := debian/build.xml
 DEB_ANT_ARGS := -Ddeb.package=${DEB_SOURCE_PACKAGE}