[pkg-java] r3630 - trunk/libcommons-dbcp-java/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-06-09 14:13:20 +0000 (Sat, 09 Jun 2007)
New Revision: 3630

Modified:
   trunk/libcommons-dbcp-java/debian/changelog
   trunk/libcommons-dbcp-java/debian/control
   trunk/libcommons-dbcp-java/debian/rules
Log:
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 <konqueror at gmx.de>  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 <bddebian at comcast.net>  Fri, 26 Jan 2007 19:13:45 -0500



Modified: trunk/libcommons-dbcp-java/debian/changelog
===================================================================
--- trunk/libcommons-dbcp-java/debian/changelog	2007-06-08 07:39:26 UTC (rev 3629)
+++ trunk/libcommons-dbcp-java/debian/changelog	2007-06-09 14:13:20 UTC (rev 3630)
@@ -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 <konqueror at gmx.de>  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 <bddebian at comcast.net>  Fri, 26 Jan 2007 19:13:45 -0500
+
 libcommons-dbcp-java (1.2.1-4) unstable; urgency=low
 
   * kaffe compiler transition

Modified: trunk/libcommons-dbcp-java/debian/control
===================================================================
--- trunk/libcommons-dbcp-java/debian/control	2007-06-08 07:39:26 UTC (rev 3629)
+++ trunk/libcommons-dbcp-java/debian/control	2007-06-09 14:13:20 UTC (rev 3630)
@@ -2,13 +2,14 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-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 <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
+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

Modified: trunk/libcommons-dbcp-java/debian/rules
===================================================================
--- trunk/libcommons-dbcp-java/debian/rules	2007-06-08 07:39:26 UTC (rev 3629)
+++ trunk/libcommons-dbcp-java/debian/rules	2007-06-09 14:13:20 UTC (rev 3630)
@@ -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