Author: drazzib-guest Date: 2009-03-21 21:39:00 +0000 (Sat, 21 Mar 2009) New Revision: 8099
Added: trunk/tiles/debian/ trunk/tiles/debian/README.Debian trunk/tiles/debian/README.source trunk/tiles/debian/TODO trunk/tiles/debian/build.xml trunk/tiles/debian/changelog trunk/tiles/debian/compat trunk/tiles/debian/control trunk/tiles/debian/copyright trunk/tiles/debian/libtiles-java-doc.doc-base trunk/tiles/debian/libtiles-java-doc.docs trunk/tiles/debian/patches/ 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 trunk/tiles/debian/rules trunk/tiles/debian/watch Log: [svn-inject] Applying Debian modifications to trunk Property changes on: trunk/tiles/debian ___________________________________________________________________ Name: mergeWithUpstream + 1 Added: trunk/tiles/debian/README.Debian =================================================================== --- trunk/tiles/debian/README.Debian (rev 0) +++ trunk/tiles/debian/README.Debian 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,7 @@ +Tiles in Debian +--------------- + +The Tiles Debian package don't build Portlet module of Tiles. +Portlet API is not avaible in Debian due to restrictive licence from SUN. + +-- Damien Raude-Morvan <[email protected]> Added: trunk/tiles/debian/README.source =================================================================== --- trunk/tiles/debian/README.source (rev 0) +++ trunk/tiles/debian/README.source 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,16 @@ +Build system of Tiles Debian package +------------------------------------ + +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 <[email protected]> Added: trunk/tiles/debian/TODO =================================================================== --- trunk/tiles/debian/TODO (rev 0) +++ trunk/tiles/debian/TODO 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1 @@ +- Run JUnit tests (current issues: missing Shales and Portlet API) Added: trunk/tiles/debian/build.xml =================================================================== --- trunk/tiles/debian/build.xml (rev 0) +++ trunk/tiles/debian/build.xml 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,60 @@ +<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> + +</project> Added: trunk/tiles/debian/changelog =================================================================== --- trunk/tiles/debian/changelog (rev 0) +++ trunk/tiles/debian/changelog 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,8 @@ +tiles (2.0.6-1) unstable; urgency=low + + * Initial release. (Closes: #497437) + * debian/control: + - don't use alternative in B-D line (increase build reproducibility) + * debian/build.xml: remove Javadoc API of Portlet module (build disabled) + + -- Damien Raude-Morvan <[email protected]> Sat, 21 Mar 2009 22:35:52 +0100 Added: trunk/tiles/debian/compat =================================================================== --- trunk/tiles/debian/compat (rev 0) +++ trunk/tiles/debian/compat 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1 @@ +5 Added: trunk/tiles/debian/control =================================================================== --- trunk/tiles/debian/control (rev 0) +++ trunk/tiles/debian/control 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,44 @@ +Source: tiles +Section: java +Priority: optional +Maintainer: Damien Raude-Morvan <[email protected]> +Build-Depends: cdbs, dpatch, 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: http://svn.drazzib.com/debian-pkg/tiles/trunk +Vcs-Browser: http://svn.drazzib.com/wsvn/Debian-Pkg/tiles/trunk +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 +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 + fragments which can be assembled into a complete page at runtime. + . + Tiles grew in popularity as a component of the popular + Struts <http://struts.apache.org/1.x/> framework. + . + It has since been extracted from Struts and is now integrated with various + frameworks, such as Struts 2 <http://struts.apache.org/2.x/> + and Shale <http://shale.apache.org/>. + +Package: libtiles-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: libtiles-java +Description: Java templating framework for web application user interfaces - documentation + Apache Tiles is a Java templating framework built to simplify the development + of web application user interfaces. Tiles allows authors to define page + fragments which can be assembled into a complete page at runtime. + . + Tiles grew in popularity as a component of the popular + Struts <http://struts.apache.org/1.x/> framework. + . + It has since been extracted from Struts and is now integrated with various + frameworks, such as Struts 2 <http://struts.apache.org/2.x/> + and Shale <http://shale.apache.org/>. + . + This package contains the Javadoc API of Tiles. Added: trunk/tiles/debian/copyright =================================================================== --- trunk/tiles/debian/copyright (rev 0) +++ trunk/tiles/debian/copyright 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,30 @@ +This package was debianized by Damien Raude-Morvan <[email protected]> on +Thu, 28 Aug 2008 20:59:38 +0200. + +It was downloaded from http://tiles.apache.org/ + +Upstream Author: + The Apache Software Foundation + +Copyright: + Copyright (C) 1999-2007 The Apache Software Foundation + +License: + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the 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 <[email protected]> and +is licensed under the Apache-2.0, see `/usr/share/common-licenses/Apache-2.0'. Added: trunk/tiles/debian/libtiles-java-doc.doc-base =================================================================== --- trunk/tiles/debian/libtiles-java-doc.doc-base (rev 0) +++ trunk/tiles/debian/libtiles-java-doc.doc-base 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,9 @@ +Document: libtiles-java-doc +Title: API Javadoc for Tiles +Author: Tiles developers +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/* Added: trunk/tiles/debian/libtiles-java-doc.docs =================================================================== --- trunk/tiles/debian/libtiles-java-doc.docs (rev 0) +++ trunk/tiles/debian/libtiles-java-doc.docs 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1 @@ +docs/api Added: trunk/tiles/debian/patches/00list =================================================================== --- trunk/tiles/debian/patches/00list (rev 0) +++ trunk/tiles/debian/patches/00list 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,4 @@ +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.dpatch =================================================================== --- trunk/tiles/debian/patches/01_build_force_15_source.dpatch (rev 0) +++ trunk/tiles/debian/patches/01_build_force_15_source.dpatch 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,95 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_force_java_15.dpatch by Damien Raude-Morvan <[email protected]> +## +## 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 + +...@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> Property changes on: trunk/tiles/debian/patches/01_build_force_15_source.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/tiles/debian/patches/02_remove_m2_repository.dpatch =================================================================== --- trunk/tiles/debian/patches/02_remove_m2_repository.dpatch (rev 0) +++ trunk/tiles/debian/patches/02_remove_m2_repository.dpatch 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,101 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_remove_m2_repository.dpatch by Damien Raude-Morvan <[email protected]> +## +## 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) + +...@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> + Property changes on: trunk/tiles/debian/patches/02_remove_m2_repository.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/tiles/debian/patches/03_dont_fork_junit.dpatch =================================================================== --- trunk/tiles/debian/patches/03_dont_fork_junit.dpatch (rev 0) +++ trunk/tiles/debian/patches/03_dont_fork_junit.dpatch 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,44 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_dont_fork_junit.dpatch by Damien Raude-Morvan <[email protected]> +## +## 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 + +...@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"/> Property changes on: trunk/tiles/debian/patches/03_dont_fork_junit.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/tiles/debian/patches/04_dont_build_portlet.dpatch =================================================================== --- trunk/tiles/debian/patches/04_dont_build_portlet.dpatch (rev 0) +++ trunk/tiles/debian/patches/04_dont_build_portlet.dpatch 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_dont_build_portlet.dpatch by Damien Raude-Morvan <[email protected]> +## +## 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) + +...@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}"> Property changes on: trunk/tiles/debian/patches/04_dont_build_portlet.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/tiles/debian/rules =================================================================== --- trunk/tiles/debian/rules (rev 0) +++ trunk/tiles/debian/rules 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,40 @@ +#!/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/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 + +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 + +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 Property changes on: trunk/tiles/debian/rules ___________________________________________________________________ Name: svn:executable + * Added: trunk/tiles/debian/watch =================================================================== --- trunk/tiles/debian/watch (rev 0) +++ trunk/tiles/debian/watch 2009-03-21 21:39:00 UTC (rev 8099) @@ -0,0 +1,2 @@ +version=3 +http://www.apache.org/dist/tiles/v([\d\.]+)/tiles-([\d\.]+)-src\.tar\.gz debian uupdate _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
