diff -Nru tiles-2.2.2/debian/changelog tiles-2.2.2/debian/changelog --- tiles-2.2.2/debian/changelog 2010-07-01 01:12:21.000000000 +0200 +++ tiles-2.2.2/debian/changelog 2010-10-26 16:14:01.000000000 +0200 @@ -1,3 +1,10 @@ +tiles (2.2.2-1ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #666788). Remaining changes: + - Build-depend/suggest libmvel2-java instead of libmvel-java. + + -- Angel Abad Tue, 26 Oct 2010 16:13:58 +0200 + tiles (2.2.2-1) unstable; urgency=low [ Torsten Werner ] @@ -10,6 +17,12 @@ -- Damien Raude-Morvan Thu, 01 Jul 2010 01:12:16 +0200 +tiles (2.2.1-2ubuntu1) maverick; urgency=low + + * Build-depend/suggest libmvel2-java instead of libmvel-java. + + -- Matthias Klose Wed, 29 Sep 2010 20:36:07 +0200 + tiles (2.2.1-2) unstable; urgency=low * New module: tiles-mvel @@ -66,3 +79,4 @@ * debian/build.xml: remove Javadoc API of Portlet module (build disabled) -- Damien Raude-Morvan Sat, 21 Mar 2009 22:35:52 +0100 + diff -Nru tiles-2.2.2/debian/control tiles-2.2.2/debian/control --- tiles-2.2.2/debian/control 2010-07-01 01:12:49.000000000 +0200 +++ tiles-2.2.2/debian/control 2010-10-26 16:09:32.000000000 +0200 @@ -1,12 +1,13 @@ Source: tiles Section: java Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Damien Raude-Morvan 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, libmvel-java + libfreemarker-java, maven-repo-helper, libmvel2-java Standards-Version: 3.9.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tiles/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tiles/ @@ -16,7 +17,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, libmvel-java + libspring-core-2.5-java, libspring-web-2.5-java, libmvel2-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