[pkg-java] r18362 - trunk/easyconf/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-09-08 06:43:29 +0000 (Mon, 08 Sep 2014)
New Revision: 18362

Modified:
   trunk/easyconf/debian/changelog
   trunk/easyconf/debian/control
   trunk/easyconf/debian/rules
Log:
Depend on libservlet3.1-java instead of libservlet2.5-java



Modified: trunk/easyconf/debian/changelog
===================================================================
--- trunk/easyconf/debian/changelog	2014-09-08 06:39:25 UTC (rev 18361)
+++ trunk/easyconf/debian/changelog	2014-09-08 06:43:29 UTC (rev 18362)
@@ -1,6 +1,8 @@
 easyconf (0.9.5-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * debian/control:
+    - Depend on libservlet3.1-java instead of libservlet2.5-java
   * Fixed the watch file
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 08 Sep 2014 08:39:02 +0200

Modified: trunk/easyconf/debian/control
===================================================================
--- trunk/easyconf/debian/control	2014-09-08 06:39:25 UTC (rev 18361)
+++ trunk/easyconf/debian/control	2014-09-08 06:43:29 UTC (rev 18362)
@@ -15,7 +15,7 @@
                libcommons-digester-java,
                libcommons-lang-java,
                libcommons-logging-java,
-               libservlet2.5-java,
+               libservlet3.1-java,
                libstruts1.2-java,
                libxstream-java,
                maven-repo-helper
@@ -33,7 +33,7 @@
          libcommons-lang-java,
          libcommons-logging-java,
          ${misc:Depends}
-Suggests: libservlet2.5-java, libstruts1.2-java, libxstream-java
+Suggests: libstruts1.2-java, libxstream-java
 Description: library to access configuration of software components
  EasyConf is a library to access configuration of software components
  and applications.

Modified: trunk/easyconf/debian/rules
===================================================================
--- trunk/easyconf/debian/rules	2014-09-08 06:39:25 UTC (rev 18361)
+++ trunk/easyconf/debian/rules	2014-09-08 06:43:29 UTC (rev 18362)
@@ -8,7 +8,7 @@
 
 JAVA_HOME := /usr/lib/jvm/default-java
 DEB_JARS  := commons-collections3 commons-logging commons-lang commons-digester commons-configuration commons-beanutils \
-             struts-1.2 servlet-api-2.5 jsp-api-2.1 xstream junit ant-junit
+             struts-1.2 servlet-api-3.1 jsp-api-2.3 xstream junit ant-junit
 DEB_ANT_BUILD_TARGET := jar javadoc
 DEB_ANT_CHECK_TARGET := internal-test