[pkg-java] r2620 - in trunk/libxalan2-java/debian: . patches
Arnaud Vandyck
avdyk at costa.debian.org
Tue Oct 17 10:49:39 UTC 2006
Author: avdyk
Date: 2006-10-17 10:49:38 +0000 (Tue, 17 Oct 2006)
New Revision: 2620
Removed:
trunk/libxalan2-java/debian/libxalan2-java-doc.docs
trunk/libxalan2-java/debian/patches/02_BuildXml_Target.patch
trunk/libxalan2-java/debian/patches/02_CopyFixedEntityFile.patch
Modified:
trunk/libxalan2-java/debian/ant.properties
trunk/libxalan2-java/debian/changelog
trunk/libxalan2-java/debian/control
trunk/libxalan2-java/debian/copyright
trunk/libxalan2-java/debian/libxalan2-java.links
trunk/libxalan2-java/debian/rules
Log:
libxalan2-java (2.7.0-0) experimental; urgency=low
* New upstream.
* Standards-Version updated to 3.7.2, moved cdbs and debhelper to
Build-Depends.
-- Arnaud Vandyck <avdyk at debian.org> Mon, 3 Jul 2006 13:33:15 +0200
Modified: trunk/libxalan2-java/debian/ant.properties
===================================================================
--- trunk/libxalan2-java/debian/ant.properties 2006-10-17 08:58:37 UTC (rev 2619)
+++ trunk/libxalan2-java/debian/ant.properties 2006-10-17 10:49:38 UTC (rev 2620)
@@ -6,4 +6,4 @@
#jlex.jar=/usr/share/java/JLex.jar
runtime.jar=/usr/share/java/cup.jar
regexp.jar=/usr/share/java/regexp.jar
-build.boot.class.path=/usr/share/java/jaxp-1.2.jar
+build.boot.class.path=/usr/share/java/jaxp-1.3.jar
Modified: trunk/libxalan2-java/debian/changelog
===================================================================
--- trunk/libxalan2-java/debian/changelog 2006-10-17 08:58:37 UTC (rev 2619)
+++ trunk/libxalan2-java/debian/changelog 2006-10-17 10:49:38 UTC (rev 2620)
@@ -1,3 +1,11 @@
+libxalan2-java (2.7.0-0) experimental; urgency=low
+
+ * New upstream.
+ * Standards-Version updated to 3.7.2, moved cdbs and debhelper to
+ Build-Depends.
+
+ -- Arnaud Vandyck <avdyk at debian.org> Mon, 3 Jul 2006 13:33:15 +0200
+
libxalan2-java (2.6.0-6) unstable; urgency=low
* kaffe compiler transition
Modified: trunk/libxalan2-java/debian/control
===================================================================
--- trunk/libxalan2-java/debian/control 2006-10-17 08:58:37 UTC (rev 2619)
+++ trunk/libxalan2-java/debian/control 2006-10-17 10:49:38 UTC (rev 2620)
@@ -3,13 +3,14 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Stefan Gybas <sgybas at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Arnaud Vandyck <avdyk at debian.org>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.8), kaffe (>= 2:1.1.5-1), ant (>= 1.6.3-1), libxerces2-java, libbsf-java, libregexp-java, libbcel-java (>= 5.0), jlex, cup, libjaxp1.2-java
-Standards-Version: 3.6.2
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.8)
+Build-Depends-Indep: java-gcj-compat-dev, ant (>= 1.6.3-1), libxerces2-java (>= 2.8.0), libbsf-java, libregexp-java, libbcel-java (>= 5.0), jlex, cup, libjaxp1.3-java
+Standards-Version: 3.7.2
Package: libxalan2-java
Architecture: all
Section: libs
-Depends: libjaxp1.2-java, libxerces2-java
+Depends: libjaxp1.3-java, libxerces2-java (>= 2.8.0)
Suggests: libxalan2-java-doc, libbsf-java, libxsltc-java
Description: XSL Transformations (XSLT) processor in Java
Xalan-Java is an XSLT processor for transforming XML documents into HTML,
Modified: trunk/libxalan2-java/debian/copyright
===================================================================
--- trunk/libxalan2-java/debian/copyright 2006-10-17 08:58:37 UTC (rev 2619)
+++ trunk/libxalan2-java/debian/copyright 2006-10-17 10:49:38 UTC (rev 2620)
@@ -9,60 +9,207 @@
Sam Ruby <rubys at us.ibm.com>
Don Leslie <donald_leslie at lotus.com>
-Copyright (BSD-style license):
+Copyright:
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999 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 acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xalan" 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",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * 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 and was
- * originally based on software copyright (c) 1999, Lotus
- * Development Corporation., http://www.lotus.com. 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.
+
Deleted: trunk/libxalan2-java/debian/libxalan2-java-doc.docs
===================================================================
--- trunk/libxalan2-java/debian/libxalan2-java-doc.docs 2006-10-17 08:58:37 UTC (rev 2619)
+++ trunk/libxalan2-java/debian/libxalan2-java-doc.docs 2006-10-17 10:49:38 UTC (rev 2620)
@@ -1 +0,0 @@
-build/docs/design
Modified: trunk/libxalan2-java/debian/libxalan2-java.links
===================================================================
--- trunk/libxalan2-java/debian/libxalan2-java.links 2006-10-17 08:58:37 UTC (rev 2619)
+++ trunk/libxalan2-java/debian/libxalan2-java.links 2006-10-17 10:49:38 UTC (rev 2620)
@@ -1 +1 @@
-/usr/share/java/jaxp-1.2.jar /usr/share/java/xml-apis.jar
+/usr/share/java/jaxp-1.3.jar /usr/share/java/xml-apis.jar
Deleted: trunk/libxalan2-java/debian/patches/02_BuildXml_Target.patch
===================================================================
--- trunk/libxalan2-java/debian/patches/02_BuildXml_Target.patch 2006-10-17 08:58:37 UTC (rev 2619)
+++ trunk/libxalan2-java/debian/patches/02_BuildXml_Target.patch 2006-10-17 10:49:38 UTC (rev 2620)
@@ -1,29 +0,0 @@
---- build.xml.orig 2006-01-17 12:39:27.000000000 +0100
-+++ build.xml 2006-01-17 12:40:51.000000000 +0100
-@@ -257,7 +257,7 @@
- <javac srcdir="${src.dir}"
- destdir="${build.classes}"
- debug="${build.debug}"
-- target="1.1" >
-+ target="1.3" source="1.3" nowarn="yes" >
- <include name="${apachexml.reldir}/**/*.java" />
- <!-- But exclude unused synthetic* files; should be obsoleted from CVS -->
- <exclude name="${apachexml.reldir}/utils/synthetic/**/*.java" />
-@@ -281,7 +281,7 @@
- <javac srcdir="${src.dir}"
- destdir="${build.classes}"
- debug="${build.debug}"
-- target="1.1" >
-+ target="1.3" source="1.3" nowarn="yes" >
- <include name="${xpath.reldir}/**/*.java" />
- <include name="${domxpath.reldir}/**/*.java" />
- <include name="${xalan.reldir}/**/*.java" />
-@@ -326,7 +326,7 @@
- <javac srcdir="${src.dir}"
- destdir="${build.classes}"
- includes="${xsltc.reldir}/util/**/*.java"
-- debug="${build.debug}">
-+ debug="${build.debug}" target="1.3" source="1.3" nowarn="yes">
- <classpath refid="xsltc.class.path" />
- <bootclasspath refid="xslt.boot.class.path" />
- </javac>
Deleted: trunk/libxalan2-java/debian/patches/02_CopyFixedEntityFile.patch
===================================================================
--- trunk/libxalan2-java/debian/patches/02_CopyFixedEntityFile.patch 2006-10-17 08:58:37 UTC (rev 2619)
+++ trunk/libxalan2-java/debian/patches/02_CopyFixedEntityFile.patch 2006-10-17 10:49:38 UTC (rev 2620)
@@ -1,11 +0,0 @@
---- build.xml.orig 2006-01-17 12:36:50.000000000 +0100
-+++ build.xml 2006-01-17 12:37:19.000000000 +0100
-@@ -229,6 +229,8 @@
- <untar src="${doc.generator.styletar}" dest="${xdocs.dir}"/>
- <delete file="${doc.generator.styletar}"/>
-
-+ <copy tofile="${xdocs.style}/dtd/characters.ent" file="debian/fixed_characters.ent"/>
-+
- <!-- We use a Notes agent to periodically extract Xalan-Java 2 commits from our team database into commits.xml. The following operation
- transforms commits.xml (just including source code commits) and puts the result in xdocs/sources/xalan for inclusion in the
- readme.xml -->
Modified: trunk/libxalan2-java/debian/rules
===================================================================
--- trunk/libxalan2-java/debian/rules 2006-10-17 08:58:37 UTC (rev 2619)
+++ trunk/libxalan2-java/debian/rules 2006-10-17 10:49:38 UTC (rev 2620)
@@ -5,11 +5,11 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
ANT_OPTS := -Dgnu.java.awt.peer.gtk.Graphics=Graphics2D
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar xmlParserAPIs xercesImpl bsf bcel cup regexp
+DEB_JARS := xmlParserAPIs xercesImpl bsf bcel cup regexp
DEB_ANT_CLEAN_TARGET := clean xsltc.clean
DEB_ANT_BUILD_TARGET := jar xsltc.unbundledjar javadocs #docs
@@ -29,4 +29,4 @@
cp -a build/docs/apidocs/* $(CURDIR)/debian/libxalan2-java-doc/usr/share/doc/libxalan2-java-doc/api/
# make lintian happy and remove zero-byte files
rm -Rf $(CURDIR)/samples/extensions/instantdb/tables
-
+
More information about the pkg-java-commits
mailing list