[pkg-java] r9362 - in trunk/tiles/debian: . patches
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Thu Jul 16 15:40:17 UTC 2009
Author: drazzib-guest
Date: 2009-07-16 15:40:15 +0000 (Thu, 16 Jul 2009)
New Revision: 9362
Added:
trunk/tiles/debian/patches/01_build_force_15_source.diff
trunk/tiles/debian/patches/02_remove_m2_repository.diff
trunk/tiles/debian/patches/03_dont_fork_junit.diff
trunk/tiles/debian/patches/04_dont_build_portlet.diff
trunk/tiles/debian/patches/series
Removed:
trunk/tiles/debian/patches/00list
trunk/tiles/debian/patches/01_build_force_15_source.dpatch
trunk/tiles/debian/patches/02_remove_m2_repository.dpatch
trunk/tiles/debian/patches/03_dont_fork_junit.dpatch
trunk/tiles/debian/patches/04_dont_build_portlet.dpatch
Modified:
trunk/tiles/debian/README.source
trunk/tiles/debian/changelog
trunk/tiles/debian/control
trunk/tiles/debian/rules
Log:
[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
Modified: trunk/tiles/debian/README.source
===================================================================
--- trunk/tiles/debian/README.source 2009-07-16 15:28:05 UTC (rev 9361)
+++ trunk/tiles/debian/README.source 2009-07-16 15:40:15 UTC (rev 9362)
@@ -1,6 +1,16 @@
-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
JAR from network, etc...), so we need to generate a Ant build.xml using
Modified: trunk/tiles/debian/changelog
===================================================================
--- trunk/tiles/debian/changelog 2009-07-16 15:28:05 UTC (rev 9361)
+++ trunk/tiles/debian/changelog 2009-07-16 15:40:15 UTC (rev 9362)
@@ -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)
Modified: trunk/tiles/debian/control
===================================================================
--- trunk/tiles/debian/control 2009-07-16 15:28:05 UTC (rev 9361)
+++ trunk/tiles/debian/control 2009-07-16 15:40:15 UTC (rev 9362)
@@ -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
Deleted: trunk/tiles/debian/patches/00list
===================================================================
--- trunk/tiles/debian/patches/00list 2009-07-16 15:28:05 UTC (rev 9361)
+++ trunk/tiles/debian/patches/00list 2009-07-16 15:40:15 UTC (rev 9362)
@@ -1,4 +0,0 @@
-01_build_force_15_source
-02_remove_m2_repository
-03_dont_fork_junit
-04_dont_build_portlet
Added: trunk/tiles/debian/patches/01_build_force_15_source.diff
===================================================================
--- trunk/tiles/debian/patches/01_build_force_15_source.diff (rev 0)
+++ trunk/tiles/debian/patches/01_build_force_15_source.diff 2009-07-16 15:40:15 UTC (rev 9362)
@@ -0,0 +1,90 @@
+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"
+ deprecation="true"
+- target="1.1"
++ target="1.5"
+ verbose="false"
+ fork="false"
+- source="1.3">
++ source="1.5">
+ <src>
+ <pathelement location="${maven.build.srcDir.0}"/>
+ </src>
+@@ -115,10 +115,10 @@
+ debug="true"
+ optimize="false"
+ deprecation="true"
+- target="1.1"
++ target="1.5"
+ verbose="false"
+ fork="false"
+- source="1.3">
++ source="1.5">
+ <src>
+ <pathelement location="${maven.build.testDir.0}"/>
+ </src>
+--- a/src/tiles-core/maven-build.xml
++++ b/src/tiles-core/maven-build.xml
+@@ -87,10 +87,10 @@
+ debug="true"
+ optimize="false"
+ deprecation="true"
+- target="1.1"
++ target="1.5"
+ verbose="false"
+ fork="false"
+- source="1.3">
++ source="1.5">
+ <src>
+ <pathelement location="${maven.build.srcDir.0}"/>
+ </src>
+@@ -125,10 +125,10 @@
+ debug="true"
+ optimize="false"
+ deprecation="true"
+- target="1.1"
++ target="1.5"
+ verbose="false"
+ fork="false"
+- source="1.3">
++ source="1.5">
+ <src>
+ <pathelement location="${maven.build.testDir.0}"/>
+ </src>
+--- a/src/tiles-jsp/maven-build.xml
++++ b/src/tiles-jsp/maven-build.xml
+@@ -89,10 +89,10 @@
+ debug="true"
+ optimize="false"
+ deprecation="true"
+- target="1.1"
++ target="1.5"
+ verbose="false"
+ fork="false"
+- source="1.3">
++ source="1.5">
+ <src>
+ <pathelement location="${maven.build.srcDir.0}"/>
+ </src>
+@@ -127,10 +127,10 @@
+ debug="true"
+ optimize="false"
+ deprecation="true"
+- target="1.1"
++ target="1.5"
+ verbose="false"
+ fork="false"
+- source="1.3">
++ source="1.5">
+ <src>
+ <pathelement location="${maven.build.testDir.0}"/>
+ </src>
Deleted: trunk/tiles/debian/patches/01_build_force_15_source.dpatch
===================================================================
--- trunk/tiles/debian/patches/01_build_force_15_source.dpatch 2009-07-16 15:28:05 UTC (rev 9361)
+++ trunk/tiles/debian/patches/01_build_force_15_source.dpatch 2009-07-16 15:40:15 UTC (rev 9362)
@@ -1,95 +0,0 @@
-#! /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
-@@ -77,10 +77,10 @@
- debug="true"
- optimize="false"
- deprecation="true"
-- target="1.1"
-+ target="1.5"
- verbose="false"
- fork="false"
-- source="1.3">
-+ source="1.5">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
-@@ -115,10 +115,10 @@
- debug="true"
- optimize="false"
- deprecation="true"
-- target="1.1"
-+ target="1.5"
- verbose="false"
- fork="false"
-- source="1.3">
-+ source="1.5">
- <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
-@@ -87,10 +87,10 @@
- debug="true"
- optimize="false"
- deprecation="true"
-- target="1.1"
-+ target="1.5"
- verbose="false"
- fork="false"
-- source="1.3">
-+ source="1.5">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
-@@ -125,10 +125,10 @@
- debug="true"
- optimize="false"
- deprecation="true"
-- target="1.1"
-+ target="1.5"
- verbose="false"
- fork="false"
-- source="1.3">
-+ source="1.5">
- <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
-@@ -89,10 +89,10 @@
- debug="true"
- optimize="false"
- deprecation="true"
-- target="1.1"
-+ target="1.5"
- verbose="false"
- fork="false"
-- source="1.3">
-+ source="1.5">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
-@@ -127,10 +127,10 @@
- debug="true"
- optimize="false"
- deprecation="true"
-- target="1.1"
-+ target="1.5"
- verbose="false"
- fork="false"
-- source="1.3">
-+ source="1.5">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
Added: trunk/tiles/debian/patches/02_remove_m2_repository.diff
===================================================================
--- trunk/tiles/debian/patches/02_remove_m2_repository.diff (rev 0)
+++ trunk/tiles/debian/patches/02_remove_m2_repository.diff 2009-07-16 15:40:15 UTC (rev 9362)
@@ -0,0 +1,96 @@
+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"/>
+- </fileset>
+ </path>
+ <path id="build.test.classpath">
+- <fileset dir="${maven.repo.local}">
+- <include name="javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+- <include name="commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
+- <include name="junit/junit/4.0/junit-4.0.jar"/>
+- <include name="org/easymock/easymock/2.2/easymock-2.2.jar"/>
+- </fileset>
+ </path>
+
+ <!-- ====================================================================== -->
+--- 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"/>
+- <include name="commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
+- <include name="commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
+- <include name="commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
+- <include name="javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+- <include name="javax/portlet/portlet-api/1.0/portlet-api-1.0.jar"/>
++ <fileset dir="${basedir}/../..">
++ <include name="src/tiles-api/target/tiles-api*.jar"/>
+ </fileset>
+ </path>
+ <path id="build.test.classpath">
+- <fileset dir="${maven.repo.local}">
+- <include name="org/apache/tiles/tiles-api/2.0.6/tiles-api-2.0.6.jar"/>
+- <include name="commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
+- <include name="commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
+- <include name="commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
+- <include name="javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+- <include name="javax/portlet/portlet-api/1.0/portlet-api-1.0.jar"/>
+- <include name="junit/junit/4.0/junit-4.0.jar"/>
+- <include name="org/easymock/easymock/2.2/easymock-2.2.jar"/>
+- <include name="org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.jar"/>
++ <fileset dir="${basedir}/../..">
++ <include name="src/tiles-api/target/tiles-api*.jar"/>
+ </fileset>
+ </path>
+
+--- 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"/>
+- <include name="org/apache/tiles/tiles-api/2.0.6/tiles-api-2.0.6.jar"/>
+- <include name="commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
+- <include name="commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
+- <include name="commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
+- <include name="javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+- <include name="javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
++ <fileset dir="${basedir}/../..">
++ <include name="src/tiles-api/target/tiles-api*.jar"/>
++ <include name="src/tiles-core/target/tiles-core*.jar"/>
+ </fileset>
+ </path>
+ <path id="build.test.classpath">
+- <fileset dir="${maven.repo.local}">
+- <include name="org/apache/tiles/tiles-core/2.0.6/tiles-core-2.0.6.jar"/>
+- <include name="org/apache/tiles/tiles-api/2.0.6/tiles-api-2.0.6.jar"/>
+- <include name="commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
+- <include name="commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
+- <include name="commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
+- <include name="javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+- <include name="javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
+- <include name="junit/junit/4.0/junit-4.0.jar"/>
+- <include name="org/easymock/easymock/2.2/easymock-2.2.jar"/>
+- <include name="org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.jar"/>
++ <fileset dir="${basedir}/../..">
++ <include name="src/tiles-api/target/tiles-api*.jar"/>
++ <include name="src/tiles-core/target/tiles-core*.jar"/>
+ </fileset>
+ </path>
+
Deleted: trunk/tiles/debian/patches/02_remove_m2_repository.dpatch
===================================================================
--- trunk/tiles/debian/patches/02_remove_m2_repository.dpatch 2009-07-16 15:28:05 UTC (rev 9361)
+++ trunk/tiles/debian/patches/02_remove_m2_repository.dpatch 2009-07-16 15:40:15 UTC (rev 9362)
@@ -1,101 +0,0 @@
-#! /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
-@@ -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"/>
-- </fileset>
- </path>
- <path id="build.test.classpath">
-- <fileset dir="${maven.repo.local}">
-- <include name="javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
-- <include name="commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
-- <include name="junit/junit/4.0/junit-4.0.jar"/>
-- <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
-@@ -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"/>
-- <include name="commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
-- <include name="commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
-- <include name="commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
-- <include name="javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
-- <include name="javax/portlet/portlet-api/1.0/portlet-api-1.0.jar"/>
-+ <fileset dir="${basedir}/../..">
-+ <include name="src/tiles-api/target/tiles-api*.jar"/>
- </fileset>
- </path>
- <path id="build.test.classpath">
-- <fileset dir="${maven.repo.local}">
-- <include name="org/apache/tiles/tiles-api/2.0.6/tiles-api-2.0.6.jar"/>
-- <include name="commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
-- <include name="commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
-- <include name="commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
-- <include name="javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
-- <include name="javax/portlet/portlet-api/1.0/portlet-api-1.0.jar"/>
-- <include name="junit/junit/4.0/junit-4.0.jar"/>
-- <include name="org/easymock/easymock/2.2/easymock-2.2.jar"/>
-- <include name="org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.jar"/>
-+ <fileset dir="${basedir}/../..">
-+ <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
-@@ -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"/>
-- <include name="org/apache/tiles/tiles-api/2.0.6/tiles-api-2.0.6.jar"/>
-- <include name="commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
-- <include name="commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
-- <include name="commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
-- <include name="javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
-- <include name="javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
-+ <fileset dir="${basedir}/../..">
-+ <include name="src/tiles-api/target/tiles-api*.jar"/>
-+ <include name="src/tiles-core/target/tiles-core*.jar"/>
- </fileset>
- </path>
- <path id="build.test.classpath">
-- <fileset dir="${maven.repo.local}">
-- <include name="org/apache/tiles/tiles-core/2.0.6/tiles-core-2.0.6.jar"/>
-- <include name="org/apache/tiles/tiles-api/2.0.6/tiles-api-2.0.6.jar"/>
-- <include name="commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
-- <include name="commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
-- <include name="commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
-- <include name="javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
-- <include name="javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
-- <include name="junit/junit/4.0/junit-4.0.jar"/>
-- <include name="org/easymock/easymock/2.2/easymock-2.2.jar"/>
-- <include name="org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.jar"/>
-+ <fileset dir="${basedir}/../..">
-+ <include name="src/tiles-api/target/tiles-api*.jar"/>
-+ <include name="src/tiles-core/target/tiles-core*.jar"/>
- </fileset>
- </path>
-
Added: trunk/tiles/debian/patches/03_dont_fork_junit.diff
===================================================================
--- trunk/tiles/debian/patches/03_dont_fork_junit.diff (rev 0)
+++ trunk/tiles/debian/patches/03_dont_fork_junit.diff 2009-07-16 15:40:15 UTC (rev 9362)
@@ -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"/>
Deleted: trunk/tiles/debian/patches/03_dont_fork_junit.dpatch
===================================================================
--- trunk/tiles/debian/patches/03_dont_fork_junit.dpatch 2009-07-16 15:28:05 UTC (rev 9361)
+++ trunk/tiles/debian/patches/03_dont_fork_junit.dpatch 2009-07-16 15:40:15 UTC (rev 9362)
@@ -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"/>
Added: trunk/tiles/debian/patches/04_dont_build_portlet.diff
===================================================================
--- trunk/tiles/debian/patches/04_dont_build_portlet.diff (rev 0)
+++ trunk/tiles/debian/patches/04_dont_build_portlet.diff 2009-07-16 15:40:15 UTC (rev 9362)
@@ -0,0 +1,27 @@
+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}"/>
+ <javac destdir="${maven.build.outputDir}"
++ srcdir="${maven.build.srcDir.0}"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+@@ -78,9 +79,8 @@
+ verbose="false"
+ fork="false"
+ source="1.5">
+- <src>
+- <pathelement location="${maven.build.srcDir.0}"/>
+- </src>
++ <include name="**/*.java"/>
++ <exclude name="org/apache/tiles/portlet/**"/>
+ <classpath refid="build.classpath"/>
+ </javac>
+ <copy todir="${maven.build.outputDir}">
Deleted: trunk/tiles/debian/patches/04_dont_build_portlet.dpatch
===================================================================
--- trunk/tiles/debian/patches/04_dont_build_portlet.dpatch 2009-07-16 15:28:05 UTC (rev 9361)
+++ trunk/tiles/debian/patches/04_dont_build_portlet.dpatch 2009-07-16 15:40:15 UTC (rev 9362)
@@ -1,30 +0,0 @@
-#! /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
-@@ -70,6 +70,7 @@
- <target name="compile" depends="get-deps" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
-+ srcdir="${maven.build.srcDir.0}"
- nowarn="false"
- debug="true"
- optimize="false"
-@@ -78,9 +79,8 @@
- verbose="false"
- fork="false"
- source="1.5">
-- <src>
-- <pathelement location="${maven.build.srcDir.0}"/>
-- </src>
-+ <include name="**/*.java"/>
-+ <exclude name="org/apache/tiles/portlet/**"/>
- <classpath refid="build.classpath"/>
- </javac>
- <copy todir="${maven.build.outputDir}">
Added: trunk/tiles/debian/patches/series
===================================================================
--- trunk/tiles/debian/patches/series (rev 0)
+++ trunk/tiles/debian/patches/series 2009-07-16 15:40:15 UTC (rev 9362)
@@ -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
Modified: trunk/tiles/debian/rules
===================================================================
--- trunk/tiles/debian/rules 2009-07-16 15:28:05 UTC (rev 9361)
+++ trunk/tiles/debian/rules 2009-07-16 15:40:15 UTC (rev 9362)
@@ -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
More information about the pkg-java-commits
mailing list