[easyconf] 17/28: Removed the dependency on libstruts1.2-java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository easyconf.

commit 05880808784333605bd63ee0b5774e935dfb57af
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 19 10:58:50 2014 +0000

    Removed the dependency on libstruts1.2-java
---
 debian/changelog         | 7 +++++++
 debian/control           | 3 +--
 debian/maven.ignoreRules | 1 +
 debian/patches/series    | 1 +
 debian/rules             | 5 +++--
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8df7343..204f27a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/control b/debian/control
index 7e2f0bb..1134876 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends: ant,
                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 @@ Depends: libcommons-beanutils-java,
          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.
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..f40e6ba
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1 @@
+struts struts * * * *
diff --git a/debian/patches/series b/debian/patches/series
index 4ba54ea..8eadb2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_test.diff
+disable-struts-support.diff
diff --git a/debian/rules b/debian/rules
index 0af8041..4da409e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,10 @@ include /usr/share/cdbs/1/class/ant.mk
 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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easyconf.git