[libspring-java] 01/01: Depend on libtaglibs-standard-jstlel-java instead of libjstl1.1-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 8b09424940fd4c3cc2840f29ea467d9e82fbb595
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 16 15:55:33 2016 +0100

    Depend on libtaglibs-standard-jstlel-java instead of libjstl1.1-java
---
 debian/changelog   | 7 +++++++
 debian/control     | 3 +--
 debian/maven.rules | 3 +--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6dea356..25abc0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libspring-java (4.3.4-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on libtaglibs-standard-jstlel-java instead of libjstl1.1-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Nov 2016 15:45:55 +0100
+
 libspring-java (4.3.4-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 4932eb1..c70cb63 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,6 @@ Build-Depends-Indep: bsh,
                      libjackson-json-java,
                      libjackson2-databind-java,
                      libjackson2-dataformat-xml-java,
-                     libjakarta-taglibs-standard-java,
                      libjamon-java,
                      libjasperreports-java (>= 6.1.1+dfsg-4~),
                      libjdo-api-java (>= 3.1),
@@ -61,7 +60,6 @@ Build-Depends-Indep: bsh,
                      libjpa-2.1-spec-java,
                      libjsf-api-java,
                      libjsonpath-java,
-                     libjstl1.1-java,
                      libmail-java,
                      libnetty-java,
                      libopenjpa-java,
@@ -72,6 +70,7 @@ Build-Depends-Indep: bsh,
                      libreactor-core-java (>= 2.0.8),
                      librome-java,
                      libservlet3.1-java,
+                     libtaglibs-standard-jstlel-java,
                      libtiles-java (>= 3.0),
                      libtomcat8-java,
                      libvelocity-tools-java (>= 2.0-3),
diff --git a/debian/maven.rules b/debian/maven.rules
index c94b52c..00c5ef6 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -9,7 +9,7 @@ s/javax.faces/com.sun.faces/ s/javax.faces-api/jsf-api/ * s/.*/debian/ * *
 s/javax.jms/org.apache.geronimo.specs/ s/jms-api/geronimo-jms_1.1_spec/ * s/.*/debian/ * *
 javax.portlet portlet-api * * * *
 s/javax.resource/org.apache.geronimo.specs/ s/connector-api/geronimo-j2ee-connector_1.5_spec/ * s/.*/debian/ * *
-s/javax.servlet.jsp.jstl/javax.servlet/ s/javax.servlet.jsp.jstl-api/jstl/ * s/.*/1.1/ * *
+s/javax.servlet.jsp.jstl/org.apache.taglibs/ s/javax.servlet.jsp.jstl-api/taglibs-standard-spec/ * s/.*/debian/ * *
 javax.servlet javax.servlet-api * s/.*/3.1/ * *
 javax.servlet.jsp javax.servlet.jsp-api * s/2.*/2.3/ * * *
 s/javax.transaction/org.apache.geronimo.specs/ s/javax.transaction-api/geronimo-jta_1.2_spec/ * s/.*/debian/ * *
@@ -29,7 +29,6 @@ org.testng testng * s/.*/6.x/ * *
 taglibs standard * * * *
 s/velocity/org.apache.velocity/ velocity * s/.*/debian/ * *
 
-s/org.apache.taglibs/taglibs/ s/taglibs-standard-jstlel/standard/ * s/.*/debian/ * *
 org.apache.jdo parent-pom * * * *
 org.yaml snakeyaml * s/.*/1.x/ * *
 net.sf.ehcache s/ehcache/ehcache-core/ * s/.*/debian/ * *

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