[pkg-java] r9287 - in trunk/commons-pool: . debian
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Tue Jul 14 11:03:14 UTC 2009
Author: drazzib-guest
Date: 2009-07-14 11:03:12 +0000 (Tue, 14 Jul 2009)
New Revision: 9287
Added:
trunk/commons-pool/build.properties
trunk/commons-pool/debian/
trunk/commons-pool/debian/changelog
trunk/commons-pool/debian/compat
trunk/commons-pool/debian/control
trunk/commons-pool/debian/copyright
trunk/commons-pool/debian/dirs
trunk/commons-pool/debian/doc-base
trunk/commons-pool/debian/docs
trunk/commons-pool/debian/rules
trunk/commons-pool/debian/svn-deblayout
trunk/commons-pool/debian/watch
Modified:
trunk/commons-pool/build.xml
Log:
[svn-inject] Applying Debian modifications to trunk
Added: trunk/commons-pool/build.properties
===================================================================
--- trunk/commons-pool/build.properties (rev 0)
+++ trunk/commons-pool/build.properties 2009-07-14 11:03:12 UTC (rev 9287)
@@ -0,0 +1 @@
+junit.jar=/usr/share/java/junit.jar
Modified: trunk/commons-pool/build.xml
===================================================================
--- trunk/commons-pool/build.xml 2009-07-14 11:03:05 UTC (rev 9286)
+++ trunk/commons-pool/build.xml 2009-07-14 11:03:12 UTC (rev 9287)
@@ -93,7 +93,7 @@
nonavbar="false"
serialwarn="false"
source="1.3">
- <link href="http://java.sun.com/j2se/1.3/docs/api"/>
+ <link href="/usr/share/doc/classpath-doc/api"/>
</javadoc>
</target>
@@ -130,14 +130,16 @@
<target name="test" depends="compile-test" description="runs (junit) unit tests">
<echo message="Because we need to sleep to test the eviction threads, this takes a little while (around 35 seconds)..."/>
- <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
- <arg value="${test.entry}"/>
+ <junit haltonerror="${test.failonerror}"
+ haltonfailure="${test.failonerror}"
+ printsummary="on">
+ <test name="${test.entry}"/>
<classpath>
<pathelement location="${build.classes.dir}" />
<pathelement location="${build.test-classes.dir}" />
<pathelement path="${classpath}" />
</classpath>
- </java>
+ </junit>
</target>
<target name="build-jar" depends="compile">
Property changes on: trunk/commons-pool/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/commons-pool/debian/changelog
===================================================================
--- trunk/commons-pool/debian/changelog (rev 0)
+++ trunk/commons-pool/debian/changelog 2009-07-14 11:03:12 UTC (rev 9287)
@@ -0,0 +1,83 @@
+commons-pool (1.3-1) unstable; urgency=low
+
+ * New upstream release.
+ - Build process doesn't use network anymore. (Closes: #395264)
+ - No dependency on commons-collections.
+ * debian/rules: Get rid of cdbs.
+ * debian/rules: Build with GCJ instead of Kaffe.
+ * Updated copyright information.
+
+ -- Marcus Better <marcus at better.se> Thu, 26 Oct 2006 11:07:53 +0200
+
+commons-pool (1.2-5) unstable; urgency=low
+
+ * fixed FTBFS, thanks to Roland Stigge (closes: #340192)
+
+ -- Arnaud Vandyck <avdyk at debian.org> Tue, 22 Nov 2005 13:14:58 +0000
+
+commons-pool (1.2-4) unstable; urgency=low
+
+ * debian/control, debian/rules: ant transition (changed deps:
+ libant1.6-java to ant)
+ * debian/copyright: removed the CVS tags
+
+ -- Arnaud Vandyck <avdyk at debian.org> Thu, 22 Sep 2005 23:35:42 +0200
+
+commons-pool (1.2-3) unstable; urgency=low
+
+ * changed build-dep from libant1.5-java to libant1.6-java
+ * added debian/watch file
+ * added dependency to libcommons-collections-java
+
+ -- Arnaud Vandyck <avdyk at debian.org> Mon, 7 Feb 2005 12:26:23 +0100
+
+commons-pool (1.2-2) unstable; urgency=low
+
+ * good idea to add jikes as build-dep when building the lib with jikes!
+ (closes: #257780)
+
+ -- Arnaud Vandyck <avdyk at debian.org> Wed, 7 Jul 2004 14:46:34 +0200
+
+commons-pool (1.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Arnaud Vandyck <avdyk at debian.org> Tue, 29 Jun 2004 15:08:11 +0200
+
+commons-pool (1.1-4) unstable; urgency=low
+
+ * Move to main! libcommons-collections-java is now in main.
+ * add dpatch has a build-dep-indep.
+
+ -- Arnaud Vandyck <avdyk at debian.org> Thu, 8 Apr 2004 16:57:35 +0200
+
+commons-pool (1.1-3) unstable; urgency=low
+
+ * Rebuild with the sources
+
+ -- Arnaud Vandyck <avdyk at debian.org> Wed, 24 Mar 2004 14:54:33 +0100
+
+commons-pool (1.1-2) unstable; urgency=low
+
+ * Still in contrib!..
+
+ -- Arnaud Vandyck <avdyk at debian.org> Thu, 11 Mar 2004 00:21:42 +0100
+
+commons-pool (1.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Changed standards version
+ * New maintainer (Adam wants me to take the package, I set
+ pkg-java-maintainers as a maintainer, Both he and I are uploaders)
+ * Removed the libcommons-pool-java-doc package because it's not so heavy
+ * Not javadoc at the moment but will be rebuild later
+ * Now build with kaffe (Move to main when libcommons-collections-java
+ will be in main)
+
+ -- Arnaud Vandyck <avdyk at debian.org> Thu, 11 Mar 2004 00:09:57 +0100
+
+commons-pool (1.0-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Adam Heath <doogie at brainfood.com> Sun, 21 Jul 2002 12:12:59 -0500
Added: trunk/commons-pool/debian/compat
===================================================================
--- trunk/commons-pool/debian/compat (rev 0)
+++ trunk/commons-pool/debian/compat 2009-07-14 11:03:12 UTC (rev 9287)
@@ -0,0 +1 @@
+5
Added: trunk/commons-pool/debian/control
===================================================================
--- trunk/commons-pool/debian/control (rev 0)
+++ trunk/commons-pool/debian/control 2009-07-14 11:03:12 UTC (rev 9287)
@@ -0,0 +1,21 @@
+Source: commons-pool
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Adam Heath <doogie at brainfood.com>, Marcus Better <marcus at better.se>
+Section: libs
+Priority: optional
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5.0.0), ant, ant-optional
+Build-Depends-Indep: java-gcj-compat-dev, junit, classpath-doc
+
+Package: libcommons-pool-java
+Architecture: all
+Suggests: java-virtual-machine, classpath-doc
+Depends: kaffe | java1-runtime | java2-runtime
+Description: pooling implementation for Java objects
+ Pool provides an Object-pooling API, with three major aspects:
+ 1. A generic object pool interface that clients and implementors can use to
+ provide easily interchangeable pooling implementations.
+ 2. A toolkit for creating modular object pools.
+ 3. Several general purpose pool implementations.
+ .
+ Homepage: http://jakarta.apache.org/commons/pool/
Added: trunk/commons-pool/debian/copyright
===================================================================
--- trunk/commons-pool/debian/copyright (rev 0)
+++ trunk/commons-pool/debian/copyright 2009-07-14 11:03:12 UTC (rev 9287)
@@ -0,0 +1,219 @@
+This package was debianized by Adam Heath <doogie at brainfood.com> on
+Sunday, July 21, 2002.
+
+It is currently maintained by the Debian Java Maintainers
+<pkg-java-maintainers at lists.alioth.debian.org>.
+
+The source was downloaded from <http://jakarta.apache.org/commons/pool/>.
+
+Upstream authors: Craig McClanahan, David Weinrich, Dirk Verbeeck,
+Geir Magnusson, Morgan Delagrange, Robert Burrell Donkin, Rodney
+Waldhoff, Sandy McArthur, Todd Carmichael.
+
+Copyright (C) 1999-2006 The Apache Software Foundation.
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+The contributions to the Debian packaging by Marcus Better are
+Copyright (C) 2006 Marcus Better <marcus at better.se> and are licensed
+under the Apache License, Version 2.0.
Added: trunk/commons-pool/debian/dirs
===================================================================
--- trunk/commons-pool/debian/dirs (rev 0)
+++ trunk/commons-pool/debian/dirs 2009-07-14 11:03:12 UTC (rev 9287)
@@ -0,0 +1,2 @@
+usr/share/java
+usr/share/doc
Added: trunk/commons-pool/debian/doc-base
===================================================================
--- trunk/commons-pool/debian/doc-base (rev 0)
+++ trunk/commons-pool/debian/doc-base 2009-07-14 11:03:12 UTC (rev 9287)
@@ -0,0 +1,9 @@
+Document: libcommons-pool-java
+Title: API Javadoc for libcommons-pool-java
+Author: libcommons-pool-java developers
+Abstract: This is the API Javadoc provided by the libcommons-pool-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcommons-pool-java/api/index.html
+Files: /usr/share/doc/libcommons-pool-java/api/*
Added: trunk/commons-pool/debian/docs
===================================================================
--- trunk/commons-pool/debian/docs (rev 0)
+++ trunk/commons-pool/debian/docs 2009-07-14 11:03:12 UTC (rev 9287)
@@ -0,0 +1,3 @@
+README.txt
+RELEASE-NOTES.txt
+dist/docs/api
Added: trunk/commons-pool/debian/rules
===================================================================
--- trunk/commons-pool/debian/rules (rev 0)
+++ trunk/commons-pool/debian/rules 2009-07-14 11:03:12 UTC (rev 9287)
@@ -0,0 +1,64 @@
+#!/usr/bin/make -f
+
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_JARS_BASE := /usr/share/java
+JAVACMD := $(JAVA_HOME)/bin/java
+
+DEB_JARS := ant ant-launcher ant-junit junit
+
+DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
+ if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
+ if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
+ done; \
+ if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
+
+ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
+ org.apache.tools.ant.Main $(DEB_ANT_ARGS)
+
+
+BASENAME := commons-pool
+PKGNAME := lib$(BASENAME)-java
+INSTALLDIR := $(CURDIR)/debian/$(PKGNAME)
+JAVALIBDIR := $(INSTALLDIR)/usr/share/java
+
+VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+ $(ANT_INVOKE) dist test
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ $(ANT_INVOKE) clean
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ install -m 644 dist/$(BASENAME)-$(VERSION).jar $(JAVALIBDIR)
+ ln -s $(BASENAME)-$(VERSION).jar $(JAVALIBDIR)/$(BASENAME).jar
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch: build install
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: trunk/commons-pool/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/commons-pool/debian/svn-deblayout
===================================================================
--- trunk/commons-pool/debian/svn-deblayout (rev 0)
+++ trunk/commons-pool/debian/svn-deblayout 2009-07-14 11:03:12 UTC (rev 9287)
@@ -0,0 +1,2 @@
+buildArea=../../build-area
+origDir=..
Added: trunk/commons-pool/debian/watch
===================================================================
--- trunk/commons-pool/debian/watch (rev 0)
+++ trunk/commons-pool/debian/watch 2009-07-14 11:03:12 UTC (rev 9287)
@@ -0,0 +1,2 @@
+version=3
+http://www.apache.org/dist/jakarta/commons/pool/source/commons-pool-(.*)-src.tar.gz
More information about the pkg-java-commits
mailing list