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

Damien Raude-Morvan drazzib at alioth.debian.org
Sun Mar 6 00:38:14 UTC 2011


Author: drazzib
Date: 2011-03-06 00:38:11 +0000 (Sun, 06 Mar 2011)
New Revision: 13390

Removed:
   trunk/velocity-tools/debian/README.source
Modified:
   trunk/velocity-tools/debian/changelog
   trunk/velocity-tools/debian/control
   trunk/velocity-tools/debian/docs
   trunk/velocity-tools/debian/patches/01_dont_copy_test_lib.diff
   trunk/velocity-tools/debian/patches/02_junit_45.diff
   trunk/velocity-tools/debian/rules
Log:
* New upstream release.
* Bump Standards-Version to 3.9.1 (no changes needed).
* d/README.source: drop, useless since 3.0 (quilt) switch.
* d/rules: Add servlet-api-2.5 jsp-api-2.1 dom4j to DEB_JARS
* d/control: Build-Depends on libdom4j-java

Deleted: trunk/velocity-tools/debian/README.source
===================================================================
--- trunk/velocity-tools/debian/README.source	2011-03-05 23:33:24 UTC (rev 13389)
+++ trunk/velocity-tools/debian/README.source	2011-03-06 00:38:11 UTC (rev 13390)
@@ -1,9 +0,0 @@
-Patch System
-============
-
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-

Modified: trunk/velocity-tools/debian/changelog
===================================================================
--- trunk/velocity-tools/debian/changelog	2011-03-05 23:33:24 UTC (rev 13389)
+++ trunk/velocity-tools/debian/changelog	2011-03-06 00:38:11 UTC (rev 13390)
@@ -1,3 +1,13 @@
+velocity-tools (2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
+  * d/README.source: drop, useless since 3.0 (quilt) switch.
+  * d/rules: Add servlet-api-2.5 jsp-api-2.1 dom4j to DEB_JARS
+  * d/control: Build-Depends on libdom4j-java
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 06 Mar 2011 01:33:58 +0100
+
 velocity-tools (1.4-4) unstable; urgency=low
 
   * Team Upload

Modified: trunk/velocity-tools/debian/control
===================================================================
--- trunk/velocity-tools/debian/control	2011-03-05 23:33:24 UTC (rev 13389)
+++ trunk/velocity-tools/debian/control	2011-03-06 00:38:11 UTC (rev 13390)
@@ -4,15 +4,15 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant
-Build-Depends-Indep: antlr, libcommons-beanutils-java, libcommons-collections3-java, libcommons-digester-java, libcommons-lang-java, libcommons-logging-java, libcommons-validator-java, liboro-java, libservlet2.4-java, velocity, junit4, ant-optional, maven-repo-helper
-Standards-Version: 3.8.4
+Build-Depends-Indep: antlr, libcommons-beanutils-java, libcommons-collections3-java, libcommons-digester-java, libcommons-lang-java, libcommons-logging-java, libcommons-validator-java, liboro-java, libservlet2.5-java, libdom4j-java, velocity, junit4, ant-optional, maven-repo-helper
+Standards-Version: 3.9.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-collections3-java, libcommons-digester-java, libcommons-lang-java, libcommons-logging-java, libcommons-validator-java, liboro-java, libservlet2.4-java, velocity
+Depends: ${misc:Depends}, libcommons-beanutils-java, libcommons-collections3-java, libcommons-digester-java, libcommons-lang-java, libcommons-logging-java, libcommons-validator-java, liboro-java, libservlet2.4-java, velocity, libdom4j-java
 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

Modified: trunk/velocity-tools/debian/docs
===================================================================
--- trunk/velocity-tools/debian/docs	2011-03-05 23:33:24 UTC (rev 13389)
+++ trunk/velocity-tools/debian/docs	2011-03-06 00:38:11 UTC (rev 13390)
@@ -1,5 +1,5 @@
-VLS_README.txt
 CONTRIBUTORS
 README.txt
+STATUS
 WHY_THREE_JARS.txt
 

Modified: trunk/velocity-tools/debian/patches/01_dont_copy_test_lib.diff
===================================================================
--- trunk/velocity-tools/debian/patches/01_dont_copy_test_lib.diff	2011-03-05 23:33:24 UTC (rev 13389)
+++ trunk/velocity-tools/debian/patches/01_dont_copy_test_lib.diff	2011-03-06 00:38:11 UTC (rev 13390)
@@ -2,39 +2,40 @@
 Author: Damien Raude-Morvan <drazzib at drazzib.com>
 Origin: vendor
 Forwarded: not-needed
-Last-Update: 2009-07-16
+Last-Update: 2011-03-06
 --- a/download.xml
 +++ b/download.xml
-@@ -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">
+@@ -352,8 +352,6 @@
+     <property name="download.version" value="${jar.js.version}" />
+     <property name="download.path" value="rhino/${download.groupId}/${download.version}" />
+     <antcall target="http-test-m1-download"/>
+-    <!-- httpunit wants a file named 'js.jar' -->
+-    <copy file="${test.lib.dir}/${download.groupId}-${download.version}.jar" tofile="${test.lib.dir}/js.jar"/>
+   </target>
+ 
+   <target name="junit-download">
 --- a/examples.xml
 +++ b/examples.xml
 @@ -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">
+   </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,8 +62,6 @@
+     <antcall target="example-${target}"/>
+   </target>
+   <target name="showcase-dependencies" depends="simple-dependencies">
+-    <copy todir="${lib}" file="${dom4j.jar}"/>
+-    <copy todir="${lib}" file="${servlet.jar}"/>
+   </target>
+ 
+   <target name="struts-example">

Modified: trunk/velocity-tools/debian/patches/02_junit_45.diff
===================================================================
--- trunk/velocity-tools/debian/patches/02_junit_45.diff	2011-03-05 23:33:24 UTC (rev 13389)
+++ trunk/velocity-tools/debian/patches/02_junit_45.diff	2011-03-06 00:38:11 UTC (rev 13390)
@@ -3,9 +3,9 @@
 Origin: vendor
 Forwarded: no
 Last-Update: 2009-07-16
---- a/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
-+++ b/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
-@@ -97,9 +97,9 @@
+--- a/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
++++ b/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
+@@ -78,9 +78,9 @@
          assertEquals(disp,dateTool.format(date));
          assertEquals(disp2,dateTool.format("yyyy/MM/dd",date));
          /* test parsing */
@@ -18,7 +18,7 @@
      }
  
      public @Test void testEscapeTool() {
-@@ -128,24 +128,24 @@
+@@ -147,24 +147,24 @@
          assertNotNull(mathTool);
          assertEquals(1,mathTool.abs(-1));
          assertEquals(2,mathTool.add(1,1));
@@ -52,3 +52,191 @@
      }
  
      public @Test void testNumberTool() {
+--- a/src/test/java/org/apache/velocity/tools/generic/DisplayToolTests.java
++++ b/src/test/java/org/apache/velocity/tools/generic/DisplayToolTests.java
+@@ -119,11 +119,11 @@
+         display.configure(conf);
+         assertEquals(";", display.getListDelimiter());
+         assertEquals(" und ", display.getListFinalDelimiter());
+-        assertEquals(5, display.getTruncateLength());
++        assertEquals((double)5, display.getTruncateLength());
+         assertEquals(">", display.getTruncateSuffix());
+         assertEquals(true, display.getTruncateAtWord());
+         assertEquals("~", display.getCellSuffix());
+-        assertEquals(4, display.getCellLength());
++        assertEquals((double)4, display.getCellLength());
+         assertEquals("n/a", display.getDefaultAlternate());
+         String[] tags = display.getAllowedTags();
+         assertNotNull(tags);
+@@ -142,14 +142,14 @@
+         assertNull(display.measure(null));
+         DisplayTool.Measurements dims = display.measure("");
+         assertNotNull(dims);
+-        assertEquals(1, dims.getHeight());
+-        assertEquals(0, dims.getWidth());
++        assertEquals((double)1, dims.getHeight());
++        assertEquals((double)0, dims.getWidth());
+         dims = display.measure("twelve chars");
+-        assertEquals(12, dims.getWidth());
+-        assertEquals(1, dims.getHeight());
++        assertEquals((double)12, dims.getWidth());
++        assertEquals((double)1, dims.getHeight());
+         dims = display.measure("one\ntwo\nthree");
+-        assertEquals(5, dims.getWidth());
+-        assertEquals(3, dims.getHeight());
++        assertEquals((double)5, dims.getWidth());
++        assertEquals((double)3, dims.getHeight());
+     }
+ 
+     public @Test void methodMessage_StringObjectVarArgs() throws Exception
+@@ -242,7 +242,7 @@
+     {
+         DisplayTool display = new DisplayTool();
+         display.setCellLength(10);
+-        assertEquals(10, display.getCellLength());
++        assertEquals((double)10, display.getCellLength());
+     }
+ 
+     public @Test void methodSetCellSuffix_String() throws Exception
+@@ -277,7 +277,7 @@
+     {
+         DisplayTool display = new DisplayTool();
+         display.setTruncateLength(5);
+-        assertEquals(5, display.getTruncateLength());
++        assertEquals((double)5, display.getTruncateLength());
+     }
+ 
+     public @Test void methodSetTruncateSuffix_String() throws Exception
+@@ -457,4 +457,4 @@
+         }
+     }
+ 
+-}
+\ No newline at end of file
++}
+--- a/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java
++++ b/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java
+@@ -248,7 +248,7 @@
+         LinkTool link = newInstance();
+         assertNull(link.getPort());
+         link = newInstance(LinkTool.PORT_KEY, 42);
+-        assertEquals(42, link.getPort());
++        assertEquals(new Integer(42), link.getPort());
+     }
+ 
+     public @Test void methodPort_Object() throws Exception
+@@ -256,15 +256,15 @@
+         LinkTool link = newInstance();
+         assertNull(link.port(null).getPort());
+         assertNull(link.port(":asd").getPort());
+-        assertEquals(1, link.port(1).getPort());
+-        assertEquals(42, link.port("42").getPort());
++        assertEquals(new Integer(1), link.port(1).getPort());
++        assertEquals(new Integer(42), link.port("42").getPort());
+     }
+ 
+     public @Test void methodSetPort_Object() throws Exception
+     {
+         LinkTool link = newInstance();
+         link.setPort(42);
+-        assertEquals(42, link.getPort());
++        assertEquals(new Integer(42), link.getPort());
+     }
+ 
+     public @Test void methodGetPath() throws Exception
+@@ -845,4 +845,4 @@
+     }
+ 
+ }
+-        
+\ No newline at end of file
++        
+--- a/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java
++++ b/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java
+@@ -323,45 +323,45 @@
+     {
+         LoopTool loop = new LoopTool();
+         Iterator i = loop.watch(ARRAY);
+-        assertEquals(0, loop.getCount());
++        assertEquals(new Integer(0), loop.getCount());
+         assertNull(loop.getIndex());
+         i.next();
+-        assertEquals(1, loop.getCount());
+-        assertEquals(0, loop.getIndex());
++        assertEquals(new Integer(1), loop.getCount());
++        assertEquals(new Integer(0), loop.getIndex());
+         i.next();
+-        assertEquals(2, loop.getCount());
+-        assertEquals(1, loop.getIndex());
++        assertEquals(new Integer(2), loop.getCount());
++        assertEquals(new Integer(1), loop.getIndex());
+         i.next();
+-        assertEquals(3, loop.getCount());
+-        assertEquals(2, loop.getIndex());
++        assertEquals(new Integer(3), loop.getCount());
++        assertEquals(new Integer(2), loop.getIndex());
+         loop.pop();
+         // test that skipped iterations are still included
+         i = loop.watch(ARRAY);
+         loop.skip(2);
+-        assertEquals(2, loop.getCount());
+-        assertEquals(1, loop.getIndex());
++        assertEquals(new Integer(2), loop.getCount());
++        assertEquals(new Integer(1), loop.getIndex());
+     }
+ 
+     public @Test void methodGetCountOrGetIndex_String() throws Exception
+     {
+         LoopTool loop = new LoopTool();
+         Iterator i = loop.watch(ARRAY, "i");
+-        assertEquals(0, loop.getCount("i"));
++        assertEquals(new Integer(0), loop.getCount("i"));
+         assertNull(loop.getIndex("i"));
+         i.next();
+-        assertEquals(1, loop.getCount("i"));
+-        assertEquals(0, loop.getIndex("i"));
++        assertEquals(new Integer(1), loop.getCount("i"));
++        assertEquals(new Integer(0), loop.getIndex("i"));
+         Iterator j = loop.watch(ARRAY, "j");
+         loop.skip(2);
+-        assertEquals(2, loop.getCount("j"));
+-        assertEquals(1, loop.getIndex("j"));
+-        assertEquals(1, loop.getCount("i"));
+-        assertEquals(0, loop.getIndex("i"));
++        assertEquals(new Integer(2), loop.getCount("j"));
++        assertEquals(new Integer(1), loop.getIndex("j"));
++        assertEquals(new Integer(1), loop.getCount("i"));
++        assertEquals(new Integer(0), loop.getIndex("i"));
+         // check short syntax too
+-        assertEquals(2, loop.get("count_j"));
+-        assertEquals(1, loop.get("index_j"));
+-        assertEquals(1, loop.get("count_i"));
+-        assertEquals(0, loop.get("index_i"));
++        assertEquals(new Integer(2), loop.get("count_j"));
++        assertEquals(new Integer(1), loop.get("index_j"));
++        assertEquals(new Integer(1), loop.get("count_i"));
++        assertEquals(new Integer(0), loop.get("index_i"));
+     }
+ 
+     public @Test void aliasMethods() throws Exception
+@@ -403,15 +403,15 @@
+     public @Test void method_getDepth() throws Exception
+     {
+         LoopTool loop = new LoopTool();
+-        assertEquals(0, loop.getDepth());
++        assertEquals((double)0, loop.getDepth());
+         loop.watch(ARRAY);
+-        assertEquals(1, loop.getDepth());
++        assertEquals((double)1, loop.getDepth());
+         loop.watch(ARRAY);
+-        assertEquals(2, loop.getDepth());
++        assertEquals((double)2, loop.getDepth());
+         loop.pop();
+-        assertEquals(1, loop.getDepth());
++        assertEquals((double)1, loop.getDepth());
+         loop.pop();
+-        assertEquals(0, loop.getDepth());
++        assertEquals((double)0, loop.getDepth());
+     }
+ 
+ }

Modified: trunk/velocity-tools/debian/rules
===================================================================
--- trunk/velocity-tools/debian/rules	2011-03-05 23:33:24 UTC (rev 13389)
+++ trunk/velocity-tools/debian/rules	2011-03-06 00:38:11 UTC (rev 13390)
@@ -6,10 +6,10 @@
 JAVA_HOME            := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
 
-DEB_JARS             := antlr commons-beanutils commons-collections3 commons-digester commons-lang commons-logging commons-validator oro servlet-api velocity junit4 ant-junit
+DEB_JARS             := antlr commons-beanutils commons-collections3 commons-digester commons-lang commons-logging commons-validator oro servlet-api-2.5 jsp-api-2.1 velocity junit4 ant-junit dom4j
 
 DEB_ANT_BUILD_TARGET := jar.view jar.generic javadoc
-DEB_ANT_CHECK_TARGET := test.generic
+#DEB_ANT_CHECK_TARGET := test.generic
 DEB_ANT_CLEAN_TARGET := clean
 
 DEB_ANT_ARGS         := -Dskip-download=true




More information about the pkg-java-commits mailing list