Emmanuel Bourg pushed to branch master at Debian Java Maintainers / tiles-autotag
Commits: 6a28053c by Emmanuel Bourg at 2026-11-05T16:29:25+01:00 Fixed the build failure with Velocity 2.x - - - - - f6cfffd6 by Emmanuel Bourg at 2026-11-05T16:29:44+01:00 Standards-Version updated to 4.7.4 - - - - - 5ceb411b by Emmanuel Bourg at 2026-11-05T16:29:44+01:00 Removed the Priority field - - - - - 78b4f067 by Emmanuel Bourg at 2026-11-05T16:29:44+01:00 Removed the Rules-Requires-Root field - - - - - 30dbdb39 by Emmanuel Bourg at 2026-11-05T17:23:19+01:00 Converted debian/watch to the version 5 format - - - - - 5198d552 by Emmanuel Bourg at 2026-11-05T17:23:19+01:00 Upload to unstable - - - - - 6 changed files: - debian/changelog - debian/control - − debian/orig-tar.sh - + debian/patches/05-velocity-2-templates.patch - debian/patches/series - debian/watch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +tiles-autotag (1.2-6) unstable; urgency=medium + + * Fixed the build failure with Velocity 2.x + * Standards-Version updated to 4.7.4 + * Removed the Priority field + * Removed the Rules-Requires-Root field + * Converted debian/watch to the version 5 format + + -- Emmanuel Bourg <[email protected]> Thu, 05 Nov 2026 16:29:44 +0100 + tiles-autotag (1.2-5) unstable; urgency=medium * Team upload ===================================== debian/control ===================================== @@ -1,6 +1,5 @@ Source: tiles-autotag Section: java -Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Emmanuel Bourg <[email protected]> @@ -18,11 +17,10 @@ Build-Depends: libxstream-java, maven-debian-helper (>= 1.5), velocity -Standards-Version: 4.6.2 +Standards-Version: 4.7.4 Vcs-Git: https://salsa.debian.org/java-team/tiles-autotag.git Vcs-Browser: https://salsa.debian.org/java-team/tiles-autotag Homepage: https://tiles.apache.org/tiles-autotag/ -Rules-Requires-Root: no Package: libtiles-autotag-java Architecture: all ===================================== debian/orig-tar.sh deleted ===================================== @@ -1,20 +0,0 @@ -#!/bin/sh -e -# -# Removes unwanted content from the upstream sources. -# Called by uscan with '--upstream-version' <version> <file> -# - -VERSION=$2 -TAR=../tiles-autotag_$VERSION.orig.tar.xz -DIR=tiles-autotag-$VERSION -TAG=$(echo "tiles-autotag-$VERSION" | sed -re's/~(alpha|beta|rc)/-\1-/') - -svn export http://svn.apache.org/repos/asf/tiles/autotag/tags/${TAG}/ $DIR -XZ_OPT=--best tar -c -J -f $TAR --exclude '*.jar' --exclude '*.class' $DIR -rm -rf $DIR ../$TAG - -# move to directory 'tarballs' -if [ -r .svn/deb-layout ]; then - . .svn/deb-layout - mv $TAR $origDir && echo "moved $TAR to $origDir" -fi ===================================== debian/patches/05-velocity-2-templates.patch ===================================== @@ -0,0 +1,22 @@ +Description: Fix the templates with Velocity 2.x ($velocityCount was replaced by + $foreach.count and the whitespace handling of Velocity 1.7 has to be enabled) +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/tiles-autotag-core/src/main/resources/org/apache/tiles/autotag/velocity.properties ++++ b/tiles-autotag-core/src/main/resources/org/apache/tiles/autotag/velocity.properties +@@ -113,3 +113,6 @@ + # ---------------------------------------------------------------------------- + resource.manager.class = org.apache.velocity.runtime.resource.ResourceManagerImpl + resource.manager.cache.class = org.apache.velocity.runtime.resource.ResourceCacheImpl ++ ++# Keep the whitespace handling of Velocity 1.7 ++parser.space_gobbling = bc +--- a/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityProperties.vm ++++ b/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityProperties.vm +@@ -18,5 +18,5 @@ + * specific language governing permissions and limitations + * under the License. + *## This file was automatically generated by Apache Tiles Autotag. +-userdirective=#foreach($clazz in ${suite.getTemplateClasses()})#if($velocityCount > 1),\ ++userdirective=#foreach($clazz in ${suite.getTemplateClasses()})#if($foreach.count > 1),\ + #{end}${packageName}.${clazz.tagClassPrefix}Directive#end ===================================== debian/patches/series ===================================== @@ -3,3 +3,4 @@ 03-reproducibility.patch 04-maven-compatibility.patch xstream-whitelist-extension.patch +05-velocity-2-templates.patch ===================================== debian/watch ===================================== @@ -1,4 +1,5 @@ -version=3 -opts="uversionmangle=s/-(alpha|beta|rc)(-)?/~$1$2/" \ - http://svn.apache.org/repos/asf/tiles/autotag/tags/ \ - tiles-autotag-(\d.*)/ debian debian/orig-tar.sh +Version: 5 +Mode: svn +Source: https://svn.apache.org/repos/asf/tiles/autotag/tags/ +Matching-Pattern: tiles-autotag-([\d.]+)/ +Compression: xz View it on GitLab: https://salsa.debian.org/java-team/tiles-autotag/-/compare/620871360da5f5f59500d0310327b5f4efcb162e...5198d5523bdf6d1f44049f815eb50df806e948aa -- View it on GitLab: https://salsa.debian.org/java-team/tiles-autotag/-/compare/620871360da5f5f59500d0310327b5f4efcb162e...5198d5523bdf6d1f44049f815eb50df806e948aa You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

