diff -Nru velocity-1.7/debian/BROKEN-velocity-doc.doc-base.2 velocity-1.7/debian/BROKEN-velocity-doc.doc-base.2 --- velocity-1.7/debian/BROKEN-velocity-doc.doc-base.2 2021-03-17 04:07:58.000000000 +0000 +++ velocity-1.7/debian/BROKEN-velocity-doc.doc-base.2 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -Document: velocity2 -Title: Documentation for velocity -Author: The Apache Velocity Development Team -Abstract: This is the manual of Velocity, a Java-based template engine. - It permits anyone to use the simple yet powerful template language to - reference objects defined in Java code. -Section: Programming - -Format: HTML -Index: /usr/share/doc/velocity-doc/index.html -Files: /usr/share/doc/velocity-doc/*.html diff -Nru velocity-1.7/debian/changelog velocity-1.7/debian/changelog --- velocity-1.7/debian/changelog 2021-03-17 04:07:58.000000000 +0000 +++ velocity-1.7/debian/changelog 2024-01-03 10:33:01.000000000 +0000 @@ -1,3 +1,15 @@ +velocity (1.7-7) unstable; urgency=medium + + * Team upload. + * Depend on libservlet-api-java instead of libservlet3.1-java + * Removed the velocity-doc package + * Standards-Version updated to 4.6.2 + * Switch to debhelper level 13 + * Removed Brian Thomason from the uploaders + * Track the new release from GitHub + + -- Emmanuel Bourg Wed, 03 Jan 2024 11:33:01 +0100 + velocity (1.7-6) unstable; urgency=high * Team upload. diff -Nru velocity-1.7/debian/compat velocity-1.7/debian/compat --- velocity-1.7/debian/compat 2021-03-17 04:07:58.000000000 +0000 +++ velocity-1.7/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru velocity-1.7/debian/control velocity-1.7/debian/control --- velocity-1.7/debian/control 2021-03-17 04:07:58.000000000 +0000 +++ velocity-1.7/debian/control 2024-01-03 10:18:57.000000000 +0000 @@ -2,30 +2,24 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers -Uploaders: Ludovic Claude , - Brian Thomason -Build-Depends: debhelper (>= 9), - default-jdk, - maven-debian-helper (>= 1.4) -Build-Depends-Indep: ant, - ant-doc, - default-jdk-doc, - junit, - libcommons-collections3-java, - libcommons-lang-java, - libcommons-logging-java, - libcommons-logging-java-doc, - libexcalibur-logger-java, - libhsqldb-java, - libjdom1-java (>= 1.0), - libjdom1-java-doc, - liblog4j1.2-java, - liblog4j1.2-java-doc, - libmaven-javadoc-plugin-java, - liboro-java, - libservlet3.1-java, - libwerken.xpath-java -Standards-Version: 3.9.8 +Uploaders: Ludovic Claude +Build-Depends: + ant, + debhelper-compat (= 13), + default-jdk, + junit, + libcommons-collections3-java, + libcommons-lang-java, + libcommons-logging-java, + libexcalibur-logger-java, + libhsqldb-java, + libjdom1-java (>= 1.0), + liblog4j1.2-java, + liboro-java, + libservlet-api-java, + libwerken.xpath-java, + maven-debian-helper (>= 1.4) +Standards-Version: 4.6.2 Vcs-Git: https://salsa.debian.org/java-team/velocity.git Vcs-Browser: https://salsa.debian.org/java-team/velocity Homepage: http://velocity.apache.org/ @@ -34,7 +28,6 @@ Architecture: all Depends: ${maven:Depends}, ${misc:Depends} Recommends: ${maven:OptionalDepends} -Suggests: velocity-doc Description: Java-based template engine for web application Velocity is a Java-based template engine. It permits anyone to use the simple yet powerful template language to reference objects @@ -47,16 +40,3 @@ code from the web pages, making the web site more maintainable over the long run and providing a viable alternative to Java Server Pages (JSPs) or PHP. - -Package: velocity-doc -Architecture: all -Section: doc -Depends: ${maven:DocDepends}, ${misc:Depends} -Recommends: ${maven:DocOptionalDepends} -Suggests: velocity -Description: Documentation for velocity - Velocity is a Java-based template engine which is useful to develop - Model-View-Controller (MVC) model web application. It permits anyone - to use the simple yet powerful template language to reference objects - defined in Java code. This package provides documents and examples for - velocity. diff -Nru velocity-1.7/debian/copyright velocity-1.7/debian/copyright --- velocity-1.7/debian/copyright 2021-03-17 04:07:58.000000000 +0000 +++ velocity-1.7/debian/copyright 2024-01-03 10:03:38.000000000 +0000 @@ -13,8 +13,8 @@ Bob McWhirter bob@werken.com Terence Parr parrt@jguru.com Geir Magnusson Jr. geirm@optonline.net - John Castura jcastura@kw.igs.net - Leon Messerschmidt leon@opticode.co.za + John Castura jcastura@kw.igs.net + Leon Messerschmidt leon@opticode.co.za Copyright: 2001-2009 The Apache Software Foundation @@ -38,35 +38,35 @@ Copyright (c) 2001 The Apache Software Foundation. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + 3. The end-user documentation included with the redistribution, if any, must include the following acknowlegement: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowlegement may appear in the software itself, if and wherever such third-party acknowlegements normally appear. - + 4. The names "The Jakarta Project", "Velocity", and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact apache@apache.org. - + 5. Products derived from this software may not be called "Apache" nor may "Apache" appear in their names without prior written permission of the Apache Group. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff -Nru velocity-1.7/debian/maven.rules velocity-1.7/debian/maven.rules --- velocity-1.7/debian/maven.rules 2021-03-17 04:07:58.000000000 +0000 +++ velocity-1.7/debian/maven.rules 2024-01-03 10:18:57.000000000 +0000 @@ -25,4 +25,4 @@ s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * * log4j log4j * s/1\.2\..*/1.2.x/ * * s/ant/org.apache.ant/ * * s/.*/debian/ * * -javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * * +javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/debian/ * * diff -Nru velocity-1.7/debian/orig-tar.sh velocity-1.7/debian/orig-tar.sh --- velocity-1.7/debian/orig-tar.sh 2021-03-17 04:07:58.000000000 +0000 +++ velocity-1.7/debian/orig-tar.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -#!/bin/sh -e - -VERSION=$2 -TAR=../velocity_$VERSION.orig.tar.gz -DIR=velocity-$VERSION -TAG=$2 - -svn export http://svn.apache.org/repos/asf/velocity/engine/tags/$TAG $DIR -tar -c -z -f $TAR --exclude 'ivy*.jar' $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 diff -Nru velocity-1.7/debian/rules velocity-1.7/debian/rules --- velocity-1.7/debian/rules 2021-03-17 04:07:58.000000000 +0000 +++ velocity-1.7/debian/rules 2024-01-03 10:15:29.000000000 +0000 @@ -1,7 +1,4 @@ #!/usr/bin/make -f %: - dh $@ --buildsystem=maven - -get-orig-source: - uscan --download-current-version --force-download --rename + dh $@ diff -Nru velocity-1.7/debian/velocity-doc.doc-base.1 velocity-1.7/debian/velocity-doc.doc-base.1 --- velocity-1.7/debian/velocity-doc.doc-base.1 2021-03-17 04:07:58.000000000 +0000 +++ velocity-1.7/debian/velocity-doc.doc-base.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -Document: velocity1 -Title: Programmer API for velocity -Author: The Apache Velocity Development Team -Abstract: This is the javadoc API of Velocity, a Java-based template engine. - It permits anyone to use the simple yet powerful template language to - reference objects defined in Java code. -Section: Programming - -Format: HTML -Index: /usr/share/doc/velocity/api/index.html -Files: /usr/share/doc/velocity/api/*.html diff -Nru velocity-1.7/debian/velocity-doc.docs velocity-1.7/debian/velocity-doc.docs --- velocity-1.7/debian/velocity-doc.docs 2021-03-17 04:07:58.000000000 +0000 +++ velocity-1.7/debian/velocity-doc.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -#target/docs/*.html -#target/docs/*.css -#target/docs/images -#target/docs/translations diff -Nru velocity-1.7/debian/velocity-doc.examples velocity-1.7/debian/velocity-doc.examples --- velocity-1.7/debian/velocity-doc.examples 2021-03-17 04:07:58.000000000 +0000 +++ velocity-1.7/debian/velocity-doc.examples 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -examples/README.txt -examples/app_example1 -examples/app_example2 -examples/logger_example -examples/xmlapp_example -examples/event_example -examples/context_example diff -Nru velocity-1.7/debian/velocity-doc.install velocity-1.7/debian/velocity-doc.install --- velocity-1.7/debian/velocity-doc.install 2021-03-17 04:07:58.000000000 +0000 +++ velocity-1.7/debian/velocity-doc.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -target/apidocs/* usr/share/doc/velocity/api - diff -Nru velocity-1.7/debian/watch velocity-1.7/debian/watch --- velocity-1.7/debian/watch 2021-03-17 04:07:58.000000000 +0000 +++ velocity-1.7/debian/watch 2024-01-03 10:29:48.000000000 +0000 @@ -1,6 +1,3 @@ -version=3 - -opts=uversionmangle=s/-(alpha|beta)/~$1/ \ - http://svn.apache.org/repos/asf/velocity/engine/tags/ \ - ([1-9].*)/ debian debian/orig-tar.sh - +version=4 +opts=mode=git,repack +https://github.com/apache/velocity-engine refs/tags/([\d.]+)