[pkg-java] r9300 - in trunk/commons-pool: . debian debian/patches
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Tue Jul 14 14:14:41 UTC 2009
Author: drazzib-guest
Date: 2009-07-14 14:14:40 +0000 (Tue, 14 Jul 2009)
New Revision: 9300
Added:
trunk/commons-pool/debian/README.source
trunk/commons-pool/debian/libcommons-pool-java-doc.doc-base
trunk/commons-pool/debian/libcommons-pool-java-doc.docs
trunk/commons-pool/debian/patches/
trunk/commons-pool/debian/patches/01_build.patch
trunk/commons-pool/debian/patches/series
Removed:
trunk/commons-pool/build.properties
trunk/commons-pool/build.xml
trunk/commons-pool/debian/dirs
trunk/commons-pool/debian/doc-base
trunk/commons-pool/debian/svn-deblayout
Modified:
trunk/commons-pool/debian/changelog
trunk/commons-pool/debian/control
trunk/commons-pool/debian/copyright
trunk/commons-pool/debian/docs
trunk/commons-pool/debian/rules
trunk/commons-pool/debian/watch
Log:
commons-pool (1.5.2-1) UNRELEASED; urgency=low
* New upstream release.
* Split Javadoc API in a -doc package (Closes: #506361)
* Migrate to CDBS packaging:
- Cleanup debian/rules
- Use quilt as patch system
- Remove useless Suggests
- Remove useless debian/dirs
* Bump Standards-Version to 3.8.2:
- Include a get-orig-source target
- Change section to "java"
- Add Homepage field
* Add myself to Uploaders
* Use default-jdk/jre:
- Depends on default-jre-headless
- Build-Depends on default-jdk
- Use /usr/lib/jvm/default-java as JAVA_HOME
* Update debian/copyright:
- Don't include full Apache 2 licence
- Update Copyright assignements
-- Damien Raude-Morvan <drazzib at drazzib.com> Tue, 14 Jul 2009 15:39:34 +0200
Deleted: trunk/commons-pool/build.properties
===================================================================
--- trunk/commons-pool/build.properties 2009-07-14 14:08:33 UTC (rev 9299)
+++ trunk/commons-pool/build.properties 2009-07-14 14:14:40 UTC (rev 9300)
@@ -1 +0,0 @@
-junit.jar=/usr/share/java/junit.jar
Deleted: trunk/commons-pool/build.xml
===================================================================
--- trunk/commons-pool/build.xml 2009-07-14 14:08:33 UTC (rev 9299)
+++ trunk/commons-pool/build.xml 2009-07-14 14:14:40 UTC (rev 9300)
@@ -1,171 +0,0 @@
-<!--
- Copyright 2003-2004,2006 The Apache Software Foundation
-
- 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.
--->
-<!-- $Id: build.xml 390933 2006-04-03 00:46:35Z sandymac $ -->
-<project name="commons-pool" default="test" basedir=".">
-
- <target name="init">
- <tstamp/>
-
- <!-- read properties from the build.properties, if any -->
- <property name="component-propfile" value="${basedir}/build.properties"/>
- <property file="${component-propfile}"/>
-
- <!-- read properties from the commons build.properties, if any -->
- <property name="commons-propfile" value="${basedir}/../build.properties"/>
- <property file="${commons-propfile}"/>
-
- <!-- read properties from the ${user.home}/propfile, if any -->
- <property name="user-propfile" value="${user.home}/build.properties"/>
- <property file="${user-propfile}"/>
-
- <!-- command line classpath, if any -->
- <property name="cp" value=""/>
-
- <!-- now combine the classpaths -->
- <property name="classpath" value="${cp}:${junit.jar}"/>
-
- <property name="name" value="commons-pool"/>
- <property name="title" value="Jakarta Commons Object Pooling Package"/>
- <property name="version" value="1.3"/>
- <property name="package" value="org.apache.commons.pool.*"/>
-
- <property name="src.dir" value="${basedir}/src"/>
- <property name="src.java.dir" value="${src.dir}/java"/>
- <property name="src.test.dir" value="${src.dir}/test"/>
- <property name="build.dir" value="${basedir}/build"/>
- <property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="build.test-classes.dir" value="${build.dir}/test-classes"/>
- <property name="dist.dir" value="${basedir}/dist"/>
- <property name="dist.jar" value="${dist.dir}/${name}-${version}.jar"/>
-
- <property name="test.entry" value="org.apache.commons.pool.TestAll"/>
- <property name="test.failonerror" value="true" />
- <property name="test.runner" value="junit.textui.TestRunner" />
-
- <property name="javadoc.dir" value="${dist.dir}/docs/api"/>
- <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2003 Apache Software Foundation. Documenation generated ${TODAY}</small>."/>
- <property name="javadoc.overview" value="${src.java.dir}/org/apache/commons/pool/overview.html" />
-
- <property name="javac.optimize" value="false"/>
- <property name="javac.debug" value="true"/>
- <property name="javac.deprecation" value="true"/>
- </target>
-
- <!-- ######################################################### -->
-
- <target name="clean" depends="init" description="removes generated files">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- </target>
-
- <target name="javadoc" depends="init" description="generates javadocs">
- <mkdir dir="${javadoc.dir}"/>
- <javadoc packagenames="org.*"
- sourcepath="${src.java.dir}"
- classpath="${classpath}"
- destdir="${javadoc.dir}"
- windowtitle="${title}"
- doctitle="${title}"
- bottom="${javadoc.bottom}"
- overview="${javadoc.overview}"
- public="true"
- version="true"
- author="true"
- splitindex="false"
- nodeprecated="true"
- nodeprecatedlist="true"
- notree="true"
- noindex="false"
- nohelp="true"
- nonavbar="false"
- serialwarn="false"
- source="1.3">
- <link href="/usr/share/doc/classpath-doc/api"/>
- </javadoc>
- </target>
-
- <!-- ######################################################### -->
-
- <target name="compile" depends="init" description="compiles source files">
- <mkdir dir="${build.classes.dir}"/>
- <javac destdir="${build.classes.dir}"
- srcdir="${src.java.dir}"
- classpath="${classpath}"
- debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- optimize="${javac.optimize}"
- source="1.3"
- target="1.3"/>
- </target>
-
- <target name="compile-test" depends="compile">
- <mkdir dir="${build.test-classes.dir}"/>
- <javac destdir="${build.test-classes.dir}"
- srcdir="${src.test.dir}"
- debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- optimize="${javac.optimize}"
- source="1.3"
- target="1.3">
- <classpath>
- <pathelement location="${build.classes.dir}" />
- <pathelement location="${build.test-classes.dir}" />
- <pathelement path="${classpath}" />
- </classpath>
- </javac>
- </target>
-
- <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)..."/>
- <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>
- </junit>
- </target>
-
- <target name="build-jar" depends="compile">
- <mkdir dir="${dist.dir}"/>
- <jar jarfile="${dist.jar}">
- <fileset dir="${build.classes.dir}"/>
- <metainf dir="${basedir}" includes="LICENSE.txt,NOTICE.txt"/>
- <manifest>
- <attribute name="Built-By" value="${user.name}"/>
- <attribute name="Package" value="${package}"/>
- <attribute name="Extension-Name" value="${name}"/>
- <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
- <attribute name="Specification-Title" value="${title}"/>
- <attribute name="Implementation-Version" value="${version}"/>
- <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
-
- </manifest>
- </jar>
- </target>
-
- <target name="build" depends="clean,build-jar,javadoc">
- <copy todir="${dist.dir}" file="${basedir}/LICENSE.txt"/>
- <copy todir="${dist.dir}" file="${basedir}/NOTICE.txt"/>
- <copy todir="${dist.dir}" file="${basedir}/README.txt"/>
- </target>
-
- <target name="dist" depends="build" description="gump target"/>
-
-</project>
Added: trunk/commons-pool/debian/README.source
===================================================================
--- trunk/commons-pool/debian/README.source (rev 0)
+++ trunk/commons-pool/debian/README.source 2009-07-14 14:14:40 UTC (rev 9300)
@@ -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.
+
Modified: trunk/commons-pool/debian/changelog
===================================================================
--- trunk/commons-pool/debian/changelog 2009-07-14 14:08:33 UTC (rev 9299)
+++ trunk/commons-pool/debian/changelog 2009-07-14 14:14:40 UTC (rev 9300)
@@ -1,3 +1,27 @@
+commons-pool (1.5.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Split Javadoc API in a -doc package (Closes: #506361)
+ * Migrate to CDBS packaging:
+ - Cleanup debian/rules
+ - Use quilt as patch system
+ - Remove useless Suggests
+ - Remove useless debian/dirs
+ * Bump Standards-Version to 3.8.2:
+ - Include a get-orig-source target
+ - Change section to "java"
+ - Add Homepage field
+ * Add myself to Uploaders
+ * Use default-jdk/jre:
+ - Depends on default-jre-headless
+ - Build-Depends on default-jdk
+ - Use /usr/lib/jvm/default-java as JAVA_HOME
+ * Update debian/copyright:
+ - Don't include full Apache 2 licence
+ - Update Copyright assignements
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Tue, 14 Jul 2009 15:39:34 +0200
+
commons-pool (1.3-1) unstable; urgency=low
* New upstream release.
Modified: trunk/commons-pool/debian/control
===================================================================
--- trunk/commons-pool/debian/control 2009-07-14 14:08:33 UTC (rev 9299)
+++ trunk/commons-pool/debian/control 2009-07-14 14:14:40 UTC (rev 9300)
@@ -1,21 +1,37 @@
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
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Adam Heath <doogie at brainfood.com>,
+ Marcus Better <marcus at better.se>, Damien Raude-Morvan <drazzib at drazzib.com>
+Section: java
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
+Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 5), default-jdk, ant, cdbs, quilt
+Build-Depends-Indep: ant-optional, junit, classpath-doc
+Homepage: http://commons.apache.org/pool/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-pool/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-pool/
Package: libcommons-pool-java
Architecture: all
-Suggests: java-virtual-machine, classpath-doc
-Depends: kaffe | java1-runtime | java2-runtime
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
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.
+
+Package: libcommons-pool-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: classpath-doc
+Suggests: libcommons-pool-java
+Description: pooling implementation for Java objects - documentation
+ 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/
+ This package contains Javadoc API Documentation of Commons Pool.
Modified: trunk/commons-pool/debian/copyright
===================================================================
--- trunk/commons-pool/debian/copyright 2009-07-14 14:08:33 UTC (rev 9299)
+++ trunk/commons-pool/debian/copyright 2009-07-14 14:14:40 UTC (rev 9300)
@@ -4,216 +4,17 @@
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/>.
+The source was downloaded from <http://commons.apache.org/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.
+Copyright (C) 1999-2009 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'.
- 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.
Deleted: trunk/commons-pool/debian/dirs
===================================================================
--- trunk/commons-pool/debian/dirs 2009-07-14 14:08:33 UTC (rev 9299)
+++ trunk/commons-pool/debian/dirs 2009-07-14 14:14:40 UTC (rev 9300)
@@ -1,2 +0,0 @@
-usr/share/java
-usr/share/doc
Deleted: trunk/commons-pool/debian/doc-base
===================================================================
--- trunk/commons-pool/debian/doc-base 2009-07-14 14:08:33 UTC (rev 9299)
+++ trunk/commons-pool/debian/doc-base 2009-07-14 14:14:40 UTC (rev 9300)
@@ -1,9 +0,0 @@
-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/*
Modified: trunk/commons-pool/debian/docs
===================================================================
--- trunk/commons-pool/debian/docs 2009-07-14 14:08:33 UTC (rev 9299)
+++ trunk/commons-pool/debian/docs 2009-07-14 14:14:40 UTC (rev 9300)
@@ -1,3 +1,2 @@
README.txt
RELEASE-NOTES.txt
-dist/docs/api
Copied: trunk/commons-pool/debian/libcommons-pool-java-doc.doc-base (from rev 9287, trunk/commons-pool/debian/doc-base)
===================================================================
--- trunk/commons-pool/debian/libcommons-pool-java-doc.doc-base (rev 0)
+++ trunk/commons-pool/debian/libcommons-pool-java-doc.doc-base 2009-07-14 14:14:40 UTC (rev 9300)
@@ -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-doc/api/index.html
+Files: /usr/share/doc/libcommons-pool-java-doc/api/*
Copied: trunk/commons-pool/debian/libcommons-pool-java-doc.docs (from rev 9287, trunk/commons-pool/debian/docs)
===================================================================
--- trunk/commons-pool/debian/libcommons-pool-java-doc.docs (rev 0)
+++ trunk/commons-pool/debian/libcommons-pool-java-doc.docs 2009-07-14 14:14:40 UTC (rev 9300)
@@ -0,0 +1 @@
+dist/docs/api
Added: trunk/commons-pool/debian/patches/01_build.patch
===================================================================
--- trunk/commons-pool/debian/patches/01_build.patch (rev 0)
+++ trunk/commons-pool/debian/patches/01_build.patch 2009-07-14 14:14:40 UTC (rev 9300)
@@ -0,0 +1,27 @@
+Description: Cleanup upstream build.xml:
+ - Use local Javadoc index
+ - Set test.failonerror to false
+Origin: vendor
+Forwarded: not-needed
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Last-Update: 2009-07-14
+--- a/build.xml
++++ b/build.xml
+@@ -53,7 +53,7 @@
+ <property name="dist.jar" value="${dist.dir}/${name}.jar"/>
+
+ <property name="test.entry" value="org.apache.commons.pool.TestAll"/>
+- <property name="test.failonerror" value="true" />
++ <property name="test.failonerror" value="false" />
+
+ <property name="javadoc.dir" value="${dist.dir}/docs/api"/>
+ <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2003 Apache Software Foundation. Documenation generated ${TODAY}</small>."/>
+@@ -95,7 +95,7 @@
+ nonavbar="false"
+ serialwarn="false"
+ source="${javac.src.version}">
+- <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
++ <link href="/usr/share/doc/classpath-doc/api/"/>
+ </javadoc>
+ </target>
+
Added: trunk/commons-pool/debian/patches/series
===================================================================
--- trunk/commons-pool/debian/patches/series (rev 0)
+++ trunk/commons-pool/debian/patches/series 2009-07-14 14:14:40 UTC (rev 9300)
@@ -0,0 +1 @@
+01_build.patch
Modified: trunk/commons-pool/debian/rules
===================================================================
--- trunk/commons-pool/debian/rules 2009-07-14 14:08:33 UTC (rev 9299)
+++ trunk/commons-pool/debian/rules 2009-07-14 14:14:40 UTC (rev 9300)
@@ -1,64 +1,22 @@
#!/usr/bin/make -f
-JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_JARS_BASE := /usr/share/java
-JAVACMD := $(JAVA_HOME)/bin/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
-DEB_JARS := ant ant-launcher ant-junit junit
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := junit ant-junit
+BASENAME := $(DEB_SOURCE_PACKAGE)
-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)
+DEB_ANT_CLEAN_TARGET := clean
+DEB_ANT_BUILD_TARGET := dist
+DEB_ANT_CHECK_TARGET := test
-ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
- org.apache.tools.ant.Main $(DEB_ANT_ARGS)
+# Per Debian Java Policy, install a versioned JAR and an unversioned symlink
+binary-post-install/lib$(BASENAME)-java::
+ mv dist/$(BASENAME).jar dist/$(BASENAME)-$(DEB_UPSTREAM_VERSION).jar
+ dh_install dist/$(BASENAME)-$(DEB_UPSTREAM_VERSION).jar /usr/share/java
+ dh_link $(BASENAME)-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/$(BASENAME).jar
-
-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
+get-orig-source:
+ uscan --force-download --rename
Deleted: trunk/commons-pool/debian/svn-deblayout
===================================================================
--- trunk/commons-pool/debian/svn-deblayout 2009-07-14 14:08:33 UTC (rev 9299)
+++ trunk/commons-pool/debian/svn-deblayout 2009-07-14 14:14:40 UTC (rev 9300)
@@ -1,2 +0,0 @@
-buildArea=../../build-area
-origDir=..
Modified: trunk/commons-pool/debian/watch
===================================================================
--- trunk/commons-pool/debian/watch 2009-07-14 14:08:33 UTC (rev 9299)
+++ trunk/commons-pool/debian/watch 2009-07-14 14:14:40 UTC (rev 9300)
@@ -1,2 +1,2 @@
version=3
-http://www.apache.org/dist/jakarta/commons/pool/source/commons-pool-(.*)-src.tar.gz
+http://www.apache.org/dist/commons/pool/source/commons-pool-(.*)-src.tar.gz
More information about the pkg-java-commits
mailing list