Author: tashiro-guest Date: 2006-01-21 17:00:50 +0000 (Sat, 21 Jan 2006) New Revision: 1704
Added: trunk/commons-httpclient3/ trunk/commons-httpclient3/debian/ trunk/commons-httpclient3/debian/.cvsignore trunk/commons-httpclient3/debian/README.Debian trunk/commons-httpclient3/debian/changelog trunk/commons-httpclient3/debian/compat trunk/commons-httpclient3/debian/control trunk/commons-httpclient3/debian/copyright trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.dirs trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.doc-base.documentation trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.doc-base.javadoc trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.docs trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.postinst.debhelper trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.prerm.debhelper trunk/commons-httpclient3/debian/libcommons-httpclient3-java.dirs trunk/commons-httpclient3/debian/libcommons-httpclient3-java.docs trunk/commons-httpclient3/debian/libcommons-httpclient3-java.links trunk/commons-httpclient3/debian/patches/ trunk/commons-httpclient3/debian/patches/00list trunk/commons-httpclient3/debian/patches/01_upstream_disable_examples_classes.dpatch trunk/commons-httpclient3/debian/patches/02_upstream_qualify_ConnectionPool_declaration.dpatch trunk/commons-httpclient3/debian/rules Log: * Create new package for new upstream version of commons-httpclient 3.0. * Convert package to the CDBS. Added: trunk/commons-httpclient3/debian/.cvsignore =================================================================== --- trunk/commons-httpclient3/debian/.cvsignore 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/.cvsignore 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,8 @@ +files +libcommons-httpclient3-java +libcommons-httpclient3-java-doc +libcommons-httpclient3-java-doc.postinst.debhelper +libcommons-httpclient3-java-doc.prerm.debhelper +patched +semantic.cache +stamp-ant-build Added: trunk/commons-httpclient3/debian/README.Debian =================================================================== --- trunk/commons-httpclient3/debian/README.Debian 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/README.Debian 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,6 @@ +In order to use the SSL-based HTTPS protocol with it, you will need to +download and install an implementation of the JSSE +(http://java.sun.com/products/jsee). Installing the JSSE is not +required in order to use the standard unencrypted HTTP protocol, however. + + -- Stephen Peters <[EMAIL PROTECTED]> Added: trunk/commons-httpclient3/debian/changelog =================================================================== --- trunk/commons-httpclient3/debian/changelog 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/changelog 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,42 @@ +commons-httpclient3 (3.0-1) unstable; urgency=low + + * Create new package for new upstream version 3.0. + * Convert package to the CDBS. + + -- Stephan Michels <[EMAIL PROTECTED]> Sat, 21 Jan 2006 17:55:58 +0100 + +commons-httpclient (2.0.2-2) unstable; urgency=low + + * Provide non-version-specific symlink "commons-httpclient.jar" to + commons-httpclient-2.0.2.jar per Debian Java Policy Section 2.4 + (Closes: 340308) + * Added additional doc-base entry to point to main section of + Jakarta Commons HttpClient documentation in addition to the + API Javadoc + * Maintainer email address updated for Barry Hawkins + * Upload sponsored by Petter Reinholdtsen + + -- Barry Hawkins <[EMAIL PROTECTED]> Fri, 25 Nov 2005 13:12:23 -0500 + +commons-httpclient (2.0.2-1) unstable; urgency=low + + * New upstream release and moved to main (Closes: #301789) + * Removed dependency upon non-free compilers (Closes: 306744) + * Updated version of Apache License to 2.0 + * Package updated to reflect maintainership under Debian Java + Maintainers + * Upload sponsored by Petter Reinholdtsen + + -- Barry Hawkins <[EMAIL PROTECTED]> Tue, 13 Sep 2005 23:14:01 -0400 + +commons-httpclient (2.0a1+20020904-1) unstable; urgency=low + + * New upstream release, with actual source (closes: #160262) + + -- Stephen Peters <[EMAIL PROTECTED]> Wed, 4 Sep 2002 22:18:18 -0400 + +commons-httpclient (2.0a1-1) unstable; urgency=low + + * Initial Release. + + -- Stephen Peters <[EMAIL PROTECTED]> Wed, 1 May 2002 13:31:44 -0400 Added: trunk/commons-httpclient3/debian/compat =================================================================== --- trunk/commons-httpclient3/debian/compat 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/compat 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1 @@ +4 Added: trunk/commons-httpclient3/debian/control =================================================================== --- trunk/commons-httpclient3/debian/control 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/control 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,27 @@ +Source: commons-httpclient3 +Section: libs +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Barry Hawkins <[EMAIL PROTECTED]> +Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 1.11), ant (>= 1.6.5-1), libcommons-logging-java, jikes (>= 1.15), kaffe (>= 2:1.1.5-3), junit, libcommons-codec-java +Standards-Version: 3.6.2.1 + +Package: libcommons-httpclient3-java +Architecture: all +Suggests: libcommons-httpclient3-java-doc +Depends: kaffe (>=2:1.1.5) | java2-runtime, libcommons-logging-java +Description: A Java(TM) library for creating HTTP clients + The Jakarta Commons HTTPClient library provides an efficient, + up-to-date, and feature-rich package implementing the client side of + the most recent HTTP standards and recommendations. + +Package: libcommons-httpclient3-java-doc +Architecture: all +Suggests: libcommons-httpclient3-java +Description: Documentation for libcommons-httpclient3-java + The Jakarta Commons HTTPClient library provides an efficient, + up-to-date, and feature-rich package implementing the client side of + the most recent HTTP standards and recommendations. + . + This package contains the documentation for the Jakarta Commons + HTTPClient library. Added: trunk/commons-httpclient3/debian/copyright =================================================================== --- trunk/commons-httpclient3/debian/copyright 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/copyright 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,225 @@ +This package was debianized by Stephen Peters <[EMAIL PROTECTED]> on +Wed, 1 May 2002 13:34:02 +0500. + +It was downloaded from http://jakarta.apache.org/commons/httpclient + +Upstream Authors: + Michael Becke + Jeff Dever + Dion Gillard + Ortwin Glueck + Oleg Kalnichevski + Sung-Gu Park + Sean C. Sullivan + Adrian Sutton + Rodney Waldhoff + + +Copyright: + +The following copyright applies to this package: + +/* + * + * 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. +*/ Added: trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.dirs =================================================================== --- trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.dirs 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.dirs 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1 @@ +usr/share/doc/libcommons-httpclient3-java-doc Added: trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.doc-base.documentation =================================================================== --- trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.doc-base.documentation 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.doc-base.documentation 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,9 @@ +Document: libcommons-httpclient3-java-doc-documentation +Title: Apache Jakarta Commons HttpClient Library Documentation +Author: Jakarta Commons HttpClient Project Team +Abstract: This is the documentation for the.Apache Jakarta Commons HttpClient Library +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcommons-httpclient3-java-doc/docs/index.html +Files: /usr/share/doc/libcommons-httpclient3-java-doc/docs/*.html Added: trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.doc-base.javadoc =================================================================== --- trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.doc-base.javadoc 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.doc-base.javadoc 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,9 @@ +Document: libcommons-httpclient3-java-doc-javadoc +Title: API Javadoc for Apache Jakarta Commons HttpClient Library +Author: Jakarta Commons HttpClient Project Team +Abstract: This is the API Javadoc for the.Apache Jakarta Commons HttpClient Library +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcommons-httpclient3-java-doc/docs/apidocs/index.html +Files: /usr/share/doc/libcommons-httpclient3-java-doc/docs/apidocs/*.html Added: trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.docs =================================================================== --- trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.docs 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.docs 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,2 @@ +docs +README Added: trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.postinst.debhelper =================================================================== --- trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.postinst.debhelper 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.postinst.debhelper 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,10 @@ +# Automatically added by dh_installdocs +if [ "$1" = configure ] && which install-docs >/dev/null 2>&1; then + install-docs -i /usr/share/doc-base/libcommons-httpclient3-java-doc-javadoc +fi +# End automatically added section +# Automatically added by dh_installdocs +if [ "$1" = configure ] && which install-docs >/dev/null 2>&1; then + install-docs -i /usr/share/doc-base/libcommons-httpclient3-java-doc-documentation +fi +# End automatically added section Added: trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.prerm.debhelper =================================================================== --- trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.prerm.debhelper 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/libcommons-httpclient3-java-doc.prerm.debhelper 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,12 @@ +# Automatically added by dh_installdocs +if [ "$1" = remove ] || [ "$1" = upgrade ] && \ + which install-docs >/dev/null 2>&1; then + install-docs -r libcommons-httpclient3-java-doc-javadoc +fi +# End automatically added section +# Automatically added by dh_installdocs +if [ "$1" = remove ] || [ "$1" = upgrade ] && \ + which install-docs >/dev/null 2>&1; then + install-docs -r libcommons-httpclient3-java-doc-documentation +fi +# End automatically added section Added: trunk/commons-httpclient3/debian/libcommons-httpclient3-java.dirs =================================================================== --- trunk/commons-httpclient3/debian/libcommons-httpclient3-java.dirs 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/libcommons-httpclient3-java.dirs 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1 @@ +usr/share/java Added: trunk/commons-httpclient3/debian/libcommons-httpclient3-java.docs =================================================================== --- trunk/commons-httpclient3/debian/libcommons-httpclient3-java.docs 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/libcommons-httpclient3-java.docs 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1 @@ +README Added: trunk/commons-httpclient3/debian/libcommons-httpclient3-java.links =================================================================== --- trunk/commons-httpclient3/debian/libcommons-httpclient3-java.links 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/libcommons-httpclient3-java.links 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1 @@ +usr/share/java/commons-httpclient3-3.0.jar usr/share/java/commons-httpclient3.jar Added: trunk/commons-httpclient3/debian/patches/00list =================================================================== --- trunk/commons-httpclient3/debian/patches/00list 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/patches/00list 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,2 @@ +01_upstream_disable_examples_classes +02_upstream_qualify_ConnectionPool_declaration Added: trunk/commons-httpclient3/debian/patches/01_upstream_disable_examples_classes.dpatch =================================================================== --- trunk/commons-httpclient3/debian/patches/01_upstream_disable_examples_classes.dpatch 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/patches/01_upstream_disable_examples_classes.dpatch 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_upstream_disable_examples_classes.dpatch by Barry Hawkins <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add directives to exclude the compilation of problematic classes +## DP: shipped as part of the examples for this library. + +--- commons-httpclient-2.0.2.orig/build.xml ++++ commons-httpclient-2.0.2/build.xml +@@ -236,7 +236,8 @@ + destdir ="${build.home}/examples" + debug ="${compile.debug}" + deprecation ="${compile.deprecation}" +- optimize ="${compile.optimize}"> ++ optimize ="${compile.optimize}" ++ excludes ="MultipartFileUploadApp.java,ClientApp.java"> + <classpath refid="compile.classpath"/> + </javac> + </target> Property changes on: trunk/commons-httpclient3/debian/patches/01_upstream_disable_examples_classes.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/commons-httpclient3/debian/patches/02_upstream_qualify_ConnectionPool_declaration.dpatch =================================================================== --- trunk/commons-httpclient3/debian/patches/02_upstream_qualify_ConnectionPool_declaration.dpatch 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/patches/02_upstream_qualify_ConnectionPool_declaration.dpatch 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_upstream_qualify_ConnectionPool_declaration.dpatch by Barry Hawkins <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add full qualification to declaration of ConnectionPool class. + +--- commons-httpclient-2.0.2.orig/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java ++++ commons-httpclient-2.0.2/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java +@@ -834,7 +834,7 @@ + private static class ConnectionSource { + + /** The connection pool that created the connection */ +- public ConnectionPool connectionPool; ++ public MultiThreadedHttpConnectionManager.ConnectionPool connectionPool; + + /** The connection's host configuration */ + public HostConfiguration hostConfiguration; Property changes on: trunk/commons-httpclient3/debian/patches/02_upstream_qualify_ConnectionPool_declaration.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/commons-httpclient3/debian/rules =================================================================== --- trunk/commons-httpclient3/debian/rules 2006-01-20 09:09:38 UTC (rev 1703) +++ trunk/commons-httpclient3/debian/rules 2006-01-21 17:00:50 UTC (rev 1704) @@ -0,0 +1,35 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk + +JAVA_HOME := /usr/lib/kaffe +ANT_HOME := /usr/share/ant +DEB_JARS := \ + ant-nodeps \ + commons-logging \ + commons-codec + +DEB_ANT_COMPILER := jikes +DEB_ANT_BUILD_TARGET := dist + +# Additional command-line arguments for Ant +#ANT_ARGS := -verbose + +LIBRARY_PACKAGE := commons-httpclient3 +API_VERSION := 3.0 + +common-configure-indep:: + # Build will fail, if lib directory is missing + -mkdir $(CURDIR)/lib + +install/lib$(LIBRARY_PACKAGE)-java:: + install -m 644 dist/commons-httpclient.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar + ln -s $(LIBRARY_PACKAGE)3-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE).jar + + +install/lib$(LIBRARY_PACKAGE)-java-doc:: + # Build the documentation + mkdir -p $(CURDIR)/debian/lib${LIBRARY_PACKAGE}-java-doc/usr/share/doc/lib${LIBRARY_PACKAGE}-java-doc/ + cp -aRf dist/docs/api $(CURDIR)/debian/lib${LIBRARY_PACKAGE}-java-doc/usr/share/doc/lib${LIBRARY_PACKAGE}-java-doc/ + Property changes on: trunk/commons-httpclient3/debian/rules ___________________________________________________________________ Name: svn:executable + * _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
