[SCM] tomcat6 packaging branch, master, updated. debian/6.0.35-1-5-g48d7b90

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit 48d7b90cb5a0ba03d8803e013b8fe6cca6b347e8
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Wed Mar 28 01:09:05 2012 -0430

    Provide debian version symlink for Maven artifacts

diff --git a/debian/changelog b/debian/changelog
index 9491f5f..ac5cc3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ tomcat6 (6.0.35-2) UNRELEASED; urgency=low
 
   [ Miguel Landaeta ]
   * Bump Standards-Version to 3.9.3. No changes were required.
+  * Provide 'debian' version symlink for Maven artifacts. (Closes: #665393).
 
- -- Miguel Landaeta <miguel at miguel.cc>  Tue, 27 Mar 2012 21:26:47 -0430
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 27 Mar 2012 21:28:50 -0430
 
 tomcat6 (6.0.35-1) unstable; urgency=low
 
diff --git a/debian/maven.rules b/debian/maven.rules
index 0a208f2..18a5886 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,8 +1,8 @@
 # Force the version of the javax apis
-javax.servlet servlet-api jar 2.5
-javax.servlet.jsp jsp-api jar 2.1
-javax.el el-api jar 2.1
+javax.servlet servlet-api jar s/.*/debian/
+javax.servlet.jsp jsp-api jar s/.*/debian/
+javax.el el-api jar s/.*/debian/
 # Convert tomcat version of the standard apis to the javax apis
-s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/
-s/org.apache.tomcat/javax.servlet.jsp/ jsp-api jar s/.*/2.1/
-s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/
+s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/debian/
+s/org.apache.tomcat/javax.servlet.jsp/ jsp-api jar s/.*/debian/
+s/org.apache.tomcat/javax.el/ el-api jar s/.*/debian/

-- 
tomcat6 packaging