[pkg-java] r11861 - trunk/tiles/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-03-14 08:14:31 +0000 (Sun, 14 Mar 2010)
New Revision: 11861

Modified:
   trunk/tiles/debian/build.properties
   trunk/tiles/debian/build.xml
   trunk/tiles/debian/changelog
   trunk/tiles/debian/control
   trunk/tiles/debian/libtiles-java.poms
   trunk/tiles/debian/rules
Log:
* New module: tiles-mvel
* Add Build-Depends on libmvel-java
* Add mvel.jar to debian/build.properties
* Bump Standards-Version to 3.8.4: no changes needed

Modified: trunk/tiles/debian/build.properties
===================================================================
--- trunk/tiles/debian/build.properties	2010-03-13 21:37:22 UTC (rev 11860)
+++ trunk/tiles/debian/build.properties	2010-03-14 08:14:31 UTC (rev 11861)
@@ -5,6 +5,7 @@
             /usr/share/java/slf4j-api.jar:\
             /usr/share/java/commons-digester.jar:\
             /usr/share/java/ognl.jar:\
+            /usr/share/java/mvel2.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:\

Modified: trunk/tiles/debian/build.xml
===================================================================
--- trunk/tiles/debian/build.xml	2010-03-13 21:37:22 UTC (rev 11860)
+++ trunk/tiles/debian/build.xml	2010-03-14 08:14:31 UTC (rev 11861)
@@ -32,6 +32,7 @@
     <cleanmodule dir="src/tiles-core"/>
     <cleanmodule dir="src/tiles-el"/>
     <cleanmodule dir="src/tiles-ognl"/>
+    <cleanmodule dir="src/tiles-mvel"/>
     <cleanmodule dir="src/tiles-compat"/>
     <cleanmodule dir="src/tiles-servlet"/>
     <cleanmodule dir="src/tiles-servlet-wildcard"/>
@@ -46,6 +47,7 @@
     <packagemodule dir="src/tiles-core"/>
     <packagemodule dir="src/tiles-el"/>
     <packagemodule dir="src/tiles-ognl"/>
+    <packagemodule dir="src/tiles-mvel"/>
     <packagemodule dir="src/tiles-compat"/>
     <packagemodule dir="src/tiles-servlet"/>
     <packagemodule dir="src/tiles-servlet-wildcard"/>
@@ -60,6 +62,7 @@
       <packageset dir="src/tiles-core/src/main/java/"/>
       <packageset dir="src/tiles-el/src/main/java/"/>
       <packageset dir="src/tiles-ognl/src/main/java/"/>
+      <packageset dir="src/tiles-mvel/src/main/java/"/>
       <packageset dir="src/tiles-compat/src/main/java/"/>
       <packageset dir="src/tiles-servlet/src/main/java/"/>
       <packageset dir="src/tiles-servlet-wildcard/src/main/java/"/>

Modified: trunk/tiles/debian/changelog
===================================================================
--- trunk/tiles/debian/changelog	2010-03-13 21:37:22 UTC (rev 11860)
+++ trunk/tiles/debian/changelog	2010-03-14 08:14:31 UTC (rev 11861)
@@ -1,3 +1,12 @@
+tiles (2.2.1-2) unstable; urgency=low
+
+  * New module: tiles-mvel
+  * Add Build-Depends on libmvel-java
+  * Add mvel.jar to debian/build.properties
+  * Bump Standards-Version to 3.8.4: no changes needed
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 13 Mar 2010 22:49:46 +0100
+
 tiles (2.2.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/tiles/debian/control
===================================================================
--- trunk/tiles/debian/control	2010-03-13 21:37:22 UTC (rev 11860)
+++ trunk/tiles/debian/control	2010-03-14 08:14:31 UTC (rev 11861)
@@ -6,8 +6,8 @@
 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
+ libfreemarker-java, maven-repo-helper, libmvel-java
+Standards-Version: 3.8.4
 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/
@@ -16,7 +16,7 @@
 Architecture: all
 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
+ libspring-core-2.5-java, libspring-web-2.5-java, libmvel-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/libtiles-java.poms
===================================================================
--- trunk/tiles/debian/libtiles-java.poms	2010-03-13 21:37:22 UTC (rev 11860)
+++ trunk/tiles/debian/libtiles-java.poms	2010-03-14 08:14:31 UTC (rev 11861)
@@ -3,6 +3,7 @@
 src/tiles-core/pom.xml
 src/tiles-el/pom.xml
 src/tiles-ognl/pom.xml
+src/tiles-mvel/pom.xml
 src/tiles-compat/pom.xml
 src/tiles-servlet/pom.xml
 src/tiles-servlet-wildcard/pom.xml

Modified: trunk/tiles/debian/rules
===================================================================
--- trunk/tiles/debian/rules	2010-03-13 21:37:22 UTC (rev 11860)
+++ trunk/tiles/debian/rules	2010-03-14 08:14:31 UTC (rev 11861)
@@ -13,7 +13,7 @@
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 API_DOCS             := build/api
 
-MODULES = api core el ognl compat servlet servlet-wildcard template jsp freemarker
+MODULES = api core el ognl mvel compat servlet servlet-wildcard template jsp freemarker
 
 binary-post-install/lib$(PACKAGE)-java::
 	mh_installpoms -plib$(PACKAGE)-java