Lintian Fixes - velocity-tools

Ready changes

Merge these changes:

git pull https://janitor.debian.net/git/velocity-tools lintian-fixes

Summary

Diff

=== modified file 'debian/changelog'
--- a/debian/changelog	2017-10-13 22:46:27 +0000
+++ b/debian/changelog	2020-06-10 16:57:58 +0000
@@ -1,3 +1,15 @@
+velocity-tools (2.0-8) UNRELEASED; urgency=low
+
+  * Trim trailing whitespace.
+  * Use secure URI in Homepage field.
+  * Bump debhelper from old 10 to 12.
+  * Set debhelper-compat version in Build-Depends.
+  * Update Vcs-* headers from URL redirect.
+  * Use canonical URL in Vcs-Git.
+  * Remove unnecessary get-orig-source-target.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 10 Jun 2020 16:52:31 -0000
+
 velocity-tools (2.0-7) unstable; urgency=medium
 
   * Team upload.
@@ -95,7 +107,7 @@
     - Add a README.source to describe patch system
   * Build-Depends on default-jdk instead of default-jdk-builddep
     because we don't build a native GCJ package.
-  * Install api documentation to /usr/share/doc/libvelocity-tools-java/api/ 
+  * Install api documentation to /usr/share/doc/libvelocity-tools-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

=== removed file 'debian/compat'
--- a/debian/compat	2017-10-13 21:54:41 +0000
+++ b/debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-10

=== modified file 'debian/control'
--- a/debian/control	2017-10-13 22:37:38 +0000
+++ b/debian/control	2020-06-10 16:57:05 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib@debian.org>
-Build-Depends: ant, debhelper (>= 10), default-jdk
+Build-Depends: ant, debhelper-compat (= 12), default-jdk
 Build-Depends-Indep: ant-optional,
                      antlr,
                      junit4,
@@ -19,9 +19,9 @@
                      maven-repo-helper,
                      velocity
 Standards-Version: 4.1.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/velocity-tools.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/velocity-tools.git
-Homepage: http://velocity.apache.org/tools/
+Vcs-Git: https://salsa.debian.org/java-team/velocity-tools.git
+Vcs-Browser: https://salsa.debian.org/java-team/velocity-tools
+Homepage: https://velocity.apache.org/tools/
 
 Package: libvelocity-tools-java
 Architecture: all

=== modified file 'debian/rules'
--- a/debian/rules	2017-10-13 22:37:38 +0000
+++ b/debian/rules	2020-06-10 16:57:58 +0000
@@ -35,7 +35,3 @@
 	dh_auto_clean
 	-rm -rf debian/tmp
 	mh_clean
-
-# Rename content directory to velocity-tools-X.Y in orig.tar.gz
-get-orig-source:
-	uscan --force-download --rename --repack

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/Error.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/VM_global_library.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/WEB-INF/src/LayoutLinkTool.java
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/WEB-INF/src/MySearchTool.java
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/WEB-INF/src/file.xml
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/WEB-INF/src/otherStuff.properties
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/WEB-INF/src/resources.properties
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/WEB-INF/src/resources_de.properties
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/WEB-INF/src/resources_fr.properties
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/WEB-INF/tools.xml
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/WEB-INF/velocity.properties
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/WEB-INF/web.xml
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/alternator.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/browser.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/class.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/context.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/convert.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/cookies.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/date.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/demo.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/display.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/esc.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/field.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/footer.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/fullDemo.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/header.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/import.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/include.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/index.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/layout/Default.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/layout/Print.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/layout/Simple.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/layout/Table.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/layout/layout.css
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/layoutmenu.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/link.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/lists.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/loop.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/math.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/mill.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/number.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/pager.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/params.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/render.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/search.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/sorter.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/template.txt
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/text.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/toolmenu.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/showcase/xml.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/simple/META-INF/MANIFEST.MF
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/simple/WEB-INF/src/ToyTool.java
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/simple/WEB-INF/tools.xml
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/simple/WEB-INF/web.xml
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/simple/index.jsp
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java/examples/simple/index.vm

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/Error.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/VM_global_library.vm.gz
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/WEB-INF/src/LayoutLinkTool.java
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/WEB-INF/src/MySearchTool.java
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/WEB-INF/src/file.xml
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/WEB-INF/src/otherStuff.properties
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/WEB-INF/src/resources.properties.gz
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/WEB-INF/src/resources_de.properties
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/WEB-INF/src/resources_fr.properties
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/WEB-INF/tools.xml
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/WEB-INF/velocity.properties
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/WEB-INF/web.xml
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/alternator.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/browser.vm.gz
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/class.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/context.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/convert.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/cookies.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/date.vm.gz
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/demo.vm.gz
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/display.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/esc.vm.gz
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/field.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/footer.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/fullDemo.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/header.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/import.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/include.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/index.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/layout/Default.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/layout/Print.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/layout/Simple.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/layout/Table.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/layout/layout.css
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/layoutmenu.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/link.vm.gz
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/lists.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/loop.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/math.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/mill.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/number.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/pager.vm.gz
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/params.vm.gz
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/render.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/search.vm.gz
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/sorter.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/template.txt
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/text.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/toolmenu.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/showcase/xml.vm
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/simple/META-INF/MANIFEST.MF
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/simple/WEB-INF/src/ToyTool.java
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/simple/WEB-INF/tools.xml
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/simple/WEB-INF/web.xml
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/simple/index.jsp
-rw-r--r--  root/root   /usr/share/doc/libvelocity-tools-java-doc/examples/simple/index.vm

Control files of package libvelocity-tools-java: lines which differ (wdiff format)

  • Homepage: http://velocity.apache.org/tools/ https://velocity.apache.org/tools/

Control files of package libvelocity-tools-java-doc: lines which differ (wdiff format)

  • Homepage: http://velocity.apache.org/tools/ https://velocity.apache.org/tools/

Run locally

Try this locally (using the lintian-brush package):

debcheckout velocity-tools
cd velocity-tools
lintian-brush --exclude=upstream-metadata-file

More details

Full run details