CVS commons-collections/debian
Barry Hawkins
barryh-guest at haydn.debian.org
Wed Aug 17 04:48:06 UTC 2005
Update of /cvsroot/pkg-java/commons-collections/debian
In directory haydn:/tmp/cvs-serv19756/debian
Modified Files:
changelog control copyright libcommons-collections-java.links
rules
Log Message:
Commit changes found in package version 2.1.1-3 and tag repository appropriately.
--- /cvsroot/pkg-java/commons-collections/debian/changelog 2004/04/08 12:54:29 1.2
+++ /cvsroot/pkg-java/commons-collections/debian/changelog 2005/08/17 04:48:06 1.3
@@ -1,30 +1,43 @@
-commons-collections (2.1-1.1) unstable; urgency=low
+libcommons-collections-java (2.1.1-3) unstable; urgency=low
- * Added kaffe, jikes and libant1.5-java to the build-dep-indep field
- (closes: #232521)
- * Move to main: commons-collections now uses only main packages to build
- (closes: #237312)
- * src/java/log: removed (closes: #199324)
- * debian/copyright: clean up the upstream author field because of a
- Lintian warning
- * debian/control: changed the -doc description (not available at the
- moment)
+ * rebuild by jikes with -source 1.3 option. This keeps backward
+ compatibility for J2SDK1.3.
- -- Arnaud Vandyck <avdyk at debian.org> Thu, 8 Apr 2004 14:23:41 +0200
+ -- Takashi Okamoto <tora at debian.org> Sat, 7 Aug 2004 00:02:50 +0900
-commons-collections (2.1-1) unstable; urgency=low
+libcommons-collections-java (2.1.1-2) unstable; urgency=low
+
+ * add cdbs to build-depend.(closes: #258458)
+
+ -- Takashi Okamoto <tora at debian.org> Sun, 18 Jul 2004 19:56:41 +0900
+
+libcommons-collections-java (2.1.1-1) unstable; urgency=low
+
+ * New upstream release
+ * fixed FTBFS (closes: #232521).
+ * delete log file to compile log(closes: #199324).
+
+ -- Takashi Okamoto <tora at debian.org> Wed, 7 Jul 2004 23:37:10 +0900
+
+libcommons-collections-java (2.1-2) unstable; urgency=low
+
+ * Move to main.
+
+ -- Takashi Okamoto <tora at debian.org> Sat, 1 May 2004 21:02:35 +0900
+
+libcommons-collections-java (2.1-1) unstable; urgency=low
* New upstream release
-- Takashi Okamoto <tora at debian.org> Sun, 10 Nov 2002 15:43:48 +0900
-commons-collections (2.0-1) unstable; urgency=low
+libcommons-collections-java (2.0-1) unstable; urgency=low
* New upstream release
-- Takashi Okamoto <tora at debian.org> Fri, 28 Jun 2002 01:27:58 +0900
-commons-collections (1.0-1) unstable; urgency=low
+libcommons-collections-java (1.0-1) unstable; urgency=low
* Initial Release.
--- /cvsroot/pkg-java/commons-collections/debian/control 2004/04/08 12:54:29 1.2
+++ /cvsroot/pkg-java/commons-collections/debian/control 2005/08/17 04:48:06 1.3
@@ -1,13 +1,14 @@
-Source: commons-collections
+Source: libcommons-collections-java
Section: libs
Priority: optional
-Maintainer: Takashi Okamoto <tora at debian.org>
-Build-Depends-Indep: debhelper (>> 3.0.0), libant1.5-java, kaffe, jikes
-Standards-Version: 3.5.2
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Takashi Okamoto <tora at debian.org>
+Build-Depends-Indep: debhelper (>> 4.0.0), libant1.6-java, kaffe (>= 1:1.1.3), jikes (>= 1:1.18-8), cdbs (>= 0.4.21-0.1)
+Standards-Version: 3.6.1
Package: libcommons-collections-java
Architecture: all
-Depends: java-common
+Depends: kaffe (>= 1:1.1.3) | java2-runtime
Suggests: libcommons-collections-java-doc
Description: A set of abstract data type interfaces and implementations
The Java Collections Framework provides a set of abstract data
@@ -15,11 +16,8 @@
of useful functionality, and a solid foundation for extending
that functionality.
-Package: libcommons-collections-java-doc
-Architecture: all
-Description: Documentation for libcommons-collections-java
- JavaDoc of a set of abstract data type interfaces and implementations.
- This is not available at the moment. The package is moving to main and
- there is no way to easily make javadoc with a javadoc tool in main.
- .
- Sorry for the inconvenient.
+#Package: libcommons-collections-java-doc
+#Architecture: all
+#Description: Documentation for libcommons-collections-java
+# Documentation for libcommons-collections-java which is a set of abstract
+# data type interfaces and implementations.
--- /cvsroot/pkg-java/commons-collections/debian/copyright 2004/04/08 12:54:29 1.2
+++ /cvsroot/pkg-java/commons-collections/debian/copyright 2005/08/17 04:48:06 1.3
@@ -3,7 +3,8 @@
It was downloaded from http://jakarta.apache.org/commons/
-Upstream Authors: Peter Donald
+Upstream Authors:
+ Peter Donald
Geir Magnusson Jr.
Craig McClanahan
James Strachan
@@ -11,60 +12,205 @@
Jason van Zyl
Copyright:
-/*
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 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.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache at apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * "Velocity" nor may "Apache" appear in their names without prior
- * written permission of the Apache Group.
- *
- * 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 APACHE SOFTWARE FOUNDATION OR
- * ITS 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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
+ 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.
--- /cvsroot/pkg-java/commons-collections/debian/libcommons-collections-java.links 2004/04/08 12:54:29 1.2
+++ /cvsroot/pkg-java/commons-collections/debian/libcommons-collections-java.links 2005/08/17 04:48:06 1.3
@@ -1 +1 @@
-usr/share/java/commons-collections-2.1.jar usr/share/java/commons-collections.jar
+usr/share/java/commons-collections-2.1.1.jar usr/share/java/commons-collections.jar
--- /cvsroot/pkg-java/commons-collections/debian/rules 2004/04/08 12:54:29 1.2
+++ /cvsroot/pkg-java/commons-collections/debian/rules 2005/08/17 04:48:06 1.3
@@ -1,103 +1,29 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# debian/rules file for libcommons-collections-java (uses cdbs)
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-export LANG=C
-
-PNAME=commons-collections
-VERSION=2.1
-JARFILE=dist/commons-collections.jar
-BUILDFILE=build.xml
-
-# for Blackdown JDK (you shuld add j2sdk1.3 at Build-Depends
-# And pacgkage should go to contrib section even if it's own license is free.
-#jdk_dirs:=/usr/lib/j2se/1.3 /usr/lib/j2sdk1.3
-#export JAVA_HOME=$(shell for jdir in $(jdk_dirs); do if [ -d "$$jdir" ]; then echo $$jdir; exit 0; fi; done)
-#export CLASSPATH=.:${JAVA_HOME}/lib/tools.jar:${JAVA_HOME}/jre/lib/rt.jar
-#export JAVAC=${JAVA_HOME}/bin/javac
-
-# for Kaffe
-# remove following comments when you use kaffe
-# you should you kaffe when you want to put your package into main
-export JAVA_HOME=/usr/lib/kaffe
-export ANT_HOME=/usr/share/ant1.5
-export CLASSPATH=.:/usr/share/ant1.5/lib/ant.jar
-#/usr/share/kaffe/Klasses.jar:/usr/share/kaffe/rmi.jar
-
-DEB_ANT_INVOKE = ${JAVA_HOME}/bin/java -classpath ${CLASSPATH} \
- -Dant.home=${ANT_HOME} org.apache.tools.ant.Main -Dbuild.compiler=jikes -buildfile ${BUILDFILE}
-
-build: build-stamp
-build-stamp:
- dh_testdir
-
- # Add here commands to compile the package.
-# do not build the doc at the moment!
-# $(DEB_ANT_INVOKE) doc-javadoc
- mkdir -p dist/docs/api
- $(DEB_ANT_INVOKE) dist-jar
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- $(DEB_ANT_INVOKE) clean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/commons-collections.
- install -m 644 ${JARFILE} $(CURDIR)/debian/lib${PNAME}-java/usr/share/java/${PNAME}-${VERSION}.jar
-
- dh_movefiles --sourcedir=debian/lib${PNAME}-java
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
-# dh_installdebconf -i
- dh_installdocs -i
- dh_installexamples -i
- dh_installmenu -i
-# dh_installlogrotate -i
-# dh_installemacsen -i
-# dh_installpam -i
-# dh_installmime -i
-# dh_installinit -i
-# dh_installcron -i
-# dh_installman -i
-# dh_installinfo -i
-# dh_undocumented -i
- dh_installchangelogs -i
- dh_link -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
-# dh_makeshlibs -i
- dh_installdeb -i
-# dh_perl -i
-# dh_shlibdeps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
+# These two must be specified
+JAVA_HOME := /usr/lib/kaffe
+ANT_HOME := /usr/share/ant1.6
+
+# Additional JARs to add to the class path, either full path or just the
+# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
+DEB_JARS := /usr/share/ant1.6/lib/ant-launcher.jar log4j-1.2 logkit servlet-2.3
+
+
+# Build compiler
+DEB_ANT_COMPILER := jikes
+
+# Defaults to debian/ant.properties
+#DEB_ANT_PROPERTYFILE := build.properties
+
+# Defaults to build.xml (Ant default) in $(DEB_BUILDDIR)
+#DEB_ANT_BUILDFILE := build.xml
+
+DEB_ANT_BUILD_TARGET := dist-jar
+
+install/libcommons-collections-java::
+ install -m 644 dist/commons-collections-2.1.1.jar debian/libcommons-collections-java/usr/share/java/commons-collections-2.1.1.jar
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
More information about the pkg-java-commits
mailing list