[pkg-java] r2548 - in trunk/slide-webdavclient/slide-webdavclient:
debian lib
Marcus Better
marcusb-guest at costa.debian.org
Tue Oct 3 19:27:02 UTC 2006
Author: marcusb-guest
Date: 2006-10-03 19:27:02 +0000 (Tue, 03 Oct 2006)
New Revision: 2548
Added:
trunk/slide-webdavclient/slide-webdavclient/debian/README.Debian
trunk/slide-webdavclient/slide-webdavclient/debian/watch
Removed:
trunk/slide-webdavclient/slide-webdavclient/lib/ant.jar
trunk/slide-webdavclient/slide-webdavclient/lib/antlr.jar
trunk/slide-webdavclient/slide-webdavclient/lib/commons-httpclient-contrib.jar
trunk/slide-webdavclient/slide-webdavclient/lib/commons-httpclient.jar
trunk/slide-webdavclient/slide-webdavclient/lib/commons-logging.jar
trunk/slide-webdavclient/slide-webdavclient/lib/commons-transaction-1.0.jar
trunk/slide-webdavclient/slide-webdavclient/lib/geronimo-spec-j2ee-1.0-M1.jar
trunk/slide-webdavclient/slide-webdavclient/lib/jdom-1.0.jar
trunk/slide-webdavclient/slide-webdavclient/lib/xml-im-exporter1.1.jar
Modified:
trunk/slide-webdavclient/slide-webdavclient/debian/changelog
trunk/slide-webdavclient/slide-webdavclient/debian/control
trunk/slide-webdavclient/slide-webdavclient/debian/copyright
trunk/slide-webdavclient/slide-webdavclient/debian/doc-base
trunk/slide-webdavclient/slide-webdavclient/debian/rules
Log:
Merge debian branch (r2547).
Copied: trunk/slide-webdavclient/slide-webdavclient/debian/README.Debian (from rev 2547, branches/slide-webdavclient/feature/debian/debian/README.Debian)
===================================================================
--- trunk/slide-webdavclient/slide-webdavclient/debian/README.Debian (rev 0)
+++ trunk/slide-webdavclient/slide-webdavclient/debian/README.Debian 2006-10-03 19:27:02 UTC (rev 2548)
@@ -0,0 +1,9 @@
+slide-webdavclient for Debian
+-----------------------------
+
+The following changes have been applied to the upstream source
+distribution for DFSG compliance:
+
+* Removed binary-only jars in the `lib' directory.
+
+ -- Marcus Better <marcus at better.se>, Tue, 3 Oct 2006 07:44:32 +0200
Modified: trunk/slide-webdavclient/slide-webdavclient/debian/changelog
===================================================================
--- trunk/slide-webdavclient/slide-webdavclient/debian/changelog 2006-10-03 19:25:37 UTC (rev 2547)
+++ trunk/slide-webdavclient/slide-webdavclient/debian/changelog 2006-10-03 19:27:02 UTC (rev 2548)
@@ -1,5 +1,5 @@
-slide-webdavclient (2.1-1) unstable; urgency=low
+slide-webdavclient (2.1+dfsg-1) unstable; urgency=low
* Initial release. (Closes: #386142)
- -- Marcus Better <marcus at better.se> Tue, 5 Sep 2006 13:22:11 +0200
+ -- Marcus Better <marcus at better.se> Tue, 3 Oct 2006 07:45:00 +0200
Modified: trunk/slide-webdavclient/slide-webdavclient/debian/control
===================================================================
--- trunk/slide-webdavclient/slide-webdavclient/debian/control 2006-10-03 19:25:37 UTC (rev 2547)
+++ trunk/slide-webdavclient/slide-webdavclient/debian/control 2006-10-03 19:27:02 UTC (rev 2548)
@@ -10,8 +10,8 @@
Package: libslide-webdavclient-java
Architecture: all
Depends: kaffe | java1-runtime | java2-runtime
-Suggests: java-virtual-machine, libslide-webdavclient-java-doc
+Suggests: java-virtual-machine
Description: WebDAV client library for Java
This is the WebDAV client library from the Jakarta Slide project.
.
- Homepage: http://jakarta.apache.org/slide
+ Homepage: http://jakarta.apache.org/slide
Modified: trunk/slide-webdavclient/slide-webdavclient/debian/copyright
===================================================================
--- trunk/slide-webdavclient/slide-webdavclient/debian/copyright 2006-10-03 19:25:37 UTC (rev 2547)
+++ trunk/slide-webdavclient/slide-webdavclient/debian/copyright 2006-10-03 19:27:02 UTC (rev 2548)
@@ -1,54 +1,212 @@
This package was debianized by Marcus Better <marcus at better.se> on
-Sun, 13 Aug 2006 15:43:49 +0200.
+Fri, 15 Sep 2006 12:54:00 +0200.
-It was downloaded from http://people.apache.org/~andyc/neko/doc/html/
+It was downloaded from http://jakarta.apache.org/slide/ .
-NekoHTML is Copyright (C) 2002-2005 Andy Clark, and released under the
-follwing license:
+Slide is Copyright (C) 1999-2006 The Apache Software Foundation.
- The CyberNeko Software License, Version 1.0
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- (C) Copyright 2002-2005, Andy Clark. All rights reserved.
+ 1. Definitions.
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
+ "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.
- 3. The end-user documentation included with the redistribution,
- if any, must include the following acknowledgment:
- "This product includes software developed by Andy Clark."
- Alternately, this acknowledgment may appear in the software itself,
- if and wherever such third-party acknowledgments normally appear.
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
- 4. The names "CyberNeko" and "NekoHTML" must not be used to endorse
- or promote products derived from this software without prior
- written permission. For written permission, please contact
- andyc at cyberneko.net.
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
- 5. Products derived from this software may not be called "CyberNeko",
- nor may "CyberNeko" appear in their name, without prior written
- permission of the author.
+ "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.
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ "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 Debian packaging is Copyright (C) 2006 Marcus Better
-<marcus at better.se> and is licensed under the same license as above.
+<marcus at better.se> and is licensed under the Apache License, Version
+2.0.
Modified: trunk/slide-webdavclient/slide-webdavclient/debian/doc-base
===================================================================
--- trunk/slide-webdavclient/slide-webdavclient/debian/doc-base 2006-10-03 19:25:37 UTC (rev 2547)
+++ trunk/slide-webdavclient/slide-webdavclient/debian/doc-base 2006-10-03 19:27:02 UTC (rev 2548)
@@ -1,4 +1,4 @@
-Document: slide-webdavclient-doc
+Document: slide-webdavclient
Title: Jakarta Slide WebDAV client API
Abstract: JavaDoc documentation for the Jakarta Slide WebDAV client library
Section: Apps/Programming
Modified: trunk/slide-webdavclient/slide-webdavclient/debian/rules
===================================================================
--- trunk/slide-webdavclient/slide-webdavclient/debian/rules 2006-10-03 19:25:37 UTC (rev 2547)
+++ trunk/slide-webdavclient/slide-webdavclient/debian/rules 2006-10-03 19:27:02 UTC (rev 2548)
@@ -20,13 +20,8 @@
PKGNAME := libslide-webdavclient-java
INSTALLDIR := $(CURDIR)/debian/$(PKGNAME)
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
-
build: build-stamp
-build-stamp: configure-stamp
+build-stamp:
dh_testdir
$(ANT_INVOKE) dist-clientlib
touch build-stamp
@@ -34,7 +29,7 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f build-stamp
$(ANT_INVOKE) clean
dh_clean
@@ -65,4 +60,4 @@
binary-arch: build install
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
Copied: trunk/slide-webdavclient/slide-webdavclient/debian/watch (from rev 2547, branches/slide-webdavclient/feature/debian/debian/watch)
===================================================================
--- trunk/slide-webdavclient/slide-webdavclient/debian/watch (rev 0)
+++ trunk/slide-webdavclient/slide-webdavclient/debian/watch 2006-10-03 19:27:02 UTC (rev 2548)
@@ -0,0 +1,2 @@
+version=3
+http://www.apache.org/dist/jakarta/slide/source/jakarta-slide-webdavclient-src-(.*).tar.gz
Deleted: trunk/slide-webdavclient/slide-webdavclient/lib/ant.jar
===================================================================
(Binary files differ)
Deleted: trunk/slide-webdavclient/slide-webdavclient/lib/antlr.jar
===================================================================
(Binary files differ)
Deleted: trunk/slide-webdavclient/slide-webdavclient/lib/commons-httpclient-contrib.jar
===================================================================
(Binary files differ)
Deleted: trunk/slide-webdavclient/slide-webdavclient/lib/commons-httpclient.jar
===================================================================
(Binary files differ)
Deleted: trunk/slide-webdavclient/slide-webdavclient/lib/commons-logging.jar
===================================================================
(Binary files differ)
Deleted: trunk/slide-webdavclient/slide-webdavclient/lib/commons-transaction-1.0.jar
===================================================================
(Binary files differ)
Deleted: trunk/slide-webdavclient/slide-webdavclient/lib/geronimo-spec-j2ee-1.0-M1.jar
===================================================================
(Binary files differ)
Deleted: trunk/slide-webdavclient/slide-webdavclient/lib/jdom-1.0.jar
===================================================================
(Binary files differ)
Deleted: trunk/slide-webdavclient/slide-webdavclient/lib/xml-im-exporter1.1.jar
===================================================================
(Binary files differ)
More information about the pkg-java-commits
mailing list