Lintian Fixes - velocity-tools
Recent merge proposals
Ready changes
Summary
- Trim trailing whitespace. ( trailing-whitespace )
- Use secure URI in Homepage field. ( homepage-field-uses-insecure-uri )
- Bump debhelper from old 10 to 13. ( package-uses-old-debhelper-compat-version )
- Set debhelper-compat version in Build-Depends. ( uses-debhelper-compat-file )
- Remove unnecessary get-orig-source-target. ( debian-rules-contains-unnecessary-get-orig-source-target )
Failed fixers:
See the worker log for details.
Diff
diff --git a/debian/changelog b/debian/changelog
index a90b419..3879046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+velocity-tools (2.0-9) UNRELEASED; urgency=medium
+
+ * Trim trailing whitespace.
+ * Use secure URI in Homepage field.
+ * Bump debhelper from old 10 to 13.
+ * Set debhelper-compat version in Build-Depends.
+ * Remove unnecessary get-orig-source-target.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 30 Dec 2022 11:50:39 -0000
+
velocity-tools (2.0-8) unstable; urgency=high
* Team upload.
@@ -104,7 +114,7 @@ velocity-tools (1.4-3) unstable; urgency=low
- 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
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 3d6f12a..dabf9a0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
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 (= 13), default-jdk
Build-Depends-Indep: ant-optional,
antlr,
junit4,
@@ -21,7 +21,7 @@ Build-Depends-Indep: ant-optional,
Standards-Version: 4.1.1
Vcs-Git: https://salsa.debian.org/java-team/velocity-tools.git
Vcs-Browser: https://salsa.debian.org/java-team/velocity-tools
-Homepage: http://velocity.apache.org/tools/
+Homepage: https://velocity.apache.org/tools/
Package: libvelocity-tools-java
Architecture: all
diff --git a/debian/rules b/debian/rules
index 0a24c53..19f648f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,3 @@ override_dh_auto_clean:
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/