CVS velocity/debian
Arnaud Vandyck
avdyk@haydn.debian.org
Thu Apr 21 12:53:02 2005
Update of /cvsroot/pkg-java/velocity/debian
In directory haydn:/tmp/cvs-serv23953/debian
Modified Files:
README.Debian changelog control copyright dirs rules
velocity.links
Added Files:
compat
Log Message:
new upstream, move to main, thanks to wolfgang
--- /cvsroot/pkg-java/velocity/debian/README.Debian 2005/03/22 23:01:19 1.1.1.1
+++ /cvsroot/pkg-java/velocity/debian/README.Debian 2005/04/21 12:52:52 1.2
@@ -5,8 +5,8 @@
following files:
/usr/share/java/xerces.jar
/usr/share/java/jdom0.jar
- /usr/share/java/log4j-1.2.jar
/usr/share/java/logkit.jar
+ /usr/share/java/log4j-1.2.jar
/usr/share/java/commons-collections.jar
/usr/share/java/velocity.jar
--- /cvsroot/pkg-java/velocity/debian/changelog 2005/03/22 23:01:19 1.1.1.1
+++ /cvsroot/pkg-java/velocity/debian/changelog 2005/04/21 12:52:52 1.2
@@ -1,3 +1,20 @@
+velocity (1.4-1) unstable; urgency=low
+
+ * New upstream release (closes: #245492)
+ * Upstream license has changed to Apache Software License 2.0
+ * Build system changed to cdbs with kaffe, jikes, gjdoc
+ * Move to main as werken.xpath is now in main
+ * Enabled junit tests during build
+ + patched VelocityServletTest to compile against libservlet2.3-java
+ + patched testcases.xml ant build file for runtime libraries
+ * Modified build.xml (04_buildxml.patch)
+ + Set javac target=1.3 to support JDK 1.3 vm's
+ + Excluded test files from jar and javadoc
+ * Disabled compilation of examples - only ship source
+ * Standards-Version: 3.6.1 (no changes required)
+
+ -- Wolfgang Baer <WBaer@gmx.de> Tue, 19 Apr 2005 20:26:02 +0200
+
velocity (1.3.1-2) unstable; urgency=low
* fixed FTBFS (Closes: #299301)
@@ -5,7 +22,7 @@
* changed maintainer to Debian Java Maintainers as
requested by Takashi Okamoto for comaintaining
* avdyk: added Wolfgang and myself as uploaders
-
+
-- Wolfgang Baer <WBaer@gmx.de> Mon, 14 Mar 2005 19:50:14 +0100
velocity (1.3.1-1) unstable; urgency=low
--- /cvsroot/pkg-java/velocity/debian/control 2005/03/22 23:01:19 1.1.1.1
+++ /cvsroot/pkg-java/velocity/debian/control 2005/04/21 12:52:52 1.2
@@ -1,14 +1,14 @@
Source: velocity
-Section: contrib/web
+Section: web
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Takashi Okamoto <tora@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@gmx.de>
-Build-Depends-Indep: debhelper (>> 3.0.0), kaffe (>=2:1.1.4.PRECVS9-1), libxerces-java, junit, libjdom0-java, libcommons-collections-java, libservlet2.3-java, libwerken.xpath-java, libbcel-java, liblog4j1.2-java, liblogkit-java, liboro-java, ant(>=1.4), antlr
-Standards-Version: 3.5.9
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, libant1.6-java, kaffe, junit, liblogkit-java, libservlet2.3-java, liblog4j1.2-java, libjdom0-java, libcommons-collections-java, libwerken.xpath-java, libbcel-java, liboro-java
+Standards-Version: 3.6.1
Package: velocity
Architecture: all
-Depends: java-common, libjdom0-java, libcommons-collections-java, ant(>=1.3), liblog4j1.2-java, libwerken.xpath-java, libbcel-java, libxerces-java | libcrimson-java
+Depends: kaffe | java1-runtime | java2-runtime, libjdom0-java, libcommons-collections-java, libant1.6-java, liblogkit-java, libwerken.xpath-java, libbcel-java, libxerces-java | libcrimson-java
Suggests: velocity-doc
Description: Java-based template engine for web application
Velocity is a Java-based template engine. It permits anyone to use
--- /cvsroot/pkg-java/velocity/debian/copyright 2005/03/22 23:01:19 1.1.1.1
+++ /cvsroot/pkg-java/velocity/debian/copyright 2005/04/21 12:52:52 1.2
@@ -1,9 +1,11 @@
This package was debianized by Takashi Okamoto <tora@debian.org> on
-Wed, 15 Aug 2001 08:57:18 +0900.
+Wed, 15 Aug 2001 08:57:18 +0900. The new upstream release which changes
+the license to the Apache Software License, Version 2.0 was debianized
+by Wolfgang Baer <WBaer@gmx.de> on Sun, 20 Mar 2005 13:59:13 +0100.
-It was downloaded from http://jakarta.apache.org/velocity
+It was downloaded from <http://jakarta.apache.org/velocity>
-Upstream Author(s): Jason van Zyl jvanzyl@periapt.com
+Upstream Authors: Jason van Zyl jvanzyl@periapt.com
Jon S. Stevens jon@latchkey.com
Daniel L. dlr@collab.net
Rall Dave Bryson dave@miceda-data.com
@@ -16,60 +18,177 @@
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@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.
--- /cvsroot/pkg-java/velocity/debian/dirs 2005/03/22 23:01:19 1.1.1.1
+++ /cvsroot/pkg-java/velocity/debian/dirs 2005/04/21 12:52:52 1.2
@@ -1,2 +1,3 @@
usr/share/ant/lib
usr/share/java
+etc/velocity
--- /cvsroot/pkg-java/velocity/debian/rules 2005/03/22 23:01:19 1.1.1.1
+++ /cvsroot/pkg-java/velocity/debian/rules 2005/04/21 12:52:52 1.2
@@ -1,92 +1,27 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 by Joey Hess.
-#
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independent
-# package.
+# debian/rules for velocity (uses CDBS)
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
export LANG=C
-# Uncomment the next line to build a Java 2 version
-#jdk_dirs:=/usr/lib/j2se/1.3 /usr/lib/j2sdk1.3 /usr/java/j2sdk1.4.1_03
-#export JAVA_HOME=$(shell for jdir in $(jdk_dirs); do if [ -d "$$jdir" ]; then echo $$jdir; exit 0; fi; done)
-#export JAVA_HOME=/usr/lib/kaffe
-#export JAVA=$(JAVA_HOME)/bin/java
-#export JAR=$(JAVA_HOME)/bin/jar
-#export CLASSPATH=$(JAVA_HOME)/lib/tools.jar:$(JAVA_HOME)/lib/classes.zip:/usr/share/java/xerces.jar:/usr/share/java/jdom.jar:/usr/share/java/werken.xpath.jar:/usr/share/java/servlet-2.2.jar:/usr/share/java/logkit.jar:/usr/share/java/ant.jar:/usr/share/java/junit.jar:/usr/share/java/log4j.jar:/usr/share/java/commons-collections.jar:/usr/share/java/commons-beanutils.jar:/usr/share/java/oro.jar:/usr/share/java/bcel.jar:debian:.
-
-# Uncomment this section to build with Kaffe
-
-export JAVA_HOME=/usr/lib/kaffe
-export JAVA=/usr/lib/kaffe/bin/java
-export JAR=/usr/lib/kaffe/bin/jar
-
-export CLASSPATH=/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-launcher.jar:/usr/share/classpath/glibj.zip:/usr/share/java/ant.jar:/usr/share/java/jdom0.jar:/usr/share/java/xerces.jar:/usr/share/java/servlet-2.3.jar:/usr/share/java/werken.xpath.jar:/usr/share/java/bcel.jar:/usr/share/java/antlr.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/logkit.jar:/usr/share/java/junit.jar:/usr/share/java/commons-collections.jar:/usr/share/java/oro.jar:debian:.
-
-build: build-stamp
-build-stamp:
- dh_testdir
-
- # Add here commands to compile the package.
- (cd build;${JAVA} -classpath ${CLASSPATH} org.apache.tools.ant.Main docs jar examples javadocs )
-# (cd build;${JAVA} -classpath ${CLASSPATH} org.apache.tools.ant.Main examples)
-# (cd build;${JAVA} -classpath ${CLASSPATH} org.apache.tools.ant.Main javadocs)
-# (cd build;${JAVA} -classpath ${CLASSPATH} org.apache.tools.ant.Main docs)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- rm -rf docs bin build/velocity.log
- find . -name "*.jar" -exec rm \{\} \;
- find . -name "*.class" -exec rm \{\} \;
- # Add here commands to clean up after the build process.
- (cd build;${JAVA} org.apache.tools.ant.Main clean)
-
- dh_clean
-
-install: DH_OPTIONS=
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
-
- # Add here commands to install the package into debian/velocity.
- install -m 644 bin/velocity-1.3.1.jar debian/velocity/usr/share/java/velocity-1.3.1.jar
-# install -m 644 src/java/org/apache/velocity/runtime/defaults/velocity.properties debian/velocity/etc/velocity
-
- dh_movefiles --sourcedir=debian/velocity
-
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installdocs -i
- dh_installdebconf -i
-# dh_installchangelogs -i docs/changes.html
- dh_installchangelogs -i
- dh_link -i
- dh_compress -i
- dh_installexamples -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+UPSTREAM_VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+
+JAVA_HOME := /usr/lib/kaffe
+ANT_HOME := /usr/share/ant1.6
+
+DEB_JARS := ${ANT_HOME}/lib/ant-launcher.jar junit logkit servlet-2.3 log4j-1.2 commons-collections werken.xpath bcel oro jdom0 antlr
+DEB_ANT_COMPILER := jikes
+DEB_ANT_CLEAN_TARGET := clean examples-clean-all javadocs-clean test-clean
+DEB_ANT_BUILD_TARGET := jar javadocs test
+DEB_BUILDDIR := build
+
+clean::
+ -rm -f build/lib/*
+ -rm -f build/velocity.log
+
+install/velocity::
+ install -m 644 bin/velocity-${UPSTREAM_VERSION}.jar debian/velocity/usr/share/java/velocity-${UPSTREAM_VERSION}.jar
+ install -m 644 src/java/org/apache/velocity/runtime/defaults/velocity.properties debian/velocity/etc/velocity
--- /cvsroot/pkg-java/velocity/debian/velocity.links 2005/03/22 23:01:19 1.1.1.1
+++ /cvsroot/pkg-java/velocity/debian/velocity.links 2005/04/21 12:52:52 1.2
@@ -1,6 +1,6 @@
-usr/share/java/velocity-1.3.1.jar usr/share/java/velocity.jar
+usr/share/java/velocity-1.4.jar usr/share/java/velocity.jar
usr/share/java/velocity.jar usr/share/ant/lib/velocity.jar
-usr/share/java/log4j-1.2.jar usr/share/ant/lib/log4j-1.2.jar
+usr/share/java/logkit.jar usr/share/ant/lib/logkit.jar
usr/share/java/jdom0.jar usr/share/ant/lib/jdom0.jar
usr/share/java/commons-collections.jar usr/share/ant/lib/commons-collections.jar
usr/share/java/werken.xpath.jar usr/share/ant/lib/werken.xpath.jar