[excalibur-logger] 09/29: Replace dependencies on Servlet 2.4 library with 2.5 one

[Emmanuel Bourg]

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

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

commit 04424303c669e232cfad3394a9172b6d0a8682fb
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Thu Feb 16 02:57:29 2012 +0000

    Replace dependencies on Servlet 2.4 library with 2.5 one
---
 debian/changelog | 13 ++++++++++---
 debian/control   |  8 ++++----
 debian/copyright |  6 +++---
 debian/rules     |  2 +-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9e968d..60fe49f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
-excalibur-logger (2.1-4) unstable; urgency=low
+excalibur-logger (2.1-4) UNRELEASED; urgency=low
 
-  UNRELEASED
   * Team upload.
+
+  [ Torsten Werner ]
   * Disable cdbs' simple patchsys. We don't ship patches anyway.
   * Switch to source format 3.0.
   * Switch to debhelper level 7.
 
- -- Torsten Werner <twerner at debian.org>  Thu, 15 Sep 2011 10:36:10 +0200
+  [ Miguel Landaeta ]
+  * Replace dependencies on Servlet 2.4 library with 2.5 one. (Closes: #658803).
+  * Bump Standards-Version to 3.9.2. No changes were required.
+  * Fix lintian warnings in copyright file.
+  * Fix Vcs-Svn URL.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sun, 05 Feb 2012 20:43:29 -0430
 
 excalibur-logger (2.1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 355d772..7f25bf5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,15 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>
 Build-Depends: debhelper (>= 7), cdbs, ant
-Build-Depends-Indep: default-jdk, libavalon-framework-java, libexcalibur-logkit-java, libjboss-j2ee-java, libgnumail-java, liblog4j1.2-java, libservlet2.4-java, libxalan2-java
-Standards-Version: 3.9.1
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/excalibur-logger/
+Build-Depends-Indep: default-jdk, libavalon-framework-java, libexcalibur-logkit-java, libjboss-j2ee-java, libgnumail-java, liblog4j1.2-java, libservlet2.5-java, libxalan2-java
+Standards-Version: 3.9.2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/excalibur-logger/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/excalibur-logger/
 Homepage: http://excalibur.apache.org/logger.html
 
 Package: libexcalibur-logger-java
 Architecture: all
-Depends: ${misc:Depends}, libavalon-framework-java, libexcalibur-logkit-java, libgeronimo-jms-1.1-spec-java | libjboss-j2ee-java, libgnumail-java, liblog4j1.2-java, libservlet2.4-java, libxalan2-java
+Depends: ${misc:Depends}, libavalon-framework-java, libexcalibur-logkit-java, libgeronimo-jms-1.1-spec-java | libjboss-j2ee-java, libgnumail-java, liblog4j1.2-java, libservlet2.5-java, libxalan2-java
 Description: Excalibur project's log management system
  Excalibur-Logger integrates neatly into the Avalon ECM and Excalibur-Fortress.
  The main goal is to be able to define the log categories on a component basis
diff --git a/debian/copyright b/debian/copyright
index 49b24df..5536cf9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: excalibur-logger
-Maintainer: The Apache Software Foundation
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: excalibur-logger
+Upstream-Contact: The Apache Software Foundation
 Source: http://excalibur.apache.org/
 
 Files: *
diff --git a/debian/rules b/debian/rules
index baff83b..a04a1d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME_DIRS	:= /usr/lib/jvm/default-java
-DEB_JARS	:= avalon-framework excalibur-logkit geronimo-jms-1.1-spec gnumail.jar jboss-j2ee log4j-1.2 servlet-api-2.4 xml-apis
+DEB_JARS	:= avalon-framework excalibur-logkit geronimo-jms-1.1-spec gnumail.jar jboss-j2ee log4j-1.2 servlet-api-2.5 xml-apis
 DEB_ANT_ARGS	:= -Dnoget=true -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
 
 install/libexcalibur-logger-java::

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