--- libcommons-dbcp-java-1.4.orig/debian/libcommons-dbcp-java-doc.install +++ libcommons-dbcp-java-1.4/debian/libcommons-dbcp-java-doc.install @@ -0,0 +1 @@ +dist/docs/* /usr/share/doc/libcommons-dbcp-java --- libcommons-dbcp-java-1.4.orig/debian/orig-tar.sh +++ libcommons-dbcp-java-1.4/debian/orig-tar.sh @@ -0,0 +1,30 @@ +#!/bin/sh -e + +# $2 version +# $3 upstream tarball + +TAR=../libcommons-dbcp-java_$2.orig.tar.gz +DIR=libcommons-dbcp-java-$2.orig + +# From SVN +#VERSION=`echo $2 | sed -e 's/\+.*//g' | sed -e 's/\./_/g'` +#REVISION=HEAD +#REVISION=`echo $2 | sed -e 's/.*svn//'` +#svn export -r $REVISION http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk $DIR + +# From Tarball +tar xvzf $3 +mv commons-dbcp-* $DIR + +# Repack +GZIP=--best tar -c -z -f $TAR $DIR +rm -rf $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi + +exit 0 --- libcommons-dbcp-java-1.4.orig/debian/changelog +++ libcommons-dbcp-java-1.4/debian/changelog @@ -0,0 +1,174 @@ +libcommons-dbcp-java (1.4-1ubuntu1) maverick; urgency=low + + * Merge from debian testing. Remaining changes: + - Replace glassfish-javaee by libgeronimo-jta-1.0.1b-spec-java, since the + former is in universe and the latter in main + + -- Thierry Carrez Fri, 11 Jun 2010 15:09:25 +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 Sat, 20 Feb 2010 22:50:18 +0100 + +libcommons-dbcp-java (1.3~svn828639-1ubuntu1) lucid; urgency=low + + * Replace glassfish-javaee by libgeronimo-jta-1.0.1b-spec-java, since the + former is in universe and the latter in main (LP: #495504) + + -- Thierry Carrez Fri, 11 Dec 2009 15:58:16 +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 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 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 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 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 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 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 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 Mon, 28 Feb 2005 11:50:22 +0100 + +libcommons-dbcp-java (1.2.1-1) unstable; urgency=low + + * New upstream release + + -- Arnaud Vandyck 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 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 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 Thu, 19 Feb 2004 12:02:34 +0100 + +libcommons-dbcp-java (1.0-3) unstable; urgency=low + + * Removed the java2 dependency. + + -- Arnaud Vandyck 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 Sat, 10 Jan 2004 18:14:37 +0100 + +libcommons-dbcp-java (1.0-1) unstable; urgency=low + + * Initial Release (closes: #188574). + + -- Arnaud Vandyck Sat, 12 Jul 2003 11:33:30 +0200 + --- libcommons-dbcp-java-1.4.orig/debian/README.source +++ libcommons-dbcp-java-1.4/debian/README.source @@ -0,0 +1,6 @@ +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. + --- libcommons-dbcp-java-1.4.orig/debian/ant.properties +++ libcommons-dbcp-java-1.4/debian/ant.properties @@ -0,0 +1,2 @@ +commons-collections.jar=/usr/share/java/commons-collections3.jar +commons-pool.jar=/usr/share/java/commons-pool.jar --- libcommons-dbcp-java-1.4.orig/debian/libcommons-dbcp-java.poms +++ libcommons-dbcp-java-1.4/debian/libcommons-dbcp-java.poms @@ -0,0 +1 @@ +pom.xml --no-parent --- libcommons-dbcp-java-1.4.orig/debian/rules +++ libcommons-dbcp-java-1.4/debian/rules @@ -0,0 +1,29 @@ +#!/usr/bin/make -f +# debian/rules for libcommons-dbcp-java + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/ant.mk + +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := commons-collections3 commons-pool junit geronimo-jta-1.0.1b-spec + +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) --- libcommons-dbcp-java-1.4.orig/debian/watch +++ libcommons-dbcp-java-1.4/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://archive.apache.org/dist/commons/dbcp/source/commons-dbcp-(.*)-src.tar.gz \ + debian debian/orig-tar.sh --- libcommons-dbcp-java-1.4.orig/debian/copyright +++ libcommons-dbcp-java-1.4/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Arnaud Vandyck on +Sat, 5 Apr 2003 17:48:00 +0200. + +It was downloaded from http://commons.apache.org/dbcp/ + +Upstream Authors: Morgan Delagrange, + Geir Magnusson, + Craig McClanahan, + John McNally, + Martin Poeschl , + Rodney Waldhoff, + David Weinrich, + Dirk Verbeeck, + Yoav Shapira , + Phil Steitz, + Jörg Schaible , + Todd Carmichael , + Wayne Woodfield, + Dain Sundstrom + +Copyright: © 2001-2008 The Apache Software Foundation + +License: Apache 2.0 + + On Debian systems the full text of the Apache License can be found + in `/usr/share/common-licenses/Apache-2.0'. --- libcommons-dbcp-java-1.4.orig/debian/libcommons-dbcp-java-doc.doc-base +++ libcommons-dbcp-java-1.4/debian/libcommons-dbcp-java-doc.doc-base @@ -0,0 +1,10 @@ +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/* + --- libcommons-dbcp-java-1.4.orig/debian/compat +++ libcommons-dbcp-java-1.4/debian/compat @@ -0,0 +1 @@ +7 --- libcommons-dbcp-java-1.4.orig/debian/maven.rules +++ libcommons-dbcp-java-1.4/debian/maven.rules @@ -0,0 +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/ --- libcommons-dbcp-java-1.4.orig/debian/control +++ libcommons-dbcp-java-1.4/debian/control @@ -0,0 +1,53 @@ +Source: libcommons-dbcp-java +Section: java +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Java Maintainers +Uploaders: Michael Koch , Damien Raude-Morvan +Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, quilt +Build-Depends-Indep: libcommons-pool-java, libcommons-collections3-java, junit, + libgeronimo-jta-1.0.1b-spec-java, maven-repo-helper, default-jdk-doc, libcommons-pool-java-doc +Standards-Version: 3.8.4 +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}, default-jre-headless | java2-runtime-headless, libcommons-pool-java, libcommons-collections3-java +Suggests: libgeronimo-jta-1.0.1b-spec-java +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. --- libcommons-dbcp-java-1.4.orig/debian/patches/01_build.patch +++ libcommons-dbcp-java-1.4/debian/patches/01_build.patch @@ -0,0 +1,24 @@ +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 +Last-Update: 2010-02-20 +--- a/build.xml ++++ b/build.xml +@@ -179,8 +179,8 @@ + nohelp="true" + nonavbar="false" + serialwarn="false"> +- +- ++ ++ + + + +--- /dev/null ++++ b/build.properties +@@ -0,0 +1 @@ ++test.failonerror=false --- libcommons-dbcp-java-1.4.orig/debian/patches/series +++ libcommons-dbcp-java-1.4/debian/patches/series @@ -0,0 +1 @@ +01_build.patch