[velocity-tools] 05/26: [velocity-tools]

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Nov 16 15:31:11 UTC 2015 

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 a190645be35df5cb748bdd16b5420e3258908818
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Thu Jul 16 15:57:35 2009 +0000

    [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
---
 debian/README.source                               |  9 +++++++++
 debian/changelog                                   | 13 +++++++++++++
 debian/control                                     |  5 +++--
 debian/patches/00list                              |  2 --
 ..._test_lib.dpatch => 01_dont_copy_test_lib.diff} | 22 +++++++++-------------
 .../{02_junit_45.dpatch => 02_junit_45.diff}       | 17 +++++++----------
 debian/patches/series                              |  2 ++
 debian/rules                                       |  5 +----
 8 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..f846ea2
--- /dev/null
+++ b/debian/README.source
@@ -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.
+
diff --git a/debian/changelog b/debian/changelog
index 88da747..ad0dd8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index 8745b53..ee258b4 100644
--- a/debian/control
+++ b/debian/control
@@ -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
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f8b9377..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_dont_copy_test_lib
-02_junit_45
diff --git a/debian/patches/01_dont_copy_test_lib.dpatch b/debian/patches/01_dont_copy_test_lib.diff
old mode 100755
new mode 100644
similarity index 66%
rename from debian/patches/01_dont_copy_test_lib.dpatch
rename to debian/patches/01_dont_copy_test_lib.diff
index 2073a07..28cce33
--- a/debian/patches/01_dont_copy_test_lib.dpatch
+++ b/debian/patches/01_dont_copy_test_lib.diff
@@ -1,13 +1,10 @@
-#! /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
+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}" />
@@ -17,9 +14,8 @@ diff -urNad trunk~/download.xml trunk/download.xml
    </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
+--- a/examples.xml
++++ b/examples.xml
 @@ -53,13 +53,6 @@
    </target>
    <target name="simple-dependencies">
diff --git a/debian/patches/02_junit_45.dpatch b/debian/patches/02_junit_45.diff
old mode 100755
new mode 100644
similarity index 76%
rename from debian/patches/02_junit_45.dpatch
rename to debian/patches/02_junit_45.diff
index 855122f..d215c7f
--- a/debian/patches/02_junit_45.dpatch
+++ b/debian/patches/02_junit_45.diff
@@ -1,13 +1,10 @@
-#! /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
+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));
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..dae5e62
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_dont_copy_test_lib.diff
+02_junit_45.diff
diff --git a/debian/rules b/debian/rules
index a3f9414..01fefc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/velocity-tools.git

More information about the pkg-java-commits mailing list