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

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-08 17:27:05 +0000 (Wed, 08 Jul 2009)
New Revision: 8949

Removed:
   trunk/velocity/debian/velocity.links
Modified:
   trunk/velocity/debian/README.Debian
   trunk/velocity/debian/changelog
   trunk/velocity/debian/control
   trunk/velocity/debian/patches/build.patch
   trunk/velocity/debian/rules
Log:
* Small fixes, take comments from Onkar Shinde into account

Modified: trunk/velocity/debian/README.Debian
===================================================================
--- trunk/velocity/debian/README.Debian	2009-07-08 00:06:00 UTC (rev 8948)
+++ trunk/velocity/debian/README.Debian	2009-07-08 17:27:05 UTC (rev 8949)
@@ -22,6 +22,8 @@
 
 <project name="myproject" xmlns:velocity="antlib:org.apache.velocity">
 
+  <taskdef uri="antlib:org.apache.velocity" classpath="/usr/share/java/velocity.jar" />
+
   <!-- example use of the anakia task -->
   <velocity:anakia basedir="xdocs/docs" destdir="build/docs"
          extension=".html" style="site.vsl"

Modified: trunk/velocity/debian/changelog
===================================================================
--- trunk/velocity/debian/changelog	2009-07-08 00:06:00 UTC (rev 8948)
+++ trunk/velocity/debian/changelog	2009-07-08 17:27:05 UTC (rev 8949)
@@ -15,12 +15,13 @@
   * 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)
+  * Move liblogkit-java, liblog4j1.2-java, libservlet2.5-java,
+    libwerken.xpath-java from Depends to Recommends
+  * Move ant from Depends to Suggest (Closes: #532640)
   * Create a antlib definition for the tasks anakia and texen, and add 
     the classpath information to the manifest in velocity.jar . This 
     removes the need to install jar links under /usr/share/ant/lib, which 
-    have been removed except for the link to velocity.jar. (Closes: #506018)
+    have been removed. (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,

Modified: trunk/velocity/debian/control
===================================================================
--- trunk/velocity/debian/control	2009-07-08 00:06:00 UTC (rev 8948)
+++ trunk/velocity/debian/control	2009-07-08 17:27:05 UTC (rev 8949)
@@ -16,11 +16,11 @@
 
 Package: velocity
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless, 
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, 
  libcommons-lang-java, libcommons-collections3-java, liboro-java
-Recommends: ant, libcommons-logging-java, liblogkit-java, liblog4j1.2-java, 
+Recommends: libcommons-logging-java, liblogkit-java, liblog4j1.2-java, 
  libservlet2.5-java, libjdom1-java, libwerken.xpath-java, libxerces2-java
-Suggests: velocity-doc
+Suggests: velocity-doc, ant
 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

Modified: trunk/velocity/debian/patches/build.patch
===================================================================
--- trunk/velocity/debian/patches/build.patch	2009-07-08 00:06:00 UTC (rev 8948)
+++ trunk/velocity/debian/patches/build.patch	2009-07-08 17:27:05 UTC (rev 8949)
@@ -1,6 +1,6 @@
 --- a/build/build.xml
 +++ b/build/build.xml
-@@ -139,7 +139,6 @@
+@@ -139,12 +139,18 @@
    <!-- sets up the build environment (classpath and libs)                  -->
    <!-- =================================================================== -->
    <target name="build-prepare">
@@ -8,7 +8,21 @@
  
      <!-- Build classpath -->
      <path id="velocity.build.classpath">
-@@ -918,7 +917,7 @@
+-      <fileset dir="${build.lib}">
+-        <include name="**/*.jar"/>
++      <fileset dir="/usr/share/java">
++        <include name="logkit.jar"/>
++        <include name="commons-collections3.jar"/>
++        <include name="commons-lang.jar"/>
++        <include name="commons-logging.jar"/>
++        <include name="jdom1.jar"/>
++        <include name="log4j-1.2.jar"/>
++        <include name="oro.jar"/>
++        <include name="werken.xpath.jar"/>
+       </fileset>
+     </path>
+ 
+@@ -918,7 +924,7 @@
    <!-- Make HTML version of Velocity documentation                         -->
    <!-- =================================================================== -->
  

Modified: trunk/velocity/debian/rules
===================================================================
--- trunk/velocity/debian/rules	2009-07-08 00:06:00 UTC (rev 8948)
+++ trunk/velocity/debian/rules	2009-07-08 17:27:05 UTC (rev 8949)
@@ -17,19 +17,11 @@
 	-rm -rf debian/tmp
 
 makebuilddir/velocity::
+	# install the resources in a separate directory (src/resources) to please the Maven-like build
 	install -d src/resources/org/apache/velocity/runtime/defaults
 	install -m 644 src/java/org/apache/velocity/runtime/defaults/directive.properties src/resources/org/apache/velocity/runtime/defaults/directive.properties
 	install -m 644 src/java/org/apache/velocity/runtime/defaults/velocity.properties src/resources/org/apache/velocity/runtime/defaults/velocity.properties
 	install -m 644 debian/antlib.xml src/resources/org/apache/velocity/antlib.xml
-	install -d target/lib
-	install -m 644 /usr/share/java/logkit.jar target/lib/
-	install -m 644 /usr/share/java/commons-collections3.jar target/lib/
-	install -m 644 /usr/share/java/commons-lang.jar target/lib/
-	install -m 644 /usr/share/java/commons-logging.jar target/lib/
-	install -m 644 /usr/share/java/jdom1.jar target/lib/
-	install -m 644 /usr/share/java/log4j-1.2.jar target/lib/
-	install -m 644 /usr/share/java/oro.jar target/lib/
-	install -m 644 /usr/share/java/werken.xpath.jar target/lib/
 
 build/velocity-doc::
 	cd $(DEB_BUILDDIR) && $(JAVACMD) -classpath $(DEB_CLASSPATH) \

Deleted: trunk/velocity/debian/velocity.links
===================================================================
--- trunk/velocity/debian/velocity.links	2009-07-08 00:06:00 UTC (rev 8948)
+++ trunk/velocity/debian/velocity.links	2009-07-08 17:27:05 UTC (rev 8949)
@@ -1,2 +0,0 @@
-usr/share/java/velocity.jar usr/share/ant/lib/velocity.jar
-