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

[Damien Raude-Morvan]

Author: drazzib
Date: 2009-11-26 22:49:18 +0000 (Thu, 26 Nov 2009)
New Revision: 11136

Modified:
   trunk/libcommons-dbcp-java/debian/ant.properties
   trunk/libcommons-dbcp-java/debian/changelog
   trunk/libcommons-dbcp-java/debian/control
   trunk/libcommons-dbcp-java/debian/maven.rules
   trunk/libcommons-dbcp-java/debian/rules
Log:
* Use commons-collections 3.x:
  - Build-Depends and Depends on libcommons-collection3-java
  - Update classpath in DEB_JARS from debian/rules
  - Fix transformation in debian/maven.rules

Modified: trunk/libcommons-dbcp-java/debian/ant.properties
===================================================================
--- trunk/libcommons-dbcp-java/debian/ant.properties	2009-11-26 22:47:52 UTC (rev 11135)
+++ trunk/libcommons-dbcp-java/debian/ant.properties	2009-11-26 22:49:18 UTC (rev 11136)
@@ -1,2 +1,2 @@
-commons-collections.jar=/usr/share/java/commons-collections.jar
+commons-collections.jar=/usr/share/java/commons-collections3.jar
 commons-pool.jar=/usr/share/java/commons-pool.jar

Modified: trunk/libcommons-dbcp-java/debian/changelog
===================================================================
--- trunk/libcommons-dbcp-java/debian/changelog	2009-11-26 22:47:52 UTC (rev 11135)
+++ trunk/libcommons-dbcp-java/debian/changelog	2009-11-26 22:49:18 UTC (rev 11136)
@@ -1,3 +1,12 @@
+libcommons-dbcp-java (1.3~svn828639-2) UNRELEASED; urgency=low
+
+  * Use commons-collections 3.x:
+    - Build-Depends and Depends on libcommons-collection3-java
+    - Update classpath in DEB_JARS from debian/rules
+    - Fix transformation in debian/maven.rules
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 26 Nov 2009 23:48:43 +0100
+
 libcommons-dbcp-java (1.3~svn828639-1) unstable; urgency=low
 
   * New upstream SVN snapshot (r828639)

Modified: trunk/libcommons-dbcp-java/debian/control
===================================================================
--- trunk/libcommons-dbcp-java/debian/control	2009-11-26 22:47:52 UTC (rev 11135)
+++ trunk/libcommons-dbcp-java/debian/control	2009-11-26 22:49:18 UTC (rev 11136)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, quilt
-Build-Depends-Indep: libcommons-pool-java, libcommons-collections-java, junit, glassfish-javaee, maven-repo-helper
+Build-Depends-Indep: libcommons-pool-java, libcommons-collections3-java, junit, glassfish-javaee, maven-repo-helper
 Standards-Version: 3.8.3
 Homepage: http://commons.apache.org/dbcp/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-dbcp-java/
@@ -12,7 +12,7 @@
 
 Package: libcommons-dbcp-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libcommons-pool-java, libcommons-collections-java
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libcommons-pool-java, libcommons-collections3-java
 Suggests: glassfish-javaee
 Description: Database Connection Pooling Services
  The DBCP package provides database connection pooling services. The

Modified: trunk/libcommons-dbcp-java/debian/maven.rules
===================================================================
--- trunk/libcommons-dbcp-java/debian/maven.rules	2009-11-26 22:47:52 UTC (rev 11135)
+++ trunk/libcommons-dbcp-java/debian/maven.rules	2009-11-26 22:49:18 UTC (rev 11136)
@@ -1,2 +1,3 @@
 junit junit jar s/3\..*/3.x/ *
 s/org.apache.geronimo.specs/glassfish/ s/geronimo-jta_1.1_spec/javaee/ jar s/.*/debian/
+commons-collections commons-collections jar s/3\..*/3.x/

Modified: trunk/libcommons-dbcp-java/debian/rules
===================================================================
--- trunk/libcommons-dbcp-java/debian/rules	2009-11-26 22:47:52 UTC (rev 11135)
+++ trunk/libcommons-dbcp-java/debian/rules	2009-11-26 22:49:18 UTC (rev 11136)
@@ -6,7 +6,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := commons-collections commons-pool junit glassfish-javaee
+DEB_JARS             := commons-collections3 commons-pool junit glassfish-javaee
 
 PACKAGE=commons-dbcp