Author: drazzib Date: 2009-10-24 18:55:56 +0000 (Sat, 24 Oct 2009) New Revision: 10877
Added: trunk/tiles/debian/build.properties trunk/tiles/debian/libtiles-java-doc.install trunk/tiles/debian/libtiles-java.poms trunk/tiles/debian/maven.rules Removed: trunk/tiles/debian/README.source trunk/tiles/debian/TODO trunk/tiles/debian/libtiles-java-doc.docs trunk/tiles/debian/patches/ Modified: 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/rules Log: * 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 Deleted: trunk/tiles/debian/README.source =================================================================== --- trunk/tiles/debian/README.source 2009-10-24 10:29:36 UTC (rev 10876) +++ trunk/tiles/debian/README.source 2009-10-24 18:55:56 UTC (rev 10877) @@ -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 <[email protected]> Deleted: trunk/tiles/debian/TODO =================================================================== --- trunk/tiles/debian/TODO 2009-10-24 10:29:36 UTC (rev 10876) +++ trunk/tiles/debian/TODO 2009-10-24 18:55:56 UTC (rev 10877) @@ -1 +0,0 @@ -- Run JUnit tests (current issues: missing Shales and Portlet API) Added: trunk/tiles/debian/build.properties =================================================================== --- trunk/tiles/debian/build.properties (rev 0) +++ trunk/tiles/debian/build.properties 2009-10-24 18:55:56 UTC (rev 10877) @@ -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 Modified: trunk/tiles/debian/build.xml =================================================================== --- trunk/tiles/debian/build.xml 2009-10-24 10:29:36 UTC (rev 10876) +++ trunk/tiles/debian/build.xml 2009-10-24 18:55:56 UTC (rev 10877) @@ -1,60 +1,64 @@ -<project basedir="../"> +<?xml version="1.0"?> - <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> +<project name="plexus-containers" default="package" basedir=".."> - <target name="clean"> - <iterate target="clean"/> - </target> + <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"/> - <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> + <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> Modified: trunk/tiles/debian/changelog =================================================================== --- trunk/tiles/debian/changelog 2009-10-24 10:29:36 UTC (rev 10876) +++ trunk/tiles/debian/changelog 2009-10-24 18:55:56 UTC (rev 10877) @@ -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 <[email protected]> Thu, 16 Jul 2009 17:36:05 +0200 + -- Damien Raude-Morvan <[email protected]> Sat, 24 Oct 2009 20:47:13 +0200 tiles (2.0.6-1) unstable; urgency=low Modified: trunk/tiles/debian/compat =================================================================== --- trunk/tiles/debian/compat 2009-10-24 10:29:36 UTC (rev 10876) +++ trunk/tiles/debian/compat 2009-10-24 18:55:56 UTC (rev 10877) @@ -1 +1 @@ -5 +7 Modified: trunk/tiles/debian/control =================================================================== --- trunk/tiles/debian/control 2009-10-24 10:29:36 UTC (rev 10876) +++ trunk/tiles/debian/control 2009-10-24 18:55:56 UTC (rev 10877) @@ -2,17 +2,21 @@ Section: java Priority: optional Maintainer: Debian Java maintainers <[email protected]> -Uploaders: Damien Raude-Morvan <[email protected]> -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 <[email protected]> +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 Modified: trunk/tiles/debian/copyright =================================================================== --- trunk/tiles/debian/copyright 2009-10-24 10:29:36 UTC (rev 10876) +++ trunk/tiles/debian/copyright 2009-10-24 18:55:56 UTC (rev 10877) @@ -1,4 +1,4 @@ -This package was debianized by Damien Raude-Morvan <[email protected]> on +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/ @@ -26,5 +26,5 @@ 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 +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'. Modified: trunk/tiles/debian/libtiles-java-doc.doc-base =================================================================== --- trunk/tiles/debian/libtiles-java-doc.doc-base 2009-10-24 10:29:36 UTC (rev 10876) +++ trunk/tiles/debian/libtiles-java-doc.doc-base 2009-10-24 18:55:56 UTC (rev 10877) @@ -5,5 +5,5 @@ 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/* Deleted: trunk/tiles/debian/libtiles-java-doc.docs =================================================================== --- trunk/tiles/debian/libtiles-java-doc.docs 2009-10-24 10:29:36 UTC (rev 10876) +++ trunk/tiles/debian/libtiles-java-doc.docs 2009-10-24 18:55:56 UTC (rev 10877) @@ -1 +0,0 @@ -docs/api Copied: trunk/tiles/debian/libtiles-java-doc.install (from rev 10194, trunk/tiles/debian/libtiles-java-doc.docs) =================================================================== --- trunk/tiles/debian/libtiles-java-doc.install (rev 0) +++ trunk/tiles/debian/libtiles-java-doc.install 2009-10-24 18:55:56 UTC (rev 10877) @@ -0,0 +1 @@ +build/api /usr/share/doc/libtiles-java/ Added: trunk/tiles/debian/libtiles-java.poms =================================================================== --- trunk/tiles/debian/libtiles-java.poms (rev 0) +++ trunk/tiles/debian/libtiles-java.poms 2009-10-24 18:55:56 UTC (rev 10877) @@ -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 Added: trunk/tiles/debian/maven.rules =================================================================== --- trunk/tiles/debian/maven.rules (rev 0) +++ trunk/tiles/debian/maven.rules 2009-10-24 18:55:56 UTC (rev 10877) @@ -0,0 +1,2 @@ +javax.servlet servlet-api jar * +junit junit jar s/3\..*/3.x/ Modified: trunk/tiles/debian/rules =================================================================== --- trunk/tiles/debian/rules 2009-10-24 10:29:36 UTC (rev 10876) +++ trunk/tiles/debian/rules 2009-10-24 18:55:56 UTC (rev 10877) @@ -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 +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) -DEB_JARS := commons-logging commons-digester commons-beanutils servlet-api jsp-api - +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 +DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) +API_DOCS := build/api -# 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/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 -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 +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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
