Please sync libcommons-dbcp-java 1.2.1-5 from Debian unstable

[Michael Koch]

Please sync libcommons-dbcp-java 1.2.1-5 from Debian. This fixes the LP bugs #98822 and #81876. Which can then be closed.

I have built and tested it on current gutsy.

The debdiff from the last debian version:

diff -u libcommons-dbcp-java-1.2.1/debian/changelog libcommons-dbcp-java-1.2.1/debian/changelog
--- libcommons-dbcp-java-1.2.1/debian/changelog
+++ libcommons-dbcp-java-1.2.1/debian/changelog
@@ -1,3 +1,21 @@
+libcommons-dbcp-java (1.2.1-5) unstable; urgency=low
+
+ * Merge from Ubuntu.
+ * Fixed Depends of libcommons-dbcp-java to allow all Java runtimes to be
+ used.
+ * Moved debhelper and cdbs to from Builds-Depends-Indep to Build-Depends.
+ * Added myself to Uploaders and removed Wolfgang.
+ * Updated Standards-Version to 3.7.2.
+
+ -- Michael Koch <email address hidden> Sat, 09 Jun 2007 12:23:34 -0100
+
+libcommons-dbcp-java (1.2.1-4ubuntu1) feisty; urgency=low
+
+ * Re-sync with Debian. Changes retained:
+ * Depend java-gcj-compat rather than java runtimes
+
+ -- Barry deFreese <email address hidden> Fri, 26 Jan 2007 19:13:45 -0500
+
 libcommons-dbcp-java (1.2.1-4) unstable; urgency=low

   * kaffe compiler transition
diff -u libcommons-dbcp-java-1.2.1/debian/rules libcommons-dbcp-java-1.2.1/debian/rules
--- libcommons-dbcp-java-1.2.1/debian/rules
+++ libcommons-dbcp-java-1.2.1/debian/rules
@@ -7,7 +7,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk

-JAVA_HOME_DIRS := /usr/lib/kaffe
+JAVA_HOME_DIRS := /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant
 DEB_JARS := commons-collections commons-pool junit $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_BUILD_TARGET := build
diff -u libcommons-dbcp-java-1.2.1/debian/control libcommons-dbcp-java-1.2.1/debian/control
--- libcommons-dbcp-java-1.2.1/debian/control
+++ libcommons-dbcp-java-1.2.1/debian/control
@@ -2,13 +2,14 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <email address hidden>
-Uploaders: Arnaud Vandyck <email address hidden>, Wolfgang Baer <email address hidden>
-Build-Depends-Indep: debhelper (>= 4.2.30), libcommons-pool-java, libcommons-collections-java, junit, cdbs, ant, kaffe
-Standards-Version: 3.6.2
+Uploaders: Arnaud Vandyck <email address hidden>, Michael Koch <email address hidden>
+Build-Depends: debhelper (>= 4.2.30), cdbs
+Build-Depends-Indep: libcommons-pool-java, libcommons-collections-java, junit, ant, java-gcj-compat-dev
+Standards-Version: 3.7.2

 Package: libcommons-dbcp-java
 Architecture: all
-Depends: kaffe (>= 2:1.1.5-3) | java1-runtime | java2-runtime, libcommons-pool-java, libcommons-collections-java
+Depends: java-gcj-compat | java1-runtime | java2-runtime, libcommons-pool-java, libcommons-collections-java
 Description: Database Connection Pooling Services
  The DBCP package provides database connection pooling services. The
  following features are supported

[Michael Koch (konqueror)]

Rationale:
  New debian version fixes LP bugs #98822 and #81876

Additional Debian changelog:

libcommons-dbcp-java (1.2.1-5) unstable; urgency=low

  * Merge from Ubuntu.
  * Fixed Depends of libcommons-dbcp-java to allow all Java runtimes to be
    used.
  * Moved debhelper and cdbs to from Builds-Depends-Indep to Build-Depends.
  * Added myself to Uploaders and removed Wolfgang.
  * Updated Standards-Version to 3.7.2.

 -- Michael Koch <email address hidden> Sat, 09 Jun 2007 12:23:34 -0100

[Emmet Hikory (persia)]

SYNC Request ACK'd.

[Sebastien Bacher (seb128)]

[Updating] libcommons-dbcp-java (1.2.1-4ubuntu1 [Ubuntu] < 1.2.1-5 [Debian])
 * Trying to add libcommons-dbcp-java...
  - <libcommons-dbcp-java_1.2.1.orig.tar.gz: already in distro - downloading from librarian>
  - <libcommons-dbcp-java_1.2.1-5.diff.gz: downloading from http://ftp.debian.org/debian/>
  - <libcommons-dbcp-java_1.2.1-5.dsc: downloading from http://ftp.debian.org/debian/>
I: libcommons-dbcp-java [universe] -> libcommons-dbcp-java_1.2.1-4ubuntu1 [universe].