[pkg-java] r18602 - in trunk/easyconf/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-11-19 10:58:50 +0000 (Wed, 19 Nov 2014)
New Revision: 18602

Added:
   trunk/easyconf/debian/maven.ignoreRules
Modified:
   trunk/easyconf/debian/changelog
   trunk/easyconf/debian/control
   trunk/easyconf/debian/patches/series
   trunk/easyconf/debian/rules
Log:
Removed the dependency on libstruts1.2-java



Modified: trunk/easyconf/debian/changelog
===================================================================
--- trunk/easyconf/debian/changelog	2014-11-17 15:26:04 UTC (rev 18601)
+++ trunk/easyconf/debian/changelog	2014-11-19 10:58:50 UTC (rev 18602)
@@ -1,3 +1,10 @@
+easyconf (0.9.5-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Removed the dependency on libstruts1.2-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 19 Nov 2014 09:29:22 +0100
+
 easyconf (0.9.5-4) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/easyconf/debian/control
===================================================================
--- trunk/easyconf/debian/control	2014-11-17 15:26:04 UTC (rev 18601)
+++ trunk/easyconf/debian/control	2014-11-19 10:58:50 UTC (rev 18602)
@@ -16,7 +16,6 @@
                libcommons-lang-java,
                libcommons-logging-java,
                libservlet3.1-java,
-               libstruts1.2-java,
                libxstream-java,
                maven-repo-helper
 Standards-Version: 3.9.5
@@ -33,7 +32,7 @@
          libcommons-lang-java,
          libcommons-logging-java,
          ${misc:Depends}
-Suggests: libstruts1.2-java, libxstream-java
+Suggests: libxstream-java
 Description: library to access configuration of software components
  EasyConf is a library to access configuration of software components
  and applications.

Added: trunk/easyconf/debian/maven.ignoreRules
===================================================================
--- trunk/easyconf/debian/maven.ignoreRules	                        (rev 0)
+++ trunk/easyconf/debian/maven.ignoreRules	2014-11-19 10:58:50 UTC (rev 18602)
@@ -0,0 +1 @@
+struts struts * * * *

Modified: trunk/easyconf/debian/patches/series
===================================================================
--- trunk/easyconf/debian/patches/series	2014-11-17 15:26:04 UTC (rev 18601)
+++ trunk/easyconf/debian/patches/series	2014-11-19 10:58:50 UTC (rev 18602)
@@ -1 +1,2 @@
 fix_test.diff
+disable-struts-support.diff

Modified: trunk/easyconf/debian/rules
===================================================================
--- trunk/easyconf/debian/rules	2014-11-17 15:26:04 UTC (rev 18601)
+++ trunk/easyconf/debian/rules	2014-11-19 10:58:50 UTC (rev 18602)
@@ -6,9 +6,10 @@
 POM_VERSION          := 0.9.5
 MAVEN_REPO           := http://repository.sonatype.org/service/local/repositories/central/content
 
-JAVA_HOME := /usr/lib/jvm/default-java
+#JAVA_HOME := /usr/lib/jvm/default-java
+JAVA_HOME := /usr/lib/jvm/java-7-openjdk-amd64
 DEB_JARS  := commons-collections3 commons-logging commons-lang commons-digester commons-configuration commons-beanutils \
-             struts-1.2 servlet-api-3.1 jsp-api-2.3 xstream junit ant-junit
+             servlet-api-3.1 jsp-api-2.3 xstream junit ant-junit
 DEB_ANT_BUILD_TARGET := jar javadoc
 DEB_ANT_CHECK_TARGET := internal-test