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 76e4a91722b7b4f99ad78e5dbec8b98ed43902d6
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sat Oct 24 18:55:56 2009 +0000

    * New upstream release.
     - Remove Build-Depends on libservlet2.4-java, libcommons-beanutils-java
       and libcommons-logging-java
     - Add Build-Depends on libslf4j-java, libognl-java, libservlet2.5-java,
       libtomcat6-java, libspring-core-2.5-java, libspring-web-2.5-java
       and libfreemarker-java
     - Update Suggests accordingly
     - Add myself as Uploaders
     - Update my email address
    * Bump Standards-Version to 3.8.3: no changes needed
    * Bump debhelper version to 7
    * Move api documentation to /usr/share/doc/libtiles-java/api/
    * Maven POMs:
      - Add a Build-Depends-Indep dependency on maven-repo-helper
      - Use mh_installpoms and mh_installjar to install the POM and the jar to the
       Maven repository
    * Maven ant helper (build system):
      - Add a Build-Depends dependency on maven-ant-helper
      - Update debian/build.xml to use /usr/share/maven-ant-helper/maven-build.xml
      - Remove all patches, quilt from Build-Depends and debian/README.source
      - Build classpath is now defined in debian/build.properties
    * Use default-jdk:
      - Build-Depend on default-jdk instead of openjdk-6-jdk
      - Use /usr/lib/jvm/default-java as JAVA_HOME
---
 debian/README.source                         |  26 ------
 debian/TODO                                  |   1 -
 debian/build.properties                      |  18 ++++
 debian/build.xml                             | 120 ++++++++++++++-------------
 debian/changelog                             |  35 ++++++--
 debian/compat                                |   2 +-
 debian/control                               |  14 ++--
 debian/copyright                             |   4 +-
 debian/libtiles-java-doc.doc-base            |   4 +-
 debian/libtiles-java-doc.docs                |   1 -
 debian/libtiles-java-doc.install             |   1 +
 debian/libtiles-java.poms                    |   8 ++
 debian/maven.rules                           |   2 +
 debian/patches/01_build_force_15_source.diff |  90 --------------------
 debian/patches/02_remove_m2_repository.diff  |  96 ---------------------
 debian/patches/03_dont_fork_junit.diff       |  39 ---------
 debian/patches/04_dont_build_portlet.diff    |  27 ------
 debian/patches/series                        |   4 -
 debian/rules                                 |  50 +++++------
 19 files changed, 151 insertions(+), 391 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 03a130b..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,26 +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.
-
-
-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
-a Maven2 plugin.
-
-Everything is done by get-orig-source rule in debian/rules :
- - running "mvn ant:ant" to generate build.xml in each module
- - upstream tarballs are repackaged with this build.xml file
-
-With that, Maven2 (debian package) is only needed to repackage tarball on
-each new upstream release.
-
--- Damien Raude-Morvan <drazzib at drazzib.com>
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 673a664..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- Run JUnit tests (current issues: missing Shales and Portlet API)
diff --git a/debian/build.properties b/debian/build.properties
new file mode 100644
index 0000000..be86b47
--- /dev/null
+++ b/debian/build.properties
@@ -0,0 +1,18 @@
+javadoc.dir=build/api
+maven.test.skip=true
+build.javaVersion=1.5
+classpath.compile = \
+            /usr/share/java/slf4j-api.jar:\
+            /usr/share/java/commons-digester.jar:\
+            /usr/share/java/ognl.jar:\
+            /usr/share/java/servlet-api-2.5.jar:\
+            /usr/share/java/jsp-api-2.1.jar:\
+            /usr/share/java/el-api-2.1.jar:\
+            /usr/share/tomcat6/lib/jasper-el.jar:\
+            /usr/share/java/spring-core.jar:\
+            /usr/share/java/spring-web.jar:\
+            /usr/share/java/freemarker.jar:\
+            ${basedir}/src/tiles-api/build/tiles-api-${version}.jar:\
+            ${basedir}/src/tiles-core/build/tiles-core-${version}.jar:\
+            ${basedir}/src/tiles-servlet/build/tiles-servlet-${version}.jar:\
+            ${basedir}/src/tiles-template/build/tiles-template-${version}.jar
diff --git a/debian/build.xml b/debian/build.xml
index fb87dfc..f28776a 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -1,60 +1,64 @@
-<project basedir="../">
-
-	<macrodef name="iterate">
-	<attribute name="target"/>
-		<sequential>
-			<subant target="@{target}">
-			<fileset dir="src">
-				 <include name="tiles-api/build.xml"/>
-				 <include name="tiles-core/build.xml"/>
-				 <include name="tiles-jsp/build.xml"/>
-			</fileset>
-			</subant>
-		</sequential>
-	</macrodef>
-
-	<target name="clean">
-		<iterate target="clean"/>
-	</target>
-
-	<target name="jar">
-		<iterate target="jar"/>
-	</target>
-	
-	<target name="javadoc">
-	
-		<javadoc
-			packagenames="*"
-			destdir="docs/api"
-			access="protected"
-			old="false"
-			verbose="false"
-			version="true"
-			use="true"
-			author="true"
-			splitindex="false"
-			nodeprecated="false"
-			nodeprecatedlist="false"
-			notree="false"
-			noindex="false"
-			nohelp="false"
-			nonavbar="false"
-			serialwarn="false"
-			linksource="false"
-			breakiterator="false"
-			>
-			<fileset dir="src">
-				 <include name="tiles-api/src/main/java/**/*.java"/>
-				 <include name="tiles-core/src/main/java/**/*.java"/>
-				 <include name="tiles-jsp/src/main/java/**/*.java"/>
-				 <!--
-				 don't build portlet part of Tiles (not yet in Debian)
-				 see also debian/patches/04_dont_build_portlet.dpatch
-				 -->
-				 <exclude name="tiles-core/src/main/java/org/apache/tiles/portlet/**"/>
-			</fileset>
-		</javadoc>
-	
-	</target>
+<?xml version="1.0"?>
+
+<project name="plexus-containers" default="package" basedir="..">
+
+  <property file="debian/build.properties"/>
+  <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
+  <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
+
+  <macrodef name="cleanmodule">
+    <attribute name="dir"/>
+    <sequential>
+      <ant target="clean" antfile="${maven.build}" dir="@{dir}">
+        <property name="debian.dir" location="debian" />
+        <property name="project.dir" value="@{dir}" />
+      </ant>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="packagemodule">
+    <attribute name="dir"/>
+    <sequential>
+      <ant target="package" antfile="${maven.build}" dir="@{dir}">
+        <property name="debian.dir" location="debian" />
+        <property name="project.dir" value="@{dir}" />
+      </ant>
+    </sequential>
+  </macrodef>
+
+  <target name="clean">
+    <delete dir="build"/>
+    <cleanmodule dir="src/tiles-api"/>
+    <cleanmodule dir="src/tiles-core"/>
+    <cleanmodule dir="src/tiles-compat"/>
+    <delete dir="src/tiles-core/src/main/java/org/apache/tiles/evaluator/mvel/" />
+    <cleanmodule dir="src/tiles-servlet"/>
+    <cleanmodule dir="src/tiles-template"/>
+    <cleanmodule dir="src/tiles-jsp"/>
+    <cleanmodule dir="src/tiles-freemarker"/>
+  </target>
+
+  <target name="package">
+    <packagemodule dir="src/"/>
+    <packagemodule dir="src/tiles-api"/>
+    <packagemodule dir="src/tiles-core"/>
+    <packagemodule dir="src/tiles-compat"/>
+    <packagemodule dir="src/tiles-servlet"/>
+    <packagemodule dir="src/tiles-template"/>
+    <packagemodule dir="src/tiles-jsp"/>
+    <packagemodule dir="src/tiles-freemarker"/>
+  </target>
+
+  <target name="javadoc">
+    <javadoc destdir="${javadoc.dir}">
+      <packageset dir="src/tiles-api/src/main/java/"/>
+      <packageset dir="src/tiles-core/src/main/java/"/>
+      <packageset dir="src/tiles-compat/src/main/java/"/>
+      <packageset dir="src/tiles-servlet/src/main/java/"/>
+      <packageset dir="src/tiles-template/src/main/java/"/>
+      <packageset dir="src/tiles-jsp/src/main/java/"/>
+      <packageset dir="src/tiles-freemarker/src/main/java/"/>
+    </javadoc>
+  </target>
 
 </project>
diff --git a/debian/changelog b/debian/changelog
index 38d49d6..e19fe32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,32 @@
-tiles (2.0.6-2) UNRELEASED; urgency=low
+tiles (2.2.0-1) unstable; urgency=low
 
+  * New upstream release.
+   - Remove Build-Depends on libservlet2.4-java, libcommons-beanutils-java
+     and libcommons-logging-java
+   - Add Build-Depends on libslf4j-java, libognl-java, libservlet2.5-java,
+     libtomcat6-java, libspring-core-2.5-java, libspring-web-2.5-java
+     and libfreemarker-java
+   - Update Suggests accordingly
   * 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
+   - Add myself as Uploaders
+   - Update my email address
+  * Bump Standards-Version to 3.8.3: no changes needed
+  * Bump debhelper version to 7
+  * Move api documentation to /usr/share/doc/libtiles-java/api/
+  * Maven POMs:
+    - Add a Build-Depends-Indep dependency on maven-repo-helper
+    - Use mh_installpoms and mh_installjar to install the POM and the jar to the
+     Maven repository
+  * Maven ant helper (build system):
+    - Add a Build-Depends dependency on maven-ant-helper
+    - Update debian/build.xml to use /usr/share/maven-ant-helper/maven-build.xml
+    - Remove all patches, quilt from Build-Depends and debian/README.source
+    - Build classpath is now defined in debian/build.properties
+  * Use default-jdk:
+    - Build-Depend on default-jdk instead of openjdk-6-jdk
+    - Use /usr/lib/jvm/default-java as JAVA_HOME
 
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Thu, 16 Jul 2009 17:36:05 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 24 Oct 2009 20:47:13 +0200
 
 tiles (2.0.6-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 1a99b36..8820a2a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,21 @@ Source: tiles
 Section: java
 Priority: optional
 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.2
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-ant-helper
+Build-Depends-Indep: libcommons-digester-java, libslf4j-java, libognl-java,
+ libservlet2.5-java, libtomcat6-java, libspring-core-2.5-java, libspring-web-2.5-java,
+ libfreemarker-java, maven-repo-helper
+Standards-Version: 3.8.3
 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
 Architecture: all
-Depends: ${misc:Depends}, libcommons-logging-java, libcommons-digester-java, libcommons-beanutils-java, libservlet2.4-java
+Depends: ${misc:Depends}, libcommons-digester-java, libslf4j-java
+Suggests: libservlet2.5-java, libognl-java, libtomcat6-java, libfreemarker-java,
+ libspring-core-2.5-java, libspring-web-2.5-java
 Description: Java templating framework for web application user interfaces
  Apache Tiles is a Java templating framework built to simplify the development
  of web application user interfaces. Tiles allows authors to define page
diff --git a/debian/copyright b/debian/copyright
index 20ec6f7..352fa4b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-This package was debianized by Damien Raude-Morvan <drazzib at drazzib.com> on
+This package was debianized by Damien Raude-Morvan <drazzib at debian.org> on
 Thu, 28 Aug 2008 20:59:38 +0200.
 
 It was downloaded from http://tiles.apache.org/
@@ -26,5 +26,5 @@ License:
 The full text of the Apache-2.0 license can be found in
 `/usr/share/common-licenses/Apache-2.0' on Debian systems.
 
-The Debian packaging is Copyright 2008, Damien Raude-Morvan <drazzib at drazzib.com> and
+The Debian packaging is Copyright 2008, Damien Raude-Morvan <drazzib at debian.org> and
 is licensed under the Apache-2.0, see `/usr/share/common-licenses/Apache-2.0'.
diff --git a/debian/libtiles-java-doc.doc-base b/debian/libtiles-java-doc.doc-base
index 6d90ead..21c7a7b 100644
--- a/debian/libtiles-java-doc.doc-base
+++ b/debian/libtiles-java-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provided by the Tiles library.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libtiles-java-doc/api/index.html
-Files: /usr/share/doc/libtiles-java-doc/api/*
+Index: /usr/share/doc/libtiles-java/api/index.html
+Files: /usr/share/doc/libtiles-java/api/*
diff --git a/debian/libtiles-java-doc.docs b/debian/libtiles-java-doc.docs
deleted file mode 100644
index 4596bfa..0000000
--- a/debian/libtiles-java-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-docs/api
diff --git a/debian/libtiles-java-doc.install b/debian/libtiles-java-doc.install
new file mode 100644
index 0000000..6e8bdf7
--- /dev/null
+++ b/debian/libtiles-java-doc.install
@@ -0,0 +1 @@
+build/api /usr/share/doc/libtiles-java/
diff --git a/debian/libtiles-java.poms b/debian/libtiles-java.poms
new file mode 100644
index 0000000..b957bd4
--- /dev/null
+++ b/debian/libtiles-java.poms
@@ -0,0 +1,8 @@
+src/pom.xml --no-parent
+src/tiles-api/pom.xml
+src/tiles-core/pom.xml
+src/tiles-compat/pom.xml
+src/tiles-servlet/pom.xml
+src/tiles-template/pom.xml
+src/tiles-jsp/pom.xml
+src/tiles-freemarker/pom.xml
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..db51287
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+javax.servlet servlet-api jar *
+junit junit jar s/3\..*/3.x/
diff --git a/debian/patches/01_build_force_15_source.diff b/debian/patches/01_build_force_15_source.diff
deleted file mode 100644
index a1849a7..0000000
--- a/debian/patches/01_build_force_15_source.diff
+++ /dev/null
@@ -1,90 +0,0 @@
-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>
diff --git a/debian/patches/02_remove_m2_repository.diff b/debian/patches/02_remove_m2_repository.diff
deleted file mode 100644
index bdf9a5a..0000000
--- a/debian/patches/02_remove_m2_repository.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-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>
- 
diff --git a/debian/patches/03_dont_fork_junit.diff b/debian/patches/03_dont_fork_junit.diff
deleted file mode 100644
index bf8238b..0000000
--- a/debian/patches/03_dont_fork_junit.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-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/04_dont_build_portlet.diff b/debian/patches/04_dont_build_portlet.diff
deleted file mode 100644
index d34aa87..0000000
--- a/debian/patches/04_dont_build_portlet.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-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}">
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ecabcc1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-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 d6ffe56..78b83b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,40 +1,30 @@
 #!/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/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
-ANT_HOME             := /usr/share/ant
-
-DEB_JARS             := commons-logging commons-digester commons-beanutils servlet-api jsp-api
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
 
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := ant-nodeps
+DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_BUILD_TARGET := jar javadoc
-DEB_ANT_CLEAN_TARGET := clean
-
-# maven.settings.offline=true : don't download JAR from internet
-# maven.test.skip=true : don't run unit testing
-DEB_ANT_ARGS         := -Dmaven.settings.offline=true -Dmaven.test.skip=true
-
-binary-post-install/libtiles-java::
-	dh_install src/tiles-api/target/tiles-api-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_install src/tiles-core/target/tiles-core-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_install src/tiles-jsp/target/tiles-jsp-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_link usr/share/java/tiles-api-$(DEB_UPSTREAM_VERSION).jar usr/share/java/tiles-api.jar
-	dh_link usr/share/java/tiles-core-$(DEB_UPSTREAM_VERSION).jar usr/share/java/tiles-core.jar
-	dh_link usr/share/java/tiles-jsp-$(DEB_UPSTREAM_VERSION).jar usr/share/java/tiles-jsp.jar
+DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+API_DOCS             := build/api
+
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l src/tiles-api/pom.xml src/tiles-api/build/tiles-api-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l src/tiles-core/pom.xml src/tiles-core/build/tiles-core-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l src/tiles-compat/pom.xml src/tiles-compat/build/tiles-compat-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l src/tiles-servlet/pom.xml src/tiles-servlet/build/tiles-servlet-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l src/tiles-template/pom.xml src/tiles-template/build/tiles-template-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l src/tiles-jsp/pom.xml src/tiles-jsp/build/tiles-jsp-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l src/tiles-freemarker/pom.xml src/tiles-freemarker/build/tiles-freemarker-$(VERSION).jar
+
+clean::
+	-rm -rf debian/tmp
 
 get-orig-source:
 	uscan --force-download --rename
-	mkdir orig_tmp
-	(cd orig_tmp && \
-	tar -xzf ../../${DEB_SOURCE_PACKAGE}_$(DEB_UPSTREAM_VERSION).orig.tar.gz && \
-	(cd ${DEB_SOURCE_PACKAGE}-$(DEB_UPSTREAM_VERSION)/src/tiles-api; mvn ant:ant) && \
-	(cd ${DEB_SOURCE_PACKAGE}-$(DEB_UPSTREAM_VERSION)/src/tiles-core; mvn ant:ant) && \
-	(cd ${DEB_SOURCE_PACKAGE}-$(DEB_UPSTREAM_VERSION)/src/tiles-jsp; mvn ant:ant) && \
-	tar -czf ../../${DEB_SOURCE_PACKAGE}_$(DEB_UPSTREAM_VERSION).orig.tar.gz ${DEB_SOURCE_PACKAGE}-$(DEB_UPSTREAM_VERSION))
-	rm -rf orig_tmp

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

