[pkg-java] r9364 - in trunk/velocity-tools/debian: . patches
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Thu Jul 16 15:57:35 UTC 2009
Author: drazzib-guest
Date: 2009-07-16 15:57:35 +0000 (Thu, 16 Jul 2009)
New Revision: 9364
Added:
trunk/velocity-tools/debian/README.source
trunk/velocity-tools/debian/patches/01_dont_copy_test_lib.diff
trunk/velocity-tools/debian/patches/02_junit_45.diff
trunk/velocity-tools/debian/patches/series
Removed:
trunk/velocity-tools/debian/patches/00list
trunk/velocity-tools/debian/patches/01_dont_copy_test_lib.dpatch
trunk/velocity-tools/debian/patches/02_junit_45.dpatch
Modified:
trunk/velocity-tools/debian/changelog
trunk/velocity-tools/debian/control
trunk/velocity-tools/debian/rules
Log:
[velocity-tools]
* Set Maintainer field to Debian Java Team
* Add myself as Uploaders
* Switch to Quilt patch system:
- Refresh all patchs
- Remove B-D on dpatch, Add B-D on quilt
- Include patchsys-quilt.mk in debian/rules
* Bump Standards-Version to 3.8.2:
- Add a README.source to describe patch system
Added: trunk/velocity-tools/debian/README.source
===================================================================
--- trunk/velocity-tools/debian/README.source (rev 0)
+++ trunk/velocity-tools/debian/README.source 2009-07-16 15:57:35 UTC (rev 9364)
@@ -0,0 +1,9 @@
+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 2009-07-16 15:50:10 UTC (rev 9363)
+++ trunk/velocity-tools/debian/changelog 2009-07-16 15:57:35 UTC (rev 9364)
@@ -1,3 +1,16 @@
+velocity-tools (1.4-3) UNRELEASED; urgency=low
+
+ * Set Maintainer field to Debian Java Team
+ * Add myself as Uploaders
+ * Switch to Quilt patch system:
+ - Refresh all patchs
+ - Remove B-D on dpatch, Add B-D on quilt
+ - Include patchsys-quilt.mk in debian/rules
+ * Bump Standards-Version to 3.8.2:
+ - Add a README.source to describe patch system
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Thu, 16 Jul 2009 17:56:56 +0200
+
velocity-tools (1.4-2) unstable; urgency=low
* debian/patches/02_junit_45.dpatch: compatibility patch
Modified: trunk/velocity-tools/debian/control
===================================================================
--- trunk/velocity-tools/debian/control 2009-07-16 15:50:10 UTC (rev 9363)
+++ trunk/velocity-tools/debian/control 2009-07-16 15:57:35 UTC (rev 9364)
@@ -1,8 +1,9 @@
Source: velocity-tools
Section: java
Priority: optional
-Maintainer: Damien Raude-Morvan <drazzib at drazzib.com>
-Build-Depends: cdbs, dpatch, debhelper (>= 5), default-jdk-builddep, ant
+Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at drazzib.com>
+Build-Depends: cdbs, quilt, 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.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/velocity-tools
Deleted: trunk/velocity-tools/debian/patches/00list
===================================================================
--- trunk/velocity-tools/debian/patches/00list 2009-07-16 15:50:10 UTC (rev 9363)
+++ trunk/velocity-tools/debian/patches/00list 2009-07-16 15:57:35 UTC (rev 9364)
@@ -1,2 +0,0 @@
-01_dont_copy_test_lib
-02_junit_45
Added: trunk/velocity-tools/debian/patches/01_dont_copy_test_lib.diff
===================================================================
--- trunk/velocity-tools/debian/patches/01_dont_copy_test_lib.diff (rev 0)
+++ trunk/velocity-tools/debian/patches/01_dont_copy_test_lib.diff 2009-07-16 15:57:35 UTC (rev 9364)
@@ -0,0 +1,40 @@
+Description: Don't try to copy some JAR files into "lib" directory.
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2009-07-16
+--- 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">
+--- 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">
Deleted: trunk/velocity-tools/debian/patches/01_dont_copy_test_lib.dpatch
===================================================================
--- trunk/velocity-tools/debian/patches/01_dont_copy_test_lib.dpatch 2009-07-16 15:50:10 UTC (rev 9363)
+++ trunk/velocity-tools/debian/patches/01_dont_copy_test_lib.dpatch 2009-07-16 15:57:35 UTC (rev 9364)
@@ -1,44 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_dont_copy_test_lib.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't try to copy some JAR files into "lib" directory.
-
- at 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">
Added: trunk/velocity-tools/debian/patches/02_junit_45.diff
===================================================================
--- trunk/velocity-tools/debian/patches/02_junit_45.diff (rev 0)
+++ trunk/velocity-tools/debian/patches/02_junit_45.diff 2009-07-16 15:57:35 UTC (rev 9364)
@@ -0,0 +1,54 @@
+Description: compatibility patch for JUnit 4.5
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+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 @@
+ assertEquals(disp,dateTool.format(date));
+ assertEquals(disp2,dateTool.format("yyyy/MM/dd",date));
+ /* test parsing */
+- assertEquals(2007,dateTool.getYear(disp));
+- assertEquals(0,dateTool.getMonth(disp));
+- assertEquals(2,dateTool.getDay(disp));
++ assertEquals(new Integer(2007), dateTool.getYear(disp));
++ assertEquals(new Integer(0), dateTool.getMonth(disp));
++ assertEquals(new Integer(2), dateTool.getDay(disp));
+ }
+
+ public @Test void testEscapeTool() {
+@@ -128,24 +128,24 @@
+ assertNotNull(mathTool);
+ assertEquals(1,mathTool.abs(-1));
+ assertEquals(2,mathTool.add(1,1));
+- assertEquals(3,mathTool.ceil(2.5));
++ assertEquals(new Integer(3),mathTool.ceil(2.5));
+ assertEquals(4,mathTool.div(8,2));
+- assertEquals(5,mathTool.floor(5.1));
++ assertEquals(new Integer(5),mathTool.floor(5.1));
+ assertEquals(6,mathTool.getAverage(new long[] {5,6,7}));
+ /* getTotal() watches the type of its first argument, so assertEquals needs a long */
+ assertEquals((long)7,mathTool.getTotal(new long[] {2,2,3}));
+- assertEquals(8,mathTool.idiv(130,16));
++ assertEquals(new Integer(8),mathTool.idiv(130,16));
+ assertEquals(9,mathTool.max(9,-10));
+ assertEquals(10,mathTool.min(10,20));
+- assertEquals(11,mathTool.mod(37,13));
++ assertEquals(new Integer(11),mathTool.mod(37,13));
+ assertEquals(12,mathTool.mul(3,4));
+- assertEquals(13,mathTool.round(12.8));
+- assertEquals(14.2,mathTool.roundTo(1,14.18));
+- assertEquals(-5.0,mathTool.roundTo(2,-4.999));
++ assertEquals(new Integer(13),mathTool.round(12.8));
++ assertEquals(new Double(14.2),mathTool.roundTo(1,14.18));
++ assertEquals(new Double(-5.0),mathTool.roundTo(2,-4.999));
+ assertEquals(15,mathTool.sub(30,15));
+ assertEquals(16,mathTool.pow(4,2));
+- assertEquals(17,mathTool.toInteger("17"));
+- assertEquals(18.1,mathTool.toDouble("18.1"));
++ assertEquals(new Integer(17),mathTool.toInteger("17"));
++ assertEquals(new Double(18.1),mathTool.toDouble("18.1"));
+ }
+
+ public @Test void testNumberTool() {
Deleted: trunk/velocity-tools/debian/patches/02_junit_45.dpatch
===================================================================
--- trunk/velocity-tools/debian/patches/02_junit_45.dpatch 2009-07-16 15:50:10 UTC (rev 9363)
+++ trunk/velocity-tools/debian/patches/02_junit_45.dpatch 2009-07-16 15:57:35 UTC (rev 9364)
@@ -1,57 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_junit_45.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: compatibility patch for JUnit 4.5
-
- at DPATCH@
-diff -urNad velocity-tools-1.4~/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java velocity-tools-1.4/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
---- velocity-tools-1.4~/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java 2007-10-30 20:59:17.000000000 +0100
-+++ velocity-tools-1.4/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java 2009-03-26 00:56:39.160193833 +0100
-@@ -97,9 +97,9 @@
- assertEquals(disp,dateTool.format(date));
- assertEquals(disp2,dateTool.format("yyyy/MM/dd",date));
- /* test parsing */
-- assertEquals(2007,dateTool.getYear(disp));
-- assertEquals(0,dateTool.getMonth(disp));
-- assertEquals(2,dateTool.getDay(disp));
-+ assertEquals(new Integer(2007), dateTool.getYear(disp));
-+ assertEquals(new Integer(0), dateTool.getMonth(disp));
-+ assertEquals(new Integer(2), dateTool.getDay(disp));
- }
-
- public @Test void testEscapeTool() {
-@@ -128,24 +128,24 @@
- assertNotNull(mathTool);
- assertEquals(1,mathTool.abs(-1));
- assertEquals(2,mathTool.add(1,1));
-- assertEquals(3,mathTool.ceil(2.5));
-+ assertEquals(new Integer(3),mathTool.ceil(2.5));
- assertEquals(4,mathTool.div(8,2));
-- assertEquals(5,mathTool.floor(5.1));
-+ assertEquals(new Integer(5),mathTool.floor(5.1));
- assertEquals(6,mathTool.getAverage(new long[] {5,6,7}));
- /* getTotal() watches the type of its first argument, so assertEquals needs a long */
- assertEquals((long)7,mathTool.getTotal(new long[] {2,2,3}));
-- assertEquals(8,mathTool.idiv(130,16));
-+ assertEquals(new Integer(8),mathTool.idiv(130,16));
- assertEquals(9,mathTool.max(9,-10));
- assertEquals(10,mathTool.min(10,20));
-- assertEquals(11,mathTool.mod(37,13));
-+ assertEquals(new Integer(11),mathTool.mod(37,13));
- assertEquals(12,mathTool.mul(3,4));
-- assertEquals(13,mathTool.round(12.8));
-- assertEquals(14.2,mathTool.roundTo(1,14.18));
-- assertEquals(-5.0,mathTool.roundTo(2,-4.999));
-+ assertEquals(new Integer(13),mathTool.round(12.8));
-+ assertEquals(new Double(14.2),mathTool.roundTo(1,14.18));
-+ assertEquals(new Double(-5.0),mathTool.roundTo(2,-4.999));
- assertEquals(15,mathTool.sub(30,15));
- assertEquals(16,mathTool.pow(4,2));
-- assertEquals(17,mathTool.toInteger("17"));
-- assertEquals(18.1,mathTool.toDouble("18.1"));
-+ assertEquals(new Integer(17),mathTool.toInteger("17"));
-+ assertEquals(new Double(18.1),mathTool.toDouble("18.1"));
- }
-
- public @Test void testNumberTool() {
Added: trunk/velocity-tools/debian/patches/series
===================================================================
--- trunk/velocity-tools/debian/patches/series (rev 0)
+++ trunk/velocity-tools/debian/patches/series 2009-07-16 15:57:35 UTC (rev 9364)
@@ -0,0 +1,2 @@
+01_dont_copy_test_lib.diff
+02_junit_45.diff
Modified: trunk/velocity-tools/debian/rules
===================================================================
--- trunk/velocity-tools/debian/rules 2009-07-16 15:50:10 UTC (rev 9363)
+++ trunk/velocity-tools/debian/rules 2009-07-16 15:57:35 UTC (rev 9364)
@@ -1,10 +1,7 @@
#!/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/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME := /usr/lib/jvm/default-java
More information about the pkg-java-commits
mailing list