Author: twerner Date: 2011-09-11 15:37:27 +0000 (Sun, 11 Sep 2011) New Revision: 14821
Added: tags/libcommons-dbcp-java/1.4-2/ tags/libcommons-dbcp-java/1.4-2/debian/README.source tags/libcommons-dbcp-java/1.4-2/debian/TODO tags/libcommons-dbcp-java/1.4-2/debian/changelog tags/libcommons-dbcp-java/1.4-2/debian/control tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.doc-base.api tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.install tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java.poms tags/libcommons-dbcp-java/1.4-2/debian/maven.cleanIgnoreRules tags/libcommons-dbcp-java/1.4-2/debian/maven.ignoreRules tags/libcommons-dbcp-java/1.4-2/debian/maven.properties tags/libcommons-dbcp-java/1.4-2/debian/maven.publishedRules tags/libcommons-dbcp-java/1.4-2/debian/maven.rules tags/libcommons-dbcp-java/1.4-2/debian/patches/0001-configure-source-and-target-version-1.5.patch tags/libcommons-dbcp-java/1.4-2/debian/patches/series tags/libcommons-dbcp-java/1.4-2/debian/rules Removed: tags/libcommons-dbcp-java/1.4-2/debian/README.source tags/libcommons-dbcp-java/1.4-2/debian/ant.properties tags/libcommons-dbcp-java/1.4-2/debian/changelog tags/libcommons-dbcp-java/1.4-2/debian/control tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.doc-base tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.install tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java.poms tags/libcommons-dbcp-java/1.4-2/debian/maven.rules tags/libcommons-dbcp-java/1.4-2/debian/patches/01_build.patch tags/libcommons-dbcp-java/1.4-2/debian/patches/series tags/libcommons-dbcp-java/1.4-2/debian/rules Log: [svn-buildpackage] Tagging libcommons-dbcp-java 1.4-2 Deleted: tags/libcommons-dbcp-java/1.4-2/debian/README.source =================================================================== --- trunk/libcommons-dbcp-java/debian/README.source 2011-09-11 13:06:21 UTC (rev 14819) +++ tags/libcommons-dbcp-java/1.4-2/debian/README.source 2011-09-11 15:37:27 UTC (rev 14821) @@ -1,6 +0,0 @@ -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -See /usr/share/doc/quilt/README.source for a detailed explanation. - Copied: tags/libcommons-dbcp-java/1.4-2/debian/README.source (from rev 14820, trunk/libcommons-dbcp-java/debian/README.source) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/README.source (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/README.source 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1,9 @@ +Information about libcommons-dbcp-java +------------------------------ + +This package was debianized using the mh_make command +from the maven-debian-helper package. + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. Copied: tags/libcommons-dbcp-java/1.4-2/debian/TODO (from rev 14820, trunk/libcommons-dbcp-java/debian/TODO) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/TODO (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/TODO 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1 @@ +- build and run tests Deleted: tags/libcommons-dbcp-java/1.4-2/debian/ant.properties =================================================================== --- trunk/libcommons-dbcp-java/debian/ant.properties 2011-09-11 13:06:21 UTC (rev 14819) +++ tags/libcommons-dbcp-java/1.4-2/debian/ant.properties 2011-09-11 15:37:27 UTC (rev 14821) @@ -1,2 +0,0 @@ -commons-collections.jar=/usr/share/java/commons-collections3.jar -commons-pool.jar=/usr/share/java/commons-pool.jar Deleted: tags/libcommons-dbcp-java/1.4-2/debian/changelog =================================================================== --- trunk/libcommons-dbcp-java/debian/changelog 2011-09-11 13:06:21 UTC (rev 14819) +++ tags/libcommons-dbcp-java/1.4-2/debian/changelog 2011-09-11 15:37:27 UTC (rev 14821) @@ -1,169 +0,0 @@ -libcommons-dbcp-java (1.4-2) unstable; urgency=low - - UNRELEASED (should switch to Maven, needs pom of geronimo jta, see #581663) - * Team upload. - * Switch to source format 3.0. - * Remove Java runtime from Depends. - * Update Standards-Version: 3.9.1. - - -- Torsten Werner <twer...@debian.org> Sat, 03 Sep 2011 12:51:16 +0200 - -libcommons-dbcp-java (1.4-1) unstable; urgency=low - - * New upstream release: - * 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 - * Remove Arnaud Vandyck from Uploaders - * Javadoc: - - Build-Depends on default-jdk-doc - - Link generated Javadoc with it - - libcommons-dbcp-java-doc now Recommends default-jdk-doc - * Rewrite debian/watch and debian/orig-tar.sh to work with upstream - stable release instead of svn snapshot. - - -- Damien Raude-Morvan <draz...@debian.org> Sat, 20 Feb 2010 22:50:18 +0100 - -libcommons-dbcp-java (1.3~svn828639-1) unstable; urgency=low - - * New upstream SVN snapshot (r828639) - * Update my email address - * Bumped debhelper version to 7 - - -- Damien Raude-Morvan <draz...@debian.org> Fri, 23 Oct 2009 22:44:57 +0200 - -libcommons-dbcp-java (1.3~svn803474-1) unstable; urgency=low - - [ Emmanuel Bourg ] - * Update of the URLs - * Rename Jakarta Commons to Apache Commons - * debian/copyright: Switch to Apache License 2.0. Closes: #532888. - - [ Damien Raude-Morvan ] - * New upstream SVN snapshot (r803474). - - Fix FTBFS when using OpenJDK-6 (JDBC4 API) (Closes: #539179) - - Add Build-Depends and Suggests on glassfish-javaee - * Add myself as Uploaders - * Bump Debhelper to 5 - * Use default-jdk/jre: - - Build-Depends on default-jdk - - Depends on default-jre-headless - - Use /usr/lib/jvm/default-java as JAVA_HOME - * Updated Standards-Version to 3.8.3: - - Change section to "java" - - Include a get-orig-source target - - Add Homepage field - * Remove useless dirs/links debhelper files - * Split Javadoc API in a -doc package - * Use quilt as patch system - * Maven POMs: - - Add a Build-Depends-Indep dependency on maven-repo-helper - - Use mh_installpom and mh_installjar to install the POM and the jar to the - Maven repository - * Move api documentation to /usr/share/doc/libcommons-dbcp-java/api - - -- Damien Raude-Morvan <draz...@drazzib.com> Tue, 18 Aug 2009 21:04:39 +0200 - -libcommons-dbcp-java (1.2.2-1) unstable; urgency=low - - * New upstream release - * Added watch file - - -- Michael Koch <konque...@gmx.de> Tue, 19 Jun 2007 15:58:41 +0200 - -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 <konque...@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 <bddeb...@comcast.net> Fri, 26 Jan 2007 19:13:45 -0500 - -libcommons-dbcp-java (1.2.1-4) unstable; urgency=low - - * kaffe compiler transition - + Removed build compiler jikes setting in debian/rules - + Build-Depend only on kaffe - * Standards-version 3.6.2 (no changes) - * Depend on kaffe | java1-runtime | java2-runtime - * Bumped debhelper version to fix linda error - * Added myself to uploaders - - -- Wolfgang Baer <wb...@gmx.de> Sun, 15 Jan 2006 16:45:00 +0100 - -libcommons-dbcp-java (1.2.1-3) unstable; urgency=low - - * libant1.6-java to ant transition - - -- Arnaud Vandyck <av...@debian.org> Sat, 20 Aug 2005 19:41:10 +0200 - -libcommons-dbcp-java (1.2.1-2) unstable; urgency=low - - * built with kaffe - * now build the javadoc (closes: #234640). - - -- Arnaud Vandyck <av...@debian.org> Mon, 28 Feb 2005 11:50:22 +0100 - -libcommons-dbcp-java (1.2.1-1) unstable; urgency=low - - * New upstream release - - -- Arnaud Vandyck <av...@debian.org> Sun, 11 Jul 2004 20:09:12 +0200 - -libcommons-dbcp-java (1.0-6) unstable; urgency=low - - * added cdbs, jikes and libant1.5-java, thanks to Goswin Brederlow - (closes: #258684) - * now build with sablevm - * updated standard to 3.6.1 (nothing to change) - * no more documentation at the moment - - -- Arnaud Vandyck <av...@debian.org> Sun, 11 Jul 2004 19:54:00 +0200 - -libcommons-dbcp-java (1.0-5) unstable; urgency=low - - * Move to main! c-pool and c-collections are now in main. - * debian/rules (clean): now clean the doc/api directory - - -- Arnaud Vandyck <av...@debian.org> Thu, 8 Apr 2004 17:04:32 +0200 - -libcommons-dbcp-java (1.0-4) unstable; urgency=low - - * added the java2-runtime dependency to let the choice to the user, - thanks to ADFH (?! ;) (closes: #233648). - - -- Arnaud Vandyck <av...@debian.org> Thu, 19 Feb 2004 12:02:34 +0100 - -libcommons-dbcp-java (1.0-3) unstable; urgency=low - - * Removed the java2 dependency. - - -- Arnaud Vandyck <av...@debian.org> Mon, 16 Feb 2004 15:51:50 +0100 - -libcommons-dbcp-java (1.0-2) unstable; urgency=low - - * debian/rules: now build with cdbs and kaffe 1:1.1.3 - * debian/control: - - changed the maintainer field and me to the uploaders with my debian - email - - (Build-Depends-Indep): added libcommons-collections-java - - -- Arnaud Vandyck <av...@debian.org> Sat, 10 Jan 2004 18:14:37 +0100 - -libcommons-dbcp-java (1.0-1) unstable; urgency=low - - * Initial Release (closes: #188574). - - -- Arnaud Vandyck <arnaud.vand...@ulg.ac.be> Sat, 12 Jul 2003 11:33:30 +0200 - Copied: tags/libcommons-dbcp-java/1.4-2/debian/changelog (from rev 14820, trunk/libcommons-dbcp-java/debian/changelog) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/changelog (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/changelog 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1,169 @@ +libcommons-dbcp-java (1.4-2) unstable; urgency=low + + * Team upload. + * Switch to source format 3.0. + * Remove Java runtime from Depends. + * Update Standards-Version: 3.9.1. + * Use Maven to build the package. + + -- Torsten Werner <twer...@debian.org> Sun, 11 Sep 2011 17:15:36 +0200 + +libcommons-dbcp-java (1.4-1) unstable; urgency=low + + * New upstream release: + * 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 + * Remove Arnaud Vandyck from Uploaders + * Javadoc: + - Build-Depends on default-jdk-doc + - Link generated Javadoc with it + - libcommons-dbcp-java-doc now Recommends default-jdk-doc + * Rewrite debian/watch and debian/orig-tar.sh to work with upstream + stable release instead of svn snapshot. + + -- Damien Raude-Morvan <draz...@debian.org> Sat, 20 Feb 2010 22:50:18 +0100 + +libcommons-dbcp-java (1.3~svn828639-1) unstable; urgency=low + + * New upstream SVN snapshot (r828639) + * Update my email address + * Bumped debhelper version to 7 + + -- Damien Raude-Morvan <draz...@debian.org> Fri, 23 Oct 2009 22:44:57 +0200 + +libcommons-dbcp-java (1.3~svn803474-1) unstable; urgency=low + + [ Emmanuel Bourg ] + * Update of the URLs + * Rename Jakarta Commons to Apache Commons + * debian/copyright: Switch to Apache License 2.0. Closes: #532888. + + [ Damien Raude-Morvan ] + * New upstream SVN snapshot (r803474). + - Fix FTBFS when using OpenJDK-6 (JDBC4 API) (Closes: #539179) + - Add Build-Depends and Suggests on glassfish-javaee + * Add myself as Uploaders + * Bump Debhelper to 5 + * Use default-jdk/jre: + - Build-Depends on default-jdk + - Depends on default-jre-headless + - Use /usr/lib/jvm/default-java as JAVA_HOME + * Updated Standards-Version to 3.8.3: + - Change section to "java" + - Include a get-orig-source target + - Add Homepage field + * Remove useless dirs/links debhelper files + * Split Javadoc API in a -doc package + * Use quilt as patch system + * Maven POMs: + - Add a Build-Depends-Indep dependency on maven-repo-helper + - Use mh_installpom and mh_installjar to install the POM and the jar to the + Maven repository + * Move api documentation to /usr/share/doc/libcommons-dbcp-java/api + + -- Damien Raude-Morvan <draz...@drazzib.com> Tue, 18 Aug 2009 21:04:39 +0200 + +libcommons-dbcp-java (1.2.2-1) unstable; urgency=low + + * New upstream release + * Added watch file + + -- Michael Koch <konque...@gmx.de> Tue, 19 Jun 2007 15:58:41 +0200 + +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 <konque...@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 <bddeb...@comcast.net> Fri, 26 Jan 2007 19:13:45 -0500 + +libcommons-dbcp-java (1.2.1-4) unstable; urgency=low + + * kaffe compiler transition + + Removed build compiler jikes setting in debian/rules + + Build-Depend only on kaffe + * Standards-version 3.6.2 (no changes) + * Depend on kaffe | java1-runtime | java2-runtime + * Bumped debhelper version to fix linda error + * Added myself to uploaders + + -- Wolfgang Baer <wb...@gmx.de> Sun, 15 Jan 2006 16:45:00 +0100 + +libcommons-dbcp-java (1.2.1-3) unstable; urgency=low + + * libant1.6-java to ant transition + + -- Arnaud Vandyck <av...@debian.org> Sat, 20 Aug 2005 19:41:10 +0200 + +libcommons-dbcp-java (1.2.1-2) unstable; urgency=low + + * built with kaffe + * now build the javadoc (closes: #234640). + + -- Arnaud Vandyck <av...@debian.org> Mon, 28 Feb 2005 11:50:22 +0100 + +libcommons-dbcp-java (1.2.1-1) unstable; urgency=low + + * New upstream release + + -- Arnaud Vandyck <av...@debian.org> Sun, 11 Jul 2004 20:09:12 +0200 + +libcommons-dbcp-java (1.0-6) unstable; urgency=low + + * added cdbs, jikes and libant1.5-java, thanks to Goswin Brederlow + (closes: #258684) + * now build with sablevm + * updated standard to 3.6.1 (nothing to change) + * no more documentation at the moment + + -- Arnaud Vandyck <av...@debian.org> Sun, 11 Jul 2004 19:54:00 +0200 + +libcommons-dbcp-java (1.0-5) unstable; urgency=low + + * Move to main! c-pool and c-collections are now in main. + * debian/rules (clean): now clean the doc/api directory + + -- Arnaud Vandyck <av...@debian.org> Thu, 8 Apr 2004 17:04:32 +0200 + +libcommons-dbcp-java (1.0-4) unstable; urgency=low + + * added the java2-runtime dependency to let the choice to the user, + thanks to ADFH (?! ;) (closes: #233648). + + -- Arnaud Vandyck <av...@debian.org> Thu, 19 Feb 2004 12:02:34 +0100 + +libcommons-dbcp-java (1.0-3) unstable; urgency=low + + * Removed the java2 dependency. + + -- Arnaud Vandyck <av...@debian.org> Mon, 16 Feb 2004 15:51:50 +0100 + +libcommons-dbcp-java (1.0-2) unstable; urgency=low + + * debian/rules: now build with cdbs and kaffe 1:1.1.3 + * debian/control: + - changed the maintainer field and me to the uploaders with my debian + email + - (Build-Depends-Indep): added libcommons-collections-java + + -- Arnaud Vandyck <av...@debian.org> Sat, 10 Jan 2004 18:14:37 +0100 + +libcommons-dbcp-java (1.0-1) unstable; urgency=low + + * Initial Release (closes: #188574). + + -- Arnaud Vandyck <arnaud.vand...@ulg.ac.be> Sat, 12 Jul 2003 11:33:30 +0200 + Deleted: tags/libcommons-dbcp-java/1.4-2/debian/control =================================================================== --- trunk/libcommons-dbcp-java/debian/control 2011-09-11 13:06:21 UTC (rev 14819) +++ tags/libcommons-dbcp-java/1.4-2/debian/control 2011-09-11 15:37:27 UTC (rev 14821) @@ -1,52 +0,0 @@ -Source: libcommons-dbcp-java -Section: java -Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Michael Koch <konque...@gmx.de>, Damien Raude-Morvan <draz...@debian.org> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant -Build-Depends-Indep: libcommons-pool-java, libcommons-collections3-java, junit, - glassfish-javaee, maven-repo-helper, default-jdk-doc, libcommons-pool-java-doc -Standards-Version: 3.9.1 -Homepage: http://commons.apache.org/dbcp/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-dbcp-java/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-dbcp-java/ - -Package: libcommons-dbcp-java -Architecture: all -Depends: ${misc:Depends}, libcommons-pool-java, libcommons-collections3-java -Suggests: glassfish-javaee -Description: Database Connection Pooling Services - The DBCP package provides database connection pooling services. The - following features are supported - . - * DataSource and Driver interfaces to the pool. - * Support for arbitrary sources of the underlying Connections. - * Integration with arbitrary org.apache.commons.pool.ObjectPool - implementations. - * Support for Connection validation, expiration, etc. - * Support for PreparedStatement pooling. - * XML configuration. - . - This is a part of the Apache Commons Project. - -Package: libcommons-dbcp-java-doc -Architecture: all -Section: doc -Depends: ${misc:Depends} -Recommends: libcommons-pool-java-doc, default-jdk-doc -Suggests: libcommons-dbcp-java -Description: Database Connection Pooling Services - documentation - The DBCP package provides database connection pooling services. The - following features are supported - . - * DataSource and Driver interfaces to the pool. - * Support for arbitrary sources of the underlying Connections. - * Integration with arbitrary org.apache.commons.pool.ObjectPool - implementations. - * Support for Connection validation, expiration, etc. - * Support for PreparedStatement pooling. - * XML configuration. - . - This is a part of the Apache Commons Project. - . - This package contains Javadoc API Documentation of Commons DBCP. Copied: tags/libcommons-dbcp-java/1.4-2/debian/control (from rev 14820, trunk/libcommons-dbcp-java/debian/control) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/control (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/control 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1,53 @@ +Source: libcommons-dbcp-java +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Uploaders: Michael Koch <konque...@gmx.de>, Damien Raude-Morvan <draz...@debian.org> +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: libclirr-maven-plugin-java, libmaven-javadoc-plugin-java, libcommons-pool-java, + default-jdk-doc, libcommons-pool-java-doc, libgeronimo-jta-1.1-spec-java +Standards-Version: 3.9.1 +Homepage: http://commons.apache.org/dbcp/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-dbcp-java/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-dbcp-java/ + +Package: libcommons-dbcp-java +Architecture: all +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libcommons-dbcp-java-doc +Description: Database Connection Pooling Services + The DBCP package provides database connection pooling services. The + following features are supported + . + * DataSource and Driver interfaces to the pool. + * Support for arbitrary sources of the underlying Connections. + * Integration with arbitrary org.apache.commons.pool.ObjectPool + implementations. + * Support for Connection validation, expiration, etc. + * Support for PreparedStatement pooling. + * XML configuration. + . + This is a part of the Apache Commons Project. + +Package: libcommons-dbcp-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} +Suggests: libcommons-dbcp-java +Description: Database Connection Pooling Services - documentation + The DBCP package provides database connection pooling services. The + following features are supported + . + * DataSource and Driver interfaces to the pool. + * Support for arbitrary sources of the underlying Connections. + * Integration with arbitrary org.apache.commons.pool.ObjectPool + implementations. + * Support for Connection validation, expiration, etc. + * Support for PreparedStatement pooling. + * XML configuration. + . + This is a part of the Apache Commons Project. + . + This package contains Javadoc API Documentation of Commons DBCP. Deleted: tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.doc-base =================================================================== --- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base 2011-09-11 13:06:21 UTC (rev 14819) +++ tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.doc-base 2011-09-11 15:37:27 UTC (rev 14821) @@ -1,10 +0,0 @@ -Document: libcommons-dbcp-java -Title: API Javadoc for libcommons-dbcp-java -Author: libcommons-dbcp-java developers -Abstract: This is the API Javadoc provided by the libcommons-dbcp-java library. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libcommons-dbcp-java/api/index.html -Files: /usr/share/doc/libcommons-dbcp-java/api/* - Copied: tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.doc-base.api (from rev 14820, trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base.api) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.doc-base.api (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.doc-base.api 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1,10 @@ +Document: libcommons-dbcp-java +Title: API Javadoc for Commons DBCP +Author: Commons DBCP developers +Abstract: This is the API Javadoc provided for the + libcommons-dbcp-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcommons-dbcp-java/api/index.html +Files: /usr/share/doc/libcommons-dbcp-java/api/* Deleted: tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.install =================================================================== --- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.install 2011-09-11 13:06:21 UTC (rev 14819) +++ tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.install 2011-09-11 15:37:27 UTC (rev 14821) @@ -1 +0,0 @@ -dist/docs/* /usr/share/doc/libcommons-dbcp-java Copied: tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.install (from rev 14820, trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.install) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.install (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java-doc.install 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libcommons-dbcp-java/api + Deleted: tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java.poms =================================================================== --- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms 2011-09-11 13:06:21 UTC (rev 14819) +++ tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java.poms 2011-09-11 15:37:27 UTC (rev 14821) @@ -1 +0,0 @@ -pom.xml --no-parent Copied: tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java.poms (from rev 14820, trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java.poms (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/libcommons-dbcp-java.poms 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1,26 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar +# it will be installed with mh_install. +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created +# temporarily for certain artifacts such as Javadoc jars. +# +pom.xml --no-parent --has-package-version Copied: tags/libcommons-dbcp-java/1.4-2/debian/maven.cleanIgnoreRules (from rev 14820, trunk/libcommons-dbcp-java/debian/maven.cleanIgnoreRules) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/maven.cleanIgnoreRules (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/maven.cleanIgnoreRules 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1,17 @@ +# Maven clean ignore rules - ignore some Maven dependencies and plugins +# during the clean phase of a Maven build +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM before mvn clean is called +# junit junit jar s/3\\..*/3.x/ + Copied: tags/libcommons-dbcp-java/1.4-2/debian/maven.ignoreRules (from rev 14820, trunk/libcommons-dbcp-java/debian/maven.ignoreRules) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/maven.ignoreRules (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/maven.ignoreRules 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1,28 @@ +# Maven ignore rules - ignore some Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM +# junit junit jar s/3\\..*/3.x/ + +commons-logging commons-logging * * * * +junit junit * * * * +org.apache.geronimo.modules geronimo-transaction * * * * +org.apache.maven.plugins maven-assembly-plugin * * * * +org.apache.maven.plugins maven-changes-plugin * * * * +org.apache.maven.plugins maven-checkstyle-plugin * * * * +org.apache.maven.plugins maven-pmd-plugin * * * * +org.apache.maven.plugins maven-surefire-plugin * * * * +org.codehaus.mojo cobertura-maven-plugin * * * * +org.codehaus.mojo findbugs-maven-plugin * * * * +tomcat naming-common * * * * +tomcat naming-java * * * * Copied: tags/libcommons-dbcp-java/1.4-2/debian/maven.properties (from rev 14820, trunk/libcommons-dbcp-java/debian/maven.properties) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/maven.properties (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/maven.properties 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1,5 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.skip=true Copied: tags/libcommons-dbcp-java/1.4-2/debian/maven.publishedRules (from rev 14820, trunk/libcommons-dbcp-java/debian/maven.publishedRules) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/maven.publishedRules (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/maven.publishedRules 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1,19 @@ +# Maven published rules - additional rules to publish, to help +# the packaging work of Debian maintainers using mh_make +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + Deleted: tags/libcommons-dbcp-java/1.4-2/debian/maven.rules =================================================================== --- trunk/libcommons-dbcp-java/debian/maven.rules 2011-09-11 13:06:21 UTC (rev 14819) +++ tags/libcommons-dbcp-java/1.4-2/debian/maven.rules 2011-09-11 15:37:27 UTC (rev 14821) @@ -1,3 +0,0 @@ -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/ Copied: tags/libcommons-dbcp-java/1.4-2/debian/maven.rules (from rev 14820, trunk/libcommons-dbcp-java/debian/maven.rules) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/maven.rules (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/maven.rules 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1,19 @@ +# Maven rules - transform Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + +commons-dbcp commons-dbcp jar s/.*/debian/ * * Copied: tags/libcommons-dbcp-java/1.4-2/debian/patches/0001-configure-source-and-target-version-1.5.patch (from rev 14820, trunk/libcommons-dbcp-java/debian/patches/0001-configure-source-and-target-version-1.5.patch) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/patches/0001-configure-source-and-target-version-1.5.patch (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/patches/0001-configure-source-and-target-version-1.5.patch 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1,28 @@ +From: Torsten Werner <twer...@debian.org> +Date: Sun, 11 Sep 2011 17:24:30 +0200 +Subject: configure source and target version 1.5 + +--- + pom.xml | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/pom.xml b/pom.xml +index bff49ea..e145e42 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -265,6 +265,14 @@ + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-compiler-plugin</artifactId> ++ <configuration> ++ <source>1.5</source> ++ <target>1.5</target> ++ </configuration> ++ </plugin> + </plugins> + </build> + <reporting> +-- Deleted: tags/libcommons-dbcp-java/1.4-2/debian/patches/01_build.patch =================================================================== --- trunk/libcommons-dbcp-java/debian/patches/01_build.patch 2011-09-11 13:06:21 UTC (rev 14819) +++ tags/libcommons-dbcp-java/1.4-2/debian/patches/01_build.patch 2011-09-11 15:37:27 UTC (rev 14821) @@ -1,24 +0,0 @@ -Description: Cleanup upstream build.xml: - - Use local Javadoc index from default-jdk-doc - - Set test.failonerror to false -Origin: vendor -Forwarded: not-needed -Author: Damien Raude-Morvan <draz...@debian.org> -Last-Update: 2010-02-20 ---- a/build.xml -+++ b/build.xml -@@ -179,8 +179,8 @@ - nohelp="true" - nonavbar="false" - serialwarn="false"> -- <link href="http://java.sun.com/j2se/1.5.0/docs/api"/> -- <link href="http://commons.apache.org/pool/apidocs"/> -+ <link href="/usr/share/doc/default-jdk-doc/api/"/> -+ <link href="/usr/share/doc/libcommons-pool-java/api/"/> - </javadoc> - </target> - ---- /dev/null -+++ b/build.properties -@@ -0,0 +1 @@ -+test.failonerror=false Deleted: tags/libcommons-dbcp-java/1.4-2/debian/patches/series =================================================================== --- trunk/libcommons-dbcp-java/debian/patches/series 2011-09-11 13:06:21 UTC (rev 14819) +++ tags/libcommons-dbcp-java/1.4-2/debian/patches/series 2011-09-11 15:37:27 UTC (rev 14821) @@ -1 +0,0 @@ -01_build.patch Copied: tags/libcommons-dbcp-java/1.4-2/debian/patches/series (from rev 14820, trunk/libcommons-dbcp-java/debian/patches/series) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/patches/series (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/patches/series 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1 @@ +0001-configure-source-and-target-version-1.5.patch Deleted: tags/libcommons-dbcp-java/1.4-2/debian/rules =================================================================== --- trunk/libcommons-dbcp-java/debian/rules 2011-09-11 13:06:21 UTC (rev 14819) +++ tags/libcommons-dbcp-java/1.4-2/debian/rules 2011-09-11 15:37:27 UTC (rev 14821) @@ -1,28 +0,0 @@ -#!/usr/bin/make -f -# debian/rules for libcommons-dbcp-java - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := commons-collections3 commons-pool junit glassfish-javaee - -PACKAGE=commons-dbcp - -DEB_ANT_CLEAN_TARGET := clean -DEB_ANT_BUILD_TARGET := build -#DEB_ANT_CHECK_TARGET := test - -# Per Debian Java Policy, install a versioned JAR and an unversioned symlink -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l pom.xml dist/$(PACKAGE).jar - -clean:: - -rm -rf debian/tmp - -rm -fr doc/api - -get-orig-source: - uscan --force-download --rename - # From SVN - # sh debian/orig-tar.sh --upstream-release $(DEB_UPSTREAM_VERSION) Copied: tags/libcommons-dbcp-java/1.4-2/debian/rules (from rev 14820, trunk/libcommons-dbcp-java/debian/rules) =================================================================== --- tags/libcommons-dbcp-java/1.4-2/debian/rules (rev 0) +++ tags/libcommons-dbcp-java/1.4-2/debian/rules 2011-09-11 15:37:27 UTC (rev 14821) @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/maven.mk + +JAVA_HOME := /usr/lib/jvm/default-java + +get-orig-source: + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits