[libspring-java] 01/01: Removed the libspring-web-struts-java package and dropped the build 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 libspring-java.

commit af5751b2d732fab14a1660f043cbcab0fa0a7b18
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 20 11:44:21 2014 +0100

    Removed the libspring-web-struts-java package and dropped the build dependency on libstruts1.2-java
---
 debian/build-classpath                          |  1 -
 debian/changelog                                |  8 ++++++++
 debian/control                                  | 13 +------------
 debian/patches/0013-disable-struts-bundle.patch | 14 ++++++++++++++
 debian/patches/series                           |  1 +
 debian/rules                                    |  2 +-
 6 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/debian/build-classpath b/debian/build-classpath
index 9935df9..ff39588 100644
--- a/debian/build-classpath
+++ b/debian/build-classpath
@@ -69,7 +69,6 @@
 /usr/share/java/portlet-api.jar
 /usr/share/java/quartz.jar
 /usr/share/java/rome.jar
-/usr/share/java/struts-1.2.jar
 /usr/share/java/testng.jar
 /usr/share/java/tiles-api.jar
 /usr/share/java/tiles-core.jar
diff --git a/debian/changelog b/debian/changelog
index e96bbf8..8b22e01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libspring-java (3.0.6.RELEASE-17) unstable; urgency=medium
+
+  * Team upload.
+  * Removed the libspring-web-struts-java package and dropped
+    the build dependency on libstruts1.2-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 20 Nov 2014 11:42:48 +0100
+
 libspring-java (3.0.6.RELEASE-16) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index c5f0ca0..3aa9705 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends-Indep: maven-repo-helper (>= 1.1), ivy, spring-build-scripts,
  libhibernate3-java (>= 3.5), libibatis-java, libitext-java, libjackson-json-java, libapache-poi-java,
  libjamon-java, libjasperreports-java, libjboss-vfs-java, libjdo-api-java (>= 2.2), libjexcelapi-java,
  libjibx1.2-java, libjoda-time-java, libjsf-api-java, libopenjpa-java, libportlet-api-2.0-spec-java,
- libquartz-java, librome-java, libservlet2.5-java, libspring-build-java, libstruts1.2-java,
+ libquartz-java, librome-java, libservlet2.5-java, libspring-build-java,
  libtiles-java, libtomcat8-java, libvelocity-tools-java, libxmlbeans-java, libxstream-java,
  testng, velocity, jruby
 Standards-Version: 3.9.6
@@ -115,17 +115,6 @@ Description: modular Java/J2EE application framework - Web Portlet
  web MVC framework, web controllers, web views for JSP, Velocity, Tiles, iText
  and POI.
 
-Package: libspring-web-struts-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-web-servlet-java (= ${source:Version}), libstruts1.2-java
-Description: modular Java/J2EE application framework - Struts MVC
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide org.springframework.web.struts.jar : integrate a Struts
- application with Spring.
-
 Package: libspring-web-portlet-java
 Architecture: all
 Depends: ${misc:Depends}, libspring-web-servlet-java (= ${source:Version})
diff --git a/debian/patches/0013-disable-struts-bundle.patch b/debian/patches/0013-disable-struts-bundle.patch
new file mode 100644
index 0000000..6374a73
--- /dev/null
+++ b/debian/patches/0013-disable-struts-bundle.patch
@@ -0,0 +1,14 @@
+Description: Do not build the struts bundle
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+Bug-Debian: https://bugs.debian.org/758516
+--- a/projects/build-spring-framework/build.xml
++++ b/projects/build-spring-framework/build.xml
+@@ -20,7 +20,6 @@
+ 		<pathelement location="../org.springframework.web.servlet"/>
+ 		<pathelement location="../org.springframework.web.portlet"/>
+ 		<pathelement location="../org.springframework.test"/>
+-		<pathelement location="../org.springframework.web.struts"/>
+ 	</path>
+ 
+ 	<path id="bundles">
diff --git a/debian/patches/series b/debian/patches/series
index fb98406..ce0d404 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ CVE-2014-0054.patch
 CVE-2014-1904.patch
 CVE-2014-0225.patch
 0012_use_debian_asm4.patch
+0013-disable-struts-bundle.patch
diff --git a/debian/rules b/debian/rules
index 12aaac5..667f16c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ BUILD_FILE      := projects/build-spring-framework/build.xml
 CLASSPATH       := $(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done)
 ANT             := CLASSPATH=$(CLASSPATH) JAVA_HOME=$(JAVA_HOME) ANT_OPTS=$(JAVA_OPTS) ant -f $(BUILD_FILE) $(ANT_ARGS)
 
-MODULES = aop beans context context.support core expression instrument jdbc jms orm oxm test transaction web web.portlet web.servlet web.struts
+MODULES = aop beans context context.support core expression instrument jdbc jms orm oxm test transaction web web.portlet web.servlet
 PRJ_ROOT = projects/org.springframework
 ARTIFACT_ROOT = target/artifacts/org.springframework
 

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