[pkg-java] r8930 - in trunk: . velocity/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Tue Jul 7 22:51:56 UTC 2009


Author: ludovicc-guest
Date: 2009-07-07 22:51:56 +0000 (Tue, 07 Jul 2009)
New Revision: 8930

Added:
   trunk/velocity/debian/antlib.xml
   trunk/velocity/debian/build.properties
   trunk/velocity/debian/maven.publishedRules
   trunk/velocity/debian/maven.rules
   trunk/velocity/debian/orig-tar.sh
   trunk/velocity/debian/velocity-ant.links
   trunk/velocity/debian/velocity.poms
Removed:
   trunk/tags/
   trunk/velocity/debian/velocity.links
Modified:
   trunk/velocity/debian/changelog
   trunk/velocity/debian/compat
   trunk/velocity/debian/control
   trunk/velocity/debian/copyright
   trunk/velocity/debian/rules
   trunk/velocity/debian/velocity-doc.doc-base.1
   trunk/velocity/debian/velocity-doc.docs
   trunk/velocity/debian/velocity-doc.examples
   trunk/velocity/debian/watch
Log:
* Remove tags in the wrong place

Added: trunk/velocity/debian/antlib.xml
===================================================================
--- trunk/velocity/debian/antlib.xml	                        (rev 0)
+++ trunk/velocity/debian/antlib.xml	2009-07-07 22:51:56 UTC (rev 8930)
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<antlib>
+   <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask" 
+     classpath="/usr/share/java/commons-collections3.jar:usr/share/java/logkit.jar:usr/share/java/jdom1.jar:usr/share/java/werken.xpath.jar" />
+   <taskdef name="texen" classname="org.apache.velocity.texen.ant.TexenTask" 
+     classpath="/usr/share/java/commons-collections3.jar:usr/share/java/logkit.jar" />
+</antlib>
+

Added: trunk/velocity/debian/build.properties
===================================================================
--- trunk/velocity/debian/build.properties	                        (rev 0)
+++ trunk/velocity/debian/build.properties	2009-07-07 22:51:56 UTC (rev 8930)
@@ -0,0 +1,5 @@
+maven.test.skip=true
+build.sourceDirectory=src/java
+build.resourcesDirectory=src/java
+build.testSourceDirectory=src/test
+javadoc.dir=build/docs/api

Modified: trunk/velocity/debian/changelog
===================================================================
--- trunk/velocity/debian/changelog	2009-07-07 22:39:08 UTC (rev 8929)
+++ trunk/velocity/debian/changelog	2009-07-07 22:51:56 UTC (rev 8930)
@@ -1,12 +1,44 @@
-velocity (1.4-5.1) UNRELEASED; urgency=low
+velocity (1.6.2-1) unstable; urgency=low
 
-  * Non-maintainer upload.
+  * New upstream version, add myself to Uploaders
+  * Change section to java, bump up Standards-Version to 3.8.1
+  * Bump up debhelper to 6
+  * Move debhelper and cdbs from Build-Depends-Indep to Build-Depends to
+    clear Lintian error
+  * Use default-jdk instead of kaffe for the build
+  * Use default-jre-headless | java1-runtime-headless | java2-runtime-headless 
+    instead of kaffe | java1-runtime | java2-runtime for velocity Depends: 
+  * Update from libjdom0-java to libjdom1-java (Closes: #500536)
+  * Update from libcommons-collections-java to libcommons-collections3-java
+  * Add a dependency on libcommons-lang-java, libcommons-logging-java, 
+    liboro-java
+  * Update from libservlet2.3-java to libservlet2.5-java
+  * Move liblogkit-java, liblog4j1.2-java, libservlet2.5-java, ant, 
+    libwerken.xpath-java from Depends to Recommends (Closes: #532640)
+  * Create a new velocity-ant package that holds the links to install under
+    /usr/share/ant/lib, thus avoiding touching Ant every time Velocity is
+    installed. (Closes: #506018)
+  * Remove logkit.jar, jdom1.jar, commons-collections3.jar and 
+    werken.xpath.jar from /usr/share/ant/lib as the Antlib-defined tasks
+    have their own classpath (using libraries in /usr/share/java) and 
+    don't need those shared Ant libraries anymore. (Closes: #506018)
+  * Add watch file
+  * Remove all patches as they don't apply anymore and seem irrelevent now
+  * Add the Maven POM to the package,
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Use mh_installpom and mh_installjar to install the POM and the jar to the
+    Maven repository
+  * Disable the user docs as it requires the use of a Maven plugin to generate 
+    them. Put the old control files in debian/old folder
+  * Remove the full text of the Apache 2.0 license
+  * Fix some Lintian warnings: add ${misc:Depends}, add copyright notice.
+  * Add Vcs-* fields and Homepage
 
-  [ Emmanuel Bourg ]
+  [ Emmanuel Bourg and Sylvestre Ledru]
   * Update of the URLs
   * Rename Jakarta Commons to Apache Commons
 
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Wed, 17 Jun 2009 10:54:12 +0200
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 10 May 2009 13:24:03 +0100
 
 velocity (1.4-5) unstable; urgency=low
 

Modified: trunk/velocity/debian/compat
===================================================================
--- trunk/velocity/debian/compat	2009-07-07 22:39:08 UTC (rev 8929)
+++ trunk/velocity/debian/compat	2009-07-07 22:51:56 UTC (rev 8930)
@@ -1 +1 @@
-4
+6

Modified: trunk/velocity/debian/control
===================================================================
--- trunk/velocity/debian/control	2009-07-07 22:39:08 UTC (rev 8929)
+++ trunk/velocity/debian/control	2009-07-07 22:51:56 UTC (rev 8930)
@@ -1,14 +1,25 @@
 Source: velocity
-Section: web
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, ant, ant-optional, 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.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>,
+ Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: debhelper (>= 6), cdbs, default-jdk
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
+ junit, liblogkit-java, libservlet2.5-java, 
+ liblog4j1.2-java, libjdom1-java, libcommons-lang-java, libcommons-collections3-java, libcommons-logging-java,
+ libwerken.xpath-java, libbcel-java, liboro-java
+Standards-Version: 3.8.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/velocity
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/velocity
+Homepage: http://velocity.apache.org/
 
 Package: velocity
 Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime, libjdom0-java, libcommons-collections-java, ant, liblogkit-java, libwerken.xpath-java, libbcel-java, libxerces2-java
+Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless, 
+ libjdom1-java, libcommons-lang-java, libcommons-collections3-java, libcommons-logging-java, 
+ liboro-java, libbcel-java, libxerces2-java
+Recommends: velocity-ant, liblogkit-java, liblog4j1.2-java, libservlet2.5-java, libwerken.xpath-java
 Suggests: velocity-doc
 Description: Java-based template engine for web application
  Velocity is a Java-based template engine. It permits anyone to use
@@ -23,8 +34,30 @@
  the long run and providing a viable alternative to Java Server Pages
  (JSPs) or PHP.
 
+Package: velocity-ant
+Architecture: all
+Depends: ${misc:Depends}, ant, velocity, liblogkit-java, libwerken.xpath-java
+Description: Java-based template engine for web application
+ Velocity is a Java-based template engine. It permits anyone to use
+ the simple yet powerful template language to reference objects
+ defined in Java code.
+ When Velocity is used for web development, Web designers can work in
+ parallel with Java programmers to develop web sites according to the
+ Model-View-Controller (MVC) model, meaning that web page designers
+ can focus solely on creating a site that looks good, and programmers
+ can focus solely on writing top-notch code. Velocity separates Java
+ code from the web pages, making the web site more maintainable over
+ the long run and providing a viable alternative to Java Server Pages
+ (JSPs) or PHP.
+ .
+ This package provides the following Ant tasks: anakia and texen.
+ Those Ant tasks are made available under the following Antlib namespace:
+ xmlns:velocity="antlib:org.apache.velocity"
+
 Package: velocity-doc
 Architecture: all
+Section: doc
+Depends: ${misc:Depends}
 Suggests: velocity
 Description: Documentation for velocity
  Velocity is a Java-based template engine which is useful to develop 

Modified: trunk/velocity/debian/copyright
===================================================================
--- trunk/velocity/debian/copyright	2009-07-07 22:39:08 UTC (rev 8929)
+++ trunk/velocity/debian/copyright	2009-07-07 22:51:56 UTC (rev 8930)
@@ -16,179 +16,19 @@
 			John Castura  	jcastura at kw.igs.net              
 			Leon Messerschmidt leon at opticode.co.za      
 
-Copyright:
+Copyright: 2001-2009 The Apache Software Foundation
 
-                              Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+   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
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+       http://www.apache.org/licenses/LICENSE-2.0
 
-   1. Definitions.
+   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.
 
-      "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.
+The full text of the license can be found in
+'/usr/share/common-licenses/Apache-2.0'.

Added: trunk/velocity/debian/maven.publishedRules
===================================================================
--- trunk/velocity/debian/maven.publishedRules	                        (rev 0)
+++ trunk/velocity/debian/maven.publishedRules	2009-07-07 22:51:56 UTC (rev 8930)
@@ -0,0 +1 @@
+s/velocity/org.apache.velocity/ * * s/.*/debian/

Added: trunk/velocity/debian/maven.rules
===================================================================
--- trunk/velocity/debian/maven.rules	                        (rev 0)
+++ trunk/velocity/debian/maven.rules	2009-07-07 22:51:56 UTC (rev 8930)
@@ -0,0 +1,7 @@
+commons-collections commons-collections jar s/3\..*/3.x/
+s/jdom/org.jdom/ jdom jar s/1\..*/debian/
+s/ant/org.apache.ant/ * * s/.*/debian/
+log4j log4j jar s/1\.2\..*/1.2.x/
+junit junit jar s/3\..*/3.x/
+# force using servlet 2.5
+javax.servlet * * s/.*/2.5/

Added: trunk/velocity/debian/orig-tar.sh
===================================================================
--- trunk/velocity/debian/orig-tar.sh	                        (rev 0)
+++ trunk/velocity/debian/orig-tar.sh	2009-07-07 22:51:56 UTC (rev 8930)
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../velocity_$VERSION.orig.tar.gz
+DIR=velocity-$VERSION
+TAG=$2
+
+svn export http://svn.apache.org/repos/asf/velocity/engine/tags/$TAG $DIR
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
+fi


Property changes on: trunk/velocity/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/velocity/debian/rules
===================================================================
--- trunk/velocity/debian/rules	2009-07-07 22:39:08 UTC (rev 8929)
+++ trunk/velocity/debian/rules	2009-07-07 22:51:56 UTC (rev 8930)
@@ -1,26 +1,29 @@
 #!/usr/bin/make -f
 # debian/rules for velocity (uses CDBS)
 
-#export LANG=C
-
 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\-)
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := ant-nodeps junit logkit servlet-api-2.5 log4j-1.2 commons-lang commons-collections3 commons-logging werken.xpath bcel oro jdom1 antlr
+DEB_ANT_BUILD_TARGET := package javadoc
+DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
+DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION)
 
-JAVA_HOME	     := /usr/lib/kaffe
-ANT_HOME             := /usr/share/ant
+clean::
+	-rm -rf debian/tmp
 
-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_CLEAN_TARGET := clean examples-clean-all javadocs-clean test-clean
-DEB_ANT_BUILD_TARGET := jar javadocs #test
-DEB_BUILDDIR         := build
+makebuilddir/velocity::
+	install -d build/classes/org/apache/velocity
+	install -m 644 debian/antlib.xml build/classes/org/apache/velocity/antlib.xml
 
-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
+	mh_installpoms -p$(PACKAGE)
+	mh_installjar -p$(PACKAGE) -l pom.xml build/$(PACKAGE)-$(VERSION).jar
 	install -m 644 src/java/org/apache/velocity/runtime/defaults/velocity.properties debian/velocity/etc/velocity
+
+get-orig-source:
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+

Added: trunk/velocity/debian/velocity-ant.links
===================================================================
--- trunk/velocity/debian/velocity-ant.links	                        (rev 0)
+++ trunk/velocity/debian/velocity-ant.links	2009-07-07 22:51:56 UTC (rev 8930)
@@ -0,0 +1,2 @@
+usr/share/java/velocity.jar usr/share/ant/lib/velocity.jar
+

Modified: trunk/velocity/debian/velocity-doc.doc-base.1
===================================================================
--- trunk/velocity/debian/velocity-doc.doc-base.1	2009-07-07 22:39:08 UTC (rev 8929)
+++ trunk/velocity/debian/velocity-doc.doc-base.1	2009-07-07 22:51:56 UTC (rev 8930)
@@ -1,7 +1,7 @@
 Document: velocity1
 Title: Programmer API for velocity
 Author: The Apache Velocity Development Team
-Abstract: This is the javadoc api of Velocity, a Java-based template engine.
+Abstract: This is the javadoc API of Velocity, a Java-based template engine.
  It permits anyone to use the simple yet powerful template language to 
  reference objects defined in Java code.
 Section: Programming

Modified: trunk/velocity/debian/velocity-doc.docs
===================================================================
--- trunk/velocity/debian/velocity-doc.docs	2009-07-07 22:39:08 UTC (rev 8929)
+++ trunk/velocity/debian/velocity-doc.docs	2009-07-07 22:51:56 UTC (rev 8930)
@@ -1,3 +1,4 @@
+build/docs/api
 docs/anakia.html
 docs/code-standards.html
 docs/contributors.html
@@ -16,6 +17,5 @@
 docs/todo.html
 docs/user-guide.html
 docs/vtl-reference-guide.html
-docs/api
 docs/images
-docs/ymtd
+docs/ymtd
\ No newline at end of file

Modified: trunk/velocity/debian/velocity-doc.examples
===================================================================
--- trunk/velocity/debian/velocity-doc.examples	2009-07-07 22:39:08 UTC (rev 8929)
+++ trunk/velocity/debian/velocity-doc.examples	2009-07-07 22:51:56 UTC (rev 8930)
@@ -3,9 +3,5 @@
 examples/app_example2
 examples/logger_example
 examples/xmlapp_example
-examples/servlet_example1
-examples/servlet_example2
-examples/anakia
-examples/forumdemo
 examples/event_example
 examples/context_example

Deleted: trunk/velocity/debian/velocity.links
===================================================================
--- trunk/velocity/debian/velocity.links	2009-07-07 22:39:08 UTC (rev 8929)
+++ trunk/velocity/debian/velocity.links	2009-07-07 22:51:56 UTC (rev 8930)
@@ -1,6 +0,0 @@
-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/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

Added: trunk/velocity/debian/velocity.poms
===================================================================
--- trunk/velocity/debian/velocity.poms	                        (rev 0)
+++ trunk/velocity/debian/velocity.poms	2009-07-07 22:51:56 UTC (rev 8930)
@@ -0,0 +1 @@
+pom.xml --no-parent

Modified: trunk/velocity/debian/watch
===================================================================
--- trunk/velocity/debian/watch	2009-07-07 22:39:08 UTC (rev 8929)
+++ trunk/velocity/debian/watch	2009-07-07 22:51:56 UTC (rev 8930)
@@ -1,6 +1,4 @@
 version=3
-http://archive.apache.org/dist/velocity/engine/([\d.]+)/velocity-([\d.]+)\.tar\.gz
-#http://archive.apache.org/dist/velocity/engine/([\d.]+)/velocity-([\d.]+)-src\.jar
+http://svn.apache.org/repos/asf/velocity/engine/tags/ \
+  ([1-9].*)/ debian debian/orig-tar.sh
 
-# prefer archive.a.o over www.a.o, because it contains all releases including
-# the latest - better use the -src.jar?




More information about the pkg-java-commits mailing list