[tiles] 04/35: [tiles]

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Apr 1 22:31:31 UTC 2016 

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tiles.

commit 0efa6bcaf0118c34a08b67bab438f18377bcc09b
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Thu Jul 16 15:40:15 2009 +0000

    [tiles]
    
      * Set Maintainer field to Debian Java Team
      * Add myself as Uploaders
      * Switch to Quilt patch system:
        - Refresh all patches
        - Remove B-D on dpatch, Add B-D on quilt
        - Include patchsys-quilt.mk in debian/rules
      * Bump Standards-Version to 3.8.2:
        - Describe patch system in README.source
---
 debian/README.source                               | 14 ++++++-
 debian/changelog                                   | 13 +++++++
 debian/control                                     | 11 +++---
 debian/patches/00list                              |  4 --
 ...source.dpatch => 01_build_force_15_source.diff} | 29 ++++++--------
 ...ository.dpatch => 02_remove_m2_repository.diff} | 41 +++++++++-----------
 debian/patches/03_dont_fork_junit.diff             | 39 +++++++++++++++++++
 debian/patches/03_dont_fork_junit.dpatch           | 44 ----------------------
 ...d_portlet.dpatch => 04_dont_build_portlet.diff} | 17 ++++-----
 debian/patches/series                              |  4 ++
 debian/rules                                       |  2 +-
 11 files changed, 112 insertions(+), 106 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 243eece..03a130b 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,15 @@
-Build system of Tiles Debian package
-------------------------------------
+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.
+
+
+Build system
+============
 
 Upstream use Maven2 <http://maven.apache.org/> has their build system.
 It's not possible to use Maven2 as a Debian package build system (it download
diff --git a/debian/changelog b/debian/changelog
index 915850e..38d49d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tiles (2.0.6-2) UNRELEASED; urgency=low
+
+  * Set Maintainer field to Debian Java Team
+  * Add myself as Uploaders
+  * Switch to Quilt patch system:
+    - Refresh all patches
+    - Remove B-D on dpatch, Add B-D on quilt
+    - Include patchsys-quilt.mk in debian/rules
+  * Bump Standards-Version to 3.8.2:
+    - Describe patch system in README.source
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Thu, 16 Jul 2009 17:36:05 +0200
+
 tiles (2.0.6-1) unstable; urgency=low
 
   * Initial release. (Closes: #497437)
diff --git a/debian/control b/debian/control
index dad04af..1a99b36 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,13 @@
 Source: tiles
 Section: java
 Priority: optional
-Maintainer: Damien Raude-Morvan <drazzib at drazzib.com>
-Build-Depends: cdbs, dpatch, debhelper (>= 5), openjdk-6-jdk, 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), openjdk-6-jdk, ant
 Build-Depends-Indep: libcommons-logging-java, libcommons-digester-java, libcommons-beanutils-java, libservlet2.4-java
-Standards-Version: 3.8.1
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tiles
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tiles
+Standards-Version: 3.8.2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tiles/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tiles/
 Homepage: http://tiles.apache.org/
 
 Package: libtiles-java
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f1bb392..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_build_force_15_source
-02_remove_m2_repository
-03_dont_fork_junit
-04_dont_build_portlet
diff --git a/debian/patches/01_build_force_15_source.dpatch b/debian/patches/01_build_force_15_source.diff
old mode 100755
new mode 100644
similarity index 65%
rename from debian/patches/01_build_force_15_source.dpatch
rename to debian/patches/01_build_force_15_source.diff
index 9cee8ec..a1849a7
--- a/debian/patches/01_build_force_15_source.dpatch
+++ b/debian/patches/01_build_force_15_source.diff
@@ -1,14 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_force_java_15.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: build.xml (api|core|jsp): force compile and test-compile to use
-## DP: 1.5 class format for source and target
-
- at DPATCH@
-diff -urNad tiles-2.0.6~/src/tiles-api/maven-build.xml tiles-2.0.6/src/tiles-api/maven-build.xml
---- tiles-2.0.6~/src/tiles-api/maven-build.xml	2008-08-31 23:43:00.000000000 +0200
-+++ tiles-2.0.6/src/tiles-api/maven-build.xml	2008-08-31 23:44:08.000000000 +0200
+Description: build.xml (api|core|jsp): force compile and test-compile to use
+ 1.5 class format for source and target
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2009-07-16
+--- a/src/tiles-api/maven-build.xml
++++ b/src/tiles-api/maven-build.xml
 @@ -77,10 +77,10 @@
             debug="true" 
             optimize="false" 
@@ -35,9 +32,8 @@ diff -urNad tiles-2.0.6~/src/tiles-api/maven-build.xml tiles-2.0.6/src/tiles-api
        <src>
          <pathelement location="${maven.build.testDir.0}"/>
        </src>
-diff -urNad tiles-2.0.6~/src/tiles-core/maven-build.xml tiles-2.0.6/src/tiles-core/maven-build.xml
---- tiles-2.0.6~/src/tiles-core/maven-build.xml	2008-08-31 23:43:00.000000000 +0200
-+++ tiles-2.0.6/src/tiles-core/maven-build.xml	2008-08-31 23:44:23.000000000 +0200
+--- a/src/tiles-core/maven-build.xml
++++ b/src/tiles-core/maven-build.xml
 @@ -87,10 +87,10 @@
             debug="true" 
             optimize="false" 
@@ -64,9 +60,8 @@ diff -urNad tiles-2.0.6~/src/tiles-core/maven-build.xml tiles-2.0.6/src/tiles-co
        <src>
          <pathelement location="${maven.build.testDir.0}"/>
        </src>
-diff -urNad tiles-2.0.6~/src/tiles-jsp/maven-build.xml tiles-2.0.6/src/tiles-jsp/maven-build.xml
---- tiles-2.0.6~/src/tiles-jsp/maven-build.xml	2008-08-31 23:43:00.000000000 +0200
-+++ tiles-2.0.6/src/tiles-jsp/maven-build.xml	2008-08-31 23:43:55.000000000 +0200
+--- a/src/tiles-jsp/maven-build.xml
++++ b/src/tiles-jsp/maven-build.xml
 @@ -89,10 +89,10 @@
             debug="true" 
             optimize="false" 
diff --git a/debian/patches/02_remove_m2_repository.dpatch b/debian/patches/02_remove_m2_repository.diff
old mode 100755
new mode 100644
similarity index 79%
rename from debian/patches/02_remove_m2_repository.dpatch
rename to debian/patches/02_remove_m2_repository.diff
index e30e202..bdf9a5a
--- a/debian/patches/02_remove_m2_repository.dpatch
+++ b/debian/patches/02_remove_m2_repository.diff
@@ -1,17 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_remove_m2_repository.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: build.xml (api|core|jsp): remove usage of maven.repo.local
-## DP: and use debian/rules defined classpath (DEB_JARS)
-
- at DPATCH@
-diff -urNad tiles-2.0.6~/src/tiles-api/maven-build.xml tiles-2.0.6/src/tiles-api/maven-build.xml
---- tiles-2.0.6~/src/tiles-api/maven-build.xml	2008-08-31 23:29:06.000000000 +0200
-+++ tiles-2.0.6/src/tiles-api/maven-build.xml	2008-08-31 23:29:06.000000000 +0200
+Description: build.xml (api|core|jsp): remove usage of maven.repo.local
+ and use debian/rules defined classpath (DEB_JARS)
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2009-07-16
+--- a/src/tiles-api/maven-build.xml
++++ b/src/tiles-api/maven-build.xml
 @@ -45,17 +45,8 @@
    <!-- ====================================================================== -->
-
+ 
    <path id="build.classpath">
 -    <fileset dir="${maven.repo.local}">
 -      <include name="commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
@@ -25,14 +22,13 @@ diff -urNad tiles-2.0.6~/src/tiles-api/maven-build.xml tiles-2.0.6/src/tiles-api
 -      <include name="org/easymock/easymock/2.2/easymock-2.2.jar"/>
 -    </fileset>
    </path>
-
+ 
    <!-- ====================================================================== -->
-diff -urNad tiles-2.0.6~/src/tiles-core/maven-build.xml tiles-2.0.6/src/tiles-core/maven-build.xml
---- tiles-2.0.6~/src/tiles-core/maven-build.xml	2008-08-31 23:29:06.000000000 +0200
-+++ tiles-2.0.6/src/tiles-core/maven-build.xml	2008-08-31 23:29:33.000000000 +0200
+--- a/src/tiles-core/maven-build.xml
++++ b/src/tiles-core/maven-build.xml
 @@ -45,26 +45,13 @@
    <!-- ====================================================================== -->
-
+ 
    <path id="build.classpath">
 -    <fileset dir="${maven.repo.local}">
 -      <include name="org/apache/tiles/tiles-api/2.0.6/tiles-api-2.0.6.jar"/>
@@ -60,13 +56,12 @@ diff -urNad tiles-2.0.6~/src/tiles-core/maven-build.xml tiles-2.0.6/src/tiles-co
 +      <include name="src/tiles-api/target/tiles-api*.jar"/>
      </fileset>
    </path>
-
-diff -urNad tiles-2.0.6~/src/tiles-jsp/maven-build.xml tiles-2.0.6/src/tiles-jsp/maven-build.xml
---- tiles-2.0.6~/src/tiles-jsp/maven-build.xml	2008-08-31 23:29:06.000000000 +0200
-+++ tiles-2.0.6/src/tiles-jsp/maven-build.xml	2008-08-31 23:30:08.000000000 +0200
+ 
+--- a/src/tiles-jsp/maven-build.xml
++++ b/src/tiles-jsp/maven-build.xml
 @@ -45,28 +45,15 @@
    <!-- ====================================================================== -->
-
+ 
    <path id="build.classpath">
 -    <fileset dir="${maven.repo.local}">
 -      <include name="org/apache/tiles/tiles-core/2.0.6/tiles-core-2.0.6.jar"/>
@@ -98,4 +93,4 @@ diff -urNad tiles-2.0.6~/src/tiles-jsp/maven-build.xml tiles-2.0.6/src/tiles-jsp
 +      <include name="src/tiles-core/target/tiles-core*.jar"/>
      </fileset>
    </path>
-
+ 
diff --git a/debian/patches/03_dont_fork_junit.diff b/debian/patches/03_dont_fork_junit.diff
new file mode 100644
index 0000000..bf8238b
--- /dev/null
+++ b/debian/patches/03_dont_fork_junit.diff
@@ -0,0 +1,39 @@
+Description: build.xml (api|core|jsp): don't fork JUnit to preserve debian/rules
+ defined classpath
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2009-07-16
+--- a/src/tiles-api/maven-build.xml
++++ b/src/tiles-api/maven-build.xml
+@@ -135,7 +135,7 @@
+           unless="junit.skipped" 
+           description="Run the test cases">
+     <mkdir dir="${maven.test.reports}"/>
+-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
++    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="false" dir=".">
+       <sysproperty key="basedir" value="."/>
+       <formatter type="xml"/>
+       <formatter type="plain" usefile="false"/>
+--- a/src/tiles-core/maven-build.xml
++++ b/src/tiles-core/maven-build.xml
+@@ -141,7 +141,7 @@
+           unless="junit.skipped" 
+           description="Run the test cases">
+     <mkdir dir="${maven.test.reports}"/>
+-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
++    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="false" dir=".">
+       <sysproperty key="basedir" value="."/>
+       <formatter type="xml"/>
+       <formatter type="plain" usefile="false"/>
+--- a/src/tiles-jsp/maven-build.xml
++++ b/src/tiles-jsp/maven-build.xml
+@@ -143,7 +143,7 @@
+           unless="junit.skipped" 
+           description="Run the test cases">
+     <mkdir dir="${maven.test.reports}"/>
+-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
++    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="false" dir=".">
+       <sysproperty key="basedir" value="."/>
+       <formatter type="xml"/>
+       <formatter type="plain" usefile="false"/>
diff --git a/debian/patches/03_dont_fork_junit.dpatch b/debian/patches/03_dont_fork_junit.dpatch
deleted file mode 100755
index f82ae05..0000000
--- a/debian/patches/03_dont_fork_junit.dpatch
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_dont_fork_junit.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: build.xml (api|core|jsp): don't fork JUnit to preserve debian/rules
-## DP: defined classpath
-
- at DPATCH@
-diff -urNad tiles-2.0.6~/src/tiles-api/maven-build.xml tiles-2.0.6/src/tiles-api/maven-build.xml
---- tiles-2.0.6~/src/tiles-api/maven-build.xml	2008-08-31 22:50:45.000000000 +0200
-+++ tiles-2.0.6/src/tiles-api/maven-build.xml	2008-08-31 22:51:11.000000000 +0200
-@@ -128,7 +128,7 @@
-           unless="junit.skipped"
-           description="Run the test cases">
-     <mkdir dir="${maven.test.reports}"/>
--    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="false" dir=".">
-       <sysproperty key="basedir" value="."/>
-       <formatter type="xml"/>
-       <formatter type="plain" usefile="false"/>
-diff -urNad tiles-2.0.6~/src/tiles-core/maven-build.xml tiles-2.0.6/src/tiles-core/maven-build.xml
---- tiles-2.0.6~/src/tiles-core/maven-build.xml	2008-08-31 22:50:45.000000000 +0200
-+++ tiles-2.0.6/src/tiles-core/maven-build.xml	2008-08-31 22:51:24.000000000 +0200
-@@ -128,7 +128,7 @@
-           unless="junit.skipped"
-           description="Run the test cases">
-     <mkdir dir="${maven.test.reports}"/>
--    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="false" dir=".">
-       <sysproperty key="basedir" value="."/>
-       <formatter type="xml"/>
-       <formatter type="plain" usefile="false"/>
-diff -urNad tiles-2.0.6~/src/tiles-jsp/maven-build.xml tiles-2.0.6/src/tiles-jsp/maven-build.xml
---- tiles-2.0.6~/src/tiles-jsp/maven-build.xml	2008-08-31 22:50:45.000000000 +0200
-+++ tiles-2.0.6/src/tiles-jsp/maven-build.xml	2008-08-31 22:51:39.000000000 +0200
-@@ -128,7 +128,7 @@
-           unless="junit.skipped"
-           description="Run the test cases">
-     <mkdir dir="${maven.test.reports}"/>
--    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="false" dir=".">
-       <sysproperty key="basedir" value="."/>
-       <formatter type="xml"/>
-       <formatter type="plain" usefile="false"/>
diff --git a/debian/patches/04_dont_build_portlet.dpatch b/debian/patches/04_dont_build_portlet.diff
old mode 100755
new mode 100644
similarity index 56%
rename from debian/patches/04_dont_build_portlet.dpatch
rename to debian/patches/04_dont_build_portlet.diff
index 2b12d50..d34aa87
--- a/debian/patches/04_dont_build_portlet.dpatch
+++ b/debian/patches/04_dont_build_portlet.diff
@@ -1,13 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_dont_build_portlet.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: build.xml (core): don't build portlet part of Tiles (not yet in Debian)
-
- at DPATCH@
-diff -urNad tiles-2.0.6~/src/tiles-core/maven-build.xml tiles-2.0.6/src/tiles-core/maven-build.xml
---- tiles-2.0.6~/src/tiles-core/maven-build.xml	2008-08-31 23:45:01.000000000 +0200
-+++ tiles-2.0.6/src/tiles-core/maven-build.xml	2008-08-31 23:46:13.000000000 +0200
+Description: build.xml (core): don't build portlet part of Tiles (not yet in Debian)
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2009-07-16
+--- a/src/tiles-core/maven-build.xml
++++ b/src/tiles-core/maven-build.xml
 @@ -70,6 +70,7 @@
    <target name="compile" depends="get-deps" description="Compile the code">
      <mkdir dir="${maven.build.outputDir}"/>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ecabcc1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01_build_force_15_source.diff
+02_remove_m2_repository.diff
+03_dont_fork_junit.diff
+04_dont_build_portlet.diff
diff --git a/debian/rules b/debian/rules
index 971d0c8..d6ffe56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #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/java-6-openjdk

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

More information about the pkg-java-commits mailing list