This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository velocity-tools.
commit 9449378e43200c0faeed9a25ebe13a292e660810 Author: Damien Raude-Morvan <[email protected]> Date: Sat Mar 21 21:45:32 2009 +0000 [svn-inject] Applying Debian modifications to trunk --- debian/README.Debian | 7 +++++ debian/TODO | 4 +++ debian/changelog | 7 +++++ debian/compat | 1 + debian/control | 38 +++++++++++++++++++++++++ debian/copyright | 30 ++++++++++++++++++++ debian/docs | 3 ++ debian/libvelocity-tools-java-doc.doc-base | 9 ++++++ debian/libvelocity-tools-java-doc.examples | 3 ++ debian/patches/00list | 1 + debian/patches/01_dont_copy_test_lib.dpatch | 44 +++++++++++++++++++++++++++++ debian/rules | 32 +++++++++++++++++++++ debian/watch | 2 ++ 13 files changed, 181 insertions(+) diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..6d8683e --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,7 @@ +VelocityStruts module +--------------------- +This package doesn't contains the struts part (a.k.a. VelocityStruts module) +because it need Struts 1.3.x which is not yet in Debian (see Debian bug #419761). +For now, we only provide VelocityView (including Generic tools). + +-- Damien Raude-Morvan <[email protected]> diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 0000000..558becd --- /dev/null +++ b/debian/TODO @@ -0,0 +1,4 @@ +- Launch FULL unit tests (the "test.view" Ant target) during build + need a Jetty servlet/JSP container and some more B-D. +- Package the struts 1.3.x module + need Struts 1.3.x which is not yet in Debian (see Debian bug #419761) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..e2f0161 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,7 @@ +velocity-tools (1.4-1) unstable; urgency=low + + * Initial release. (Closes: #497436) + * Build-Depend on default-jdk-builddep instead of java-gcj-compat-dev + * Include showcase and simple examples in libvelocity-tools-java-doc + + -- Damien Raude-Morvan <[email protected]> Mon, 16 Mar 2009 00:35:33 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..95e641e --- /dev/null +++ b/debian/control @@ -0,0 +1,38 @@ +Source: velocity-tools +Section: java +Priority: optional +Maintainer: Damien Raude-Morvan <[email protected]> +Build-Depends: cdbs, dpatch, debhelper (>= 5), default-jdk-builddep, ant +Build-Depends-Indep: antlr, libcommons-beanutils-java, libcommons-collections-java, libcommons-digester-java, libcommons-lang-java, libcommons-logging-java, libcommons-validator-java, liboro-java, libservlet2.4-java, velocity, junit4, ant-optional +Standards-Version: 3.8.1 +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/velocity-tools +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/velocity-tools +Homepage: http://velocity.apache.org/tools/ + +Package: libvelocity-tools-java +Architecture: all +Depends: ${misc:Depends}, libcommons-beanutils-java, libcommons-collections-java, libcommons-digester-java, libcommons-lang-java, libcommons-logging-java, libcommons-validator-java, liboro-java, libservlet2.4-java, velocity +Description: collection of useful tools for Velocity template engine + The VelocityTools project is a collection of useful Java classes (aka tools), + as well as infrastructure to easily, automatically and transparently + make these tools available to Velocity templates. + . + Project include easy integration of Velocity into the view-layer of + web applications (via the VelocityViewTag and + VelocityViewServlet) and integration with Struts 1.x applications. + +Package: libvelocity-tools-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: libvelocity-tools-java +Description: collection of useful tools for Velocity template engine - documentation + The VelocityTools project is a collection of useful Java classes (aka tools), + as well as infrastructure to easily, automatically and transparently + make these tools available to Velocity templates. + . + Project include easy integration of Velocity into the view-layer of + web applications (via the VelocityViewTag and + VelocityViewServlet) and integration with Struts 1.x applications. + . + This package provides the API documentation for Velocity Tools. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..6ebee74 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Damien Raude-Morvan <[email protected]> on +Thu, 27 Aug 2008 20:59:38 +0200. + +It was downloaded from http://www.apache.org/dist/velocity/tools/ + +Upstream Author: + The Apache Software Foundation. + +Copyright: + Copyright (C) 2000-2006 The Apache Software Foundation + +License: + + 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 full text of the Apache-2.0 license can be found in + `/usr/share/common-licenses/Apache-2.0' on Debian systems. + +The Debian packaging is Copyright 2008, Damien Raude-Morvan <[email protected]> and +is licensed under the Apache-2.0, see `/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..d2e8bef --- /dev/null +++ b/debian/docs @@ -0,0 +1,3 @@ +VLS_README.txt +CONTRIBUTORS +README.txt diff --git a/debian/libvelocity-tools-java-doc.doc-base b/debian/libvelocity-tools-java-doc.doc-base new file mode 100644 index 0000000..48e737c --- /dev/null +++ b/debian/libvelocity-tools-java-doc.doc-base @@ -0,0 +1,9 @@ +Document: libvelocity-tools-java-doc +Title: API Javadoc for Velocity Tools +Author: Velocity Tools developers +Abstract: This is the API Javadoc provided by the Velocity Tools library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libvelocity-tools-java-doc/api/index.html +Files: /usr/share/doc/libvelocity-tools-java-doc/api/* diff --git a/debian/libvelocity-tools-java-doc.examples b/debian/libvelocity-tools-java-doc.examples new file mode 100644 index 0000000..6bdb1b4 --- /dev/null +++ b/debian/libvelocity-tools-java-doc.examples @@ -0,0 +1,3 @@ +examples/showcase/ +examples/simple/ + diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 0000000..83541cc --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1 @@ +01_dont_copy_test_lib diff --git a/debian/patches/01_dont_copy_test_lib.dpatch b/debian/patches/01_dont_copy_test_lib.dpatch new file mode 100755 index 0000000..2073a07 --- /dev/null +++ b/debian/patches/01_dont_copy_test_lib.dpatch @@ -0,0 +1,44 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_dont_copy_test_lib.dpatch by Damien Raude-Morvan <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't try to copy some JAR files into "lib" directory. + +@DPATCH@ +diff -urNad trunk~/download.xml trunk/download.xml +--- trunk~/download.xml 2007-11-15 00:03:52.000000000 +0100 ++++ trunk/download.xml 2008-09-01 20:10:01.000000000 +0200 +@@ -286,8 +286,6 @@ + <property name="download.version" value="${jar.js.version}" /> + <property name="download.path" value="rhino/${download.name}/${download.version}" /> + <antcall target="http-test-download"/> +- <!-- httpunit wants a file named 'js.jar' --> +- <copy file="${test.lib.dir}/${download.name}-${download.version}.jar" tofile="${test.lib.dir}/js.jar"/> + </target> + + <target name="junit-download"> +diff -urNad trunk~/examples.xml trunk/examples.xml +--- trunk~/examples.xml 2007-02-05 19:27:52.000000000 +0100 ++++ trunk/examples.xml 2008-09-01 20:10:20.000000000 +0200 +@@ -53,13 +53,6 @@ + </target> + <target name="simple-dependencies"> + <copy todir="${lib}" file="${dist.dir}/${view.id}.jar"/> +- <copy todir="${lib}" file="${commons-beanutils.jar}"/> +- <copy todir="${lib}" file="${commons-collections.jar}"/> +- <copy todir="${lib}" file="${commons-digester.jar}"/> +- <copy todir="${lib}" file="${commons-lang.jar}"/> +- <copy todir="${lib}" file="${commons-logging.jar}"/> +- <copy todir="${lib}" file="${oro.jar}"/> +- <copy todir="${lib}" file="${velocity.jar}"/> + </target> + + <target name="showcase-example"> +@@ -69,7 +62,6 @@ + <antcall target="example-${target}"/> + </target> + <target name="showcase-dependencies" depends="simple-dependencies"> +- <copy todir="${lib}" file="${servlet.jar}"/> + </target> + + <target name="struts-example"> diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..e0027db --- /dev/null +++ b/debian/rules @@ -0,0 +1,32 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/cdbs/1/class/ant.mk + +JAVA_HOME := /usr/lib/jvm/default-java +ANT_HOME := /usr/share/ant + +DEB_JARS := antlr commons-beanutils commons-collections commons-digester commons-lang commons-logging commons-validator oro servlet-api velocity junit4 ant-junit + +DEB_ANT_BUILD_TARGET := jar.view javadoc +DEB_ANT_CHECK_TARGET := test.generic +DEB_ANT_CLEAN_TARGET := clean + +DEB_ANT_ARGS := -Dskip-download=true + +API_DOCS := docs/javadoc/* + +binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java:: + dh_install -plib$(DEB_SOURCE_PACKAGE)-java dist/$(DEB_SOURCE_PACKAGE)-view-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_link -plib$(DEB_SOURCE_PACKAGE)-java usr/share/java/$(DEB_SOURCE_PACKAGE)-view-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(DEB_SOURCE_PACKAGE)-view.jar + +binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java-doc:: + dh_install -plib$(DEB_SOURCE_PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(DEB_SOURCE_PACKAGE)-java-doc/api + +# Rename content directory to velocity-tools-X.Y in orig.tar.gz +get-orig-source: + uscan --force-download --rename --repack diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..a638e30 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.apache.org/dist/velocity/tools/([\d\.]+)/velocity-tools-([\d\.]+)-src\.tar\.gz debian uupdate -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/velocity-tools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
