[excalibur-logger] 02/29: excalibur-logger 2.1-1

[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 8c114fd0bef528c038e7ec7b8df8fa5d37b76c1c
Author: Onkar Shinde <onkarshinde at ubuntu.com>
Date:   Sat Sep 12 13:29:50 2009 +0000

    excalibur-logger 2.1-1
---
 debian/changelog | 17 +++++++++++++++++
 debian/control   | 14 ++++++++------
 debian/copyright |  2 +-
 debian/rules     |  2 +-
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 445f248..ef5a0fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+excalibur-logger (2.1-1) unstable; urgency=low
+
+  * Merge from Ubuntu. (Closes: #541124)
+  * debian/control
+    - Set maintainer to Debian Java Maintainers. Add myself as uploader.
+    - Add alternate build and runtime dependency on libjboss-j2ee-java as the
+      geronimo package is not present in Debian yet.
+    - Change section to java.
+    - Add Vcs-* fields.
+    - Set standard version to 3.8.3. No changed needed.
+  * debian/rules
+    - Add jboss-j2ee to DEB_JARS.
+  * debian/copyright
+    - Corrected copyright years.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Sat, 12 Sep 2009 17:56:07 +0530
+
 excalibur-logger (2.1-0ubuntu1) karmic; urgency=low
 
   * Initial release.
diff --git a/debian/control b/debian/control
index 33d3c64..5657919 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,18 @@
 Source: excalibur-logger
-Section: net
+Section: java
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
-XSBC-Original-Maintainer: Onkar Shinde <onkarshinde at ubuntu.com>
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>
 Build-Depends: debhelper (>=5), cdbs, ant
-Build-Depends-Indep: default-jdk, libavalon-framework-java, libexcalibur-logkit-java, libgeronimo-jms-1.1-spec-java, libgnumail-java, liblog4j1.2-java, libservlet2.4-java, libxalan2-java
-Standards-Version: 3.8.2
+Build-Depends-Indep: default-jdk, 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
+Standards-Version: 3.8.3
+Vcs-Svn: svn://svn.debian.org/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}, default-jre-headless | java2-runtime-headless, libavalon-framework-java, libexcalibur-logkit-java, libgeronimo-jms-1.1-spec-java, libgnumail-java, liblog4j1.2-java, libservlet2.4-java, libxalan2-java
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, 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
 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 20ff29e..2b91a7d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Maintainer: The Apache Software Foundation
 Source: http://excalibur.apache.org/
 
 Files: *
-Copyright: 2004, The Apache Software Foundation
+Copyright: 2002-2004, The Apache Software Foundation
 License: Apache-2.0
 
 Files: debian/*
diff --git a/debian/rules b/debian/rules
index 9140a60..ec2c925 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.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 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.4 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