[tomcat8] 09/14: Removed libservlet3.1-java.links defining the tomcat-* links in /usr/share/java with the specifications versions

[Emmanuel Bourg]

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

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

commit b6533e2477b75edef8fa350894ad9de3ae4782e0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 13 16:20:02 2013 +0200

    Removed libservlet3.1-java.links defining the tomcat-* links in /usr/share/java with the specifications versions
---
 debian/changelog                |    2 ++
 debian/libservlet3.1-java.links |    3 ---
 debian/tomcat8-common.links     |    6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e14fdb..275b8ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low
     artifacts available on Maven central.
   * Renamed the jars in /usr/share/java to tomcat8-xxx to avoid conflicts
     with other versions of Tomcat
+  * Removed libservlet3.1-java.links defining the tomcat-* links
+    in /usr/share/java with the specifications versions
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 12 Sep 2013 16:10:10 +0200
 
diff --git a/debian/libservlet3.1-java.links b/debian/libservlet3.1-java.links
deleted file mode 100644
index a692163..0000000
--- a/debian/libservlet3.1-java.links
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/share/java/servlet-api-3.1.jar /usr/share/java/tomcat-servlet-api-3.1.jar
-/usr/share/java/jsp-api-2.3.jar     /usr/share/java/tomcat-jsp-api-2.3.jar
-/usr/share/java/el-api-3.0.jar      /usr/share/java/tomcat-el-api-3.0.jar
diff --git a/debian/tomcat8-common.links b/debian/tomcat8-common.links
index 4358639..22ca9f9 100644
--- a/debian/tomcat8-common.links
+++ b/debian/tomcat8-common.links
@@ -1,6 +1,6 @@
 /usr/share/java/tomcat8-juli.jar /usr/share/tomcat8/bin/tomcat-juli.jar
 /usr/share/java/commons-dbcp.jar /usr/share/tomcat8/lib/commons-dbcp.jar
 /usr/share/java/commons-pool.jar /usr/share/tomcat8/lib/commons-pool.jar
-/usr/share/java/tomcat-el-api-3.0.jar /usr/share/tomcat8/lib/el-api.jar
-/usr/share/java/tomcat-jsp-api-2.3.jar /usr/share/tomcat8/lib/jsp-api.jar
-/usr/share/java/tomcat-servlet-api-3.1.jar /usr/share/tomcat8/lib/servlet-api.jar
+/usr/share/java/el-api-3.0.jar /usr/share/tomcat8/lib/el-api.jar
+/usr/share/java/jsp-api-2.3.jar /usr/share/tomcat8/lib/jsp-api.jar
+/usr/share/java/servlet-api-3.1.jar /usr/share/tomcat8/lib/servlet-api.jar

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