Lintian Fixes - velocity

Ready changes

Merge these changes:

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

Summary

Diff

=== modified file 'debian/changelog'
--- a/debian/changelog	2016-06-21 14:14:04 +0000
+++ b/debian/changelog	2020-06-10 16:44:04 +0000
@@ -1,3 +1,16 @@
+velocity (1.7-6) UNRELEASED; urgency=low
+
+  * Trim trailing whitespace.
+  * Use secure URI in debian/watch.
+  * Use secure URI in Homepage field.
+  * Bump debhelper from deprecated 9 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:39:11 -0000
+
 velocity (1.7-5) unstable; urgency=medium
 
   * Team upload.
@@ -99,21 +112,21 @@
   * Move debhelper and cdbs from Build-Depends-Indep to Build-Depends to
     clear Lintian error
   * Use openjdk-6-jdk instead of kaffe for the build
-  * Use default-jre-headless | java1-runtime-headless | java2-runtime-headless 
-    instead of kaffe | java1-runtime | java2-runtime for velocity Depends: 
+  * Use default-jre-headless | java1-runtime-headless | java2-runtime-headless
+    instead of kaffe | java1-runtime | java2-runtime for velocity Depends:
   * Update from libjdom0-java to libjdom1-java (Closes: #500536)
   * Update from libcommons-collections-java to libcommons-collections3-java
   * Add quilt to Build-Depends and use it to patch build.xml file to avoid
     downloading jar files from the internet while building the documentation
-  * Add a dependency on libcommons-lang-java, libcommons-logging-java, 
+  * Add a dependency on libcommons-lang-java, libcommons-logging-java,
     liboro-java
   * Update from libservlet2.3-java to libservlet2.5-java
   * Move liblogkit-java, liblog4j1.2-java, libservlet2.5-java,
     libwerken.xpath-java from Depends to Recommends
   * Move ant from Depends to Suggest (Closes: #532640)
-  * Create a antlib definition for the tasks anakia and texen, and add 
-    the classpath information to the manifest in velocity.jar . This 
-    removes the need to install jar links under /usr/share/ant/lib, which 
+  * Create a antlib definition for the tasks anakia and texen, and add
+    the classpath information to the manifest in velocity.jar . This
+    removes the need to install jar links under /usr/share/ant/lib, which
     have been removed. (Closes: #506018)
   * Add watch file
   * Remove all patches as they don't apply anymore and seem irrelevent now
@@ -121,7 +134,7 @@
   * Add a Build-Depends-Indep dependency on maven-repo-helper
   * Use mh_installpom and mh_installjar to install the POM and the jar to the
     Maven repository
-  * Disable the user docs as it requires the use of a Maven plugin to generate 
+  * Disable the user docs as it requires the use of a Maven plugin to generate
     them. Put the old control files in debian/old folder
   * Remove the full text of the Apache 2.0 license
   * Fix some Lintian warnings: add ${misc:Depends}, add copyright notice.

=== removed file 'debian/compat'
--- a/debian/compat	2016-06-21 13:49:17 +0000
+++ b/debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-9

=== modified file 'debian/control'
--- a/debian/control	2016-06-21 14:13:57 +0000
+++ b/debian/control	2020-06-10 16:43:25 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude@laposte.net>,
            Brian Thomason <brian.thomason@eucalyptus.com>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper-compat (= 12),
                default-jdk,
                maven-debian-helper (>= 1.4)
 Build-Depends-Indep: ant,
@@ -26,9 +26,9 @@
                      libservlet3.1-java,
                      libwerken.xpath-java
 Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/velocity.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/velocity.git
-Homepage: http://velocity.apache.org/
+Vcs-Git: https://salsa.debian.org/java-team/velocity.git
+Vcs-Browser: https://salsa.debian.org/java-team/velocity
+Homepage: https://velocity.apache.org/
 
 Package: velocity
 Architecture: all

=== modified file 'debian/rules'
--- a/debian/rules	2016-06-21 13:48:49 +0000
+++ b/debian/rules	2020-06-10 16:44:04 +0000
@@ -2,6 +2,3 @@
 
 %:
 	dh $@ --buildsystem=maven
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename

=== modified file 'debian/watch'
--- a/debian/watch	2011-09-15 08:18:54 +0000
+++ b/debian/watch	2020-06-10 16:40:08 +0000
@@ -1,6 +1,6 @@
 version=3
 
 opts=uversionmangle=s/-(alpha|beta)/~$1/ \
-  http://svn.apache.org/repos/asf/velocity/engine/tags/ \
+  https://svn.apache.org/repos/asf/velocity/engine/tags/ \
   ([1-9].*)/ debian debian/orig-tar.sh
 

Run locally

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

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

More details

Full run details