diff -Nru easyconf-0.9.5/debian/changelog easyconf-0.9.5/debian/changelog
--- easyconf-0.9.5/debian/changelog	2014-09-08 06:59:21.000000000 +0000
+++ easyconf-0.9.5/debian/changelog	2014-11-19 16:25:46.000000000 +0000
@@ -1,3 +1,11 @@
+easyconf (0.9.5-5) unstable; urgency=medium
+
+  * Team upload.
+  * Removed the dependency on libstruts1.2-java
+  * Standards-Version updated to 3.9.6 (no changes)
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 19 Nov 2014 17:25:43 +0100
+
 easyconf (0.9.5-4) unstable; urgency=medium
 
   * Team upload.
diff -Nru easyconf-0.9.5/debian/control easyconf-0.9.5/debian/control
--- easyconf-0.9.5/debian/control	2014-09-08 06:50:55.000000000 +0000
+++ easyconf-0.9.5/debian/control	2014-11-19 16:15:34.000000000 +0000
@@ -16,10 +16,9 @@
                libcommons-lang-java,
                libcommons-logging-java,
                libservlet3.1-java,
-               libstruts1.2-java,
                libxstream-java,
                maven-repo-helper
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/easyconf/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/easyconf/
 Homepage: http://easyconf.sourceforge.net
@@ -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.
diff -Nru easyconf-0.9.5/debian/maven.ignoreRules easyconf-0.9.5/debian/maven.ignoreRules
--- easyconf-0.9.5/debian/maven.ignoreRules	1970-01-01 00:00:00.000000000 +0000
+++ easyconf-0.9.5/debian/maven.ignoreRules	2014-11-19 08:25:30.000000000 +0000
@@ -0,0 +1 @@
+struts struts * * * *
diff -Nru easyconf-0.9.5/debian/patches/disable-struts-support.diff easyconf-0.9.5/debian/patches/disable-struts-support.diff
--- easyconf-0.9.5/debian/patches/disable-struts-support.diff	1970-01-01 00:00:00.000000000 +0000
+++ easyconf-0.9.5/debian/patches/disable-struts-support.diff	2014-11-19 09:20:09.000000000 +0000
@@ -0,0 +1,60 @@
+--- a/build.xml
++++ b/build.xml
+@@ -33,7 +33,7 @@
+   <target name="compile" description="o Compile the code" depends="get-deps">
+     <mkdir dir="${classesdir}">
+     </mkdir>
+-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
++    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html,**/struts/**">
+       <src>
+         <pathelement location="src/java">
+         </pathelement>
+--- a/src/java/com/germinus/easyconf/taglib/PropertyTag.java
++++ b/src/java/com/germinus/easyconf/taglib/PropertyTag.java
+@@ -21,7 +21,7 @@
+ 
+ import javax.servlet.jsp.tagext.BodyTagSupport;
+ import javax.servlet.jsp.JspException;
+-import org.apache.struts.util.RequestUtils;
++import javax.servlet.jsp.PageContext;
+ import org.apache.commons.lang.StringUtils;
+ 
+ import java.util.List;
+@@ -252,7 +252,7 @@
+        
+         if (value == null) {
+             JspException e = new JspException("The value of the property is null");
+-            RequestUtils.saveException(pageContext, e);
++            pageContext.setAttribute("org.apache.struts.action.EXCEPTION", e, PageContext.REQUEST_SCOPE);
+             throw e;
+         }
+         pageContext.setAttribute(id, value);
+@@ -292,7 +292,7 @@
+             value = new Long(conf.getLong(property, getPropertyFilter()));
+         } else {
+                 JspException e = new JspException("Unsupported type: " +type);
+-                RequestUtils.saveException(pageContext, e);
++                pageContext.setAttribute("org.apache.struts.action.EXCEPTION", e, PageContext.REQUEST_SCOPE);
+                 throw e;
+         }
+         return value;
+--- a/src/java/com/germinus/easyconf/taglib/ConfigurationObjectTag.java
++++ b/src/java/com/germinus/easyconf/taglib/ConfigurationObjectTag.java
+@@ -18,7 +18,7 @@
+ import com.germinus.easyconf.EasyConf;
+ import javax.servlet.jsp.tagext.BodyTagSupport;
+ import javax.servlet.jsp.JspException;
+-import org.apache.struts.util.RequestUtils;
++import javax.servlet.jsp.PageContext;
+ 
+ 
+ 
+@@ -110,7 +110,7 @@
+         if (confObj == null) {
+             JspException e = new JspException("The value of the configuration object is null. " +
+             		"Check the configuration files");
+-            RequestUtils.saveException(pageContext, e);
++            pageContext.setAttribute("org.apache.struts.action.EXCEPTION", e, PageContext.REQUEST_SCOPE);
+             throw e;
+         }
+         pageContext.setAttribute(id, confObj);
diff -Nru easyconf-0.9.5/debian/patches/series easyconf-0.9.5/debian/patches/series
--- easyconf-0.9.5/debian/patches/series	2014-09-08 06:23:31.000000000 +0000
+++ easyconf-0.9.5/debian/patches/series	2014-11-19 09:05:30.000000000 +0000
@@ -1 +1,2 @@
 fix_test.diff
+disable-struts-support.diff
diff -Nru easyconf-0.9.5/debian/rules easyconf-0.9.5/debian/rules
--- easyconf-0.9.5/debian/rules	2014-09-08 06:57:07.000000000 +0000
+++ easyconf-0.9.5/debian/rules	2014-11-19 16:27:04.000000000 +0000
@@ -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-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