Lintian Fixes - plm

Ready changes

Merge these changes:

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

Summary

Diff

diff --git a/debian/changelog b/debian/changelog
index 7a77328..e164225 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+plm (2.6+repack-4) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Don't specify --with=quilt, since package uses '3.0 (quilt)' source
+    format.
+  * Use secure URI in Homepage field.
+  * Bump debhelper from deprecated 8 to 12.
+  * Set debhelper-compat version in Build-Depends.
+  * Change priority extra to priority optional.
+  * Update Vcs-* headers to use salsa repository.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 19 Nov 2019 21:44:18 +0000
+
 plm (2.6+repack-3) unstable; urgency=medium
 
   * Add run-time dependencies on default-jdk, jython and jruby.
@@ -24,7 +37,7 @@ plm (2.6+repack-1) unstable; urgency=medium
     - New lesson on Hanoi variations, on recursive decomposition
     - Various improvements to the pedagogical content and bug fixes
 
-  * Enable scala teaching, now that Scala 2.11 is in Debian 
+  * Enable scala teaching, now that Scala 2.11 is in Debian
     (Fix: #809482) Thanks Rogério Brito for the reminder.
   * Use ant instead of jh_build, that doesn't like our scala code.
 
@@ -32,7 +45,7 @@ plm (2.6+repack-1) unstable; urgency=medium
 
 plm (2.4.11+repack-2) unstable; urgency=medium
 
-  * Specify to jh_build that javac will encounter UTF-8 files 
+  * Specify to jh_build that javac will encounter UTF-8 files
     (Closes: #768732) Thanks to L. Nussbaum for the report and fix
   * Update Standards-Version to 3.9.6 (no change needed)
   * Remove Scala from package description and rules (Closes: #722148)
@@ -125,7 +138,7 @@ plm (2.2.1+repack-1) unstable; urgency=low
 
 plm (2.2+repack-1) unstable; urgency=low
 
-  * New upstream release: 
+  * New upstream release:
     - the software was renamed from JLM to PLM.
     - Scala can now be used to solve the exercises
     - Two new lessons: recreative applications of sorting,
@@ -140,7 +153,7 @@ plm (2.2+repack-1) unstable; urgency=low
 
 jlm (2.0+repack-1) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
     - Refresh our patches.
   * d/p/system-ant-tasks: use system jarfiles for ant tasks definitions
   * d/p/review-french: integrate a post-release upstream patch that
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 45a4fb7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/debian/control b/debian/control
index 1f24456..9df9b94 100644
--- a/debian/control
+++ b/debian/control
@@ -1,30 +1,30 @@
 Source: plm
 Section: java
-Priority: extra
+Priority: optional
 Maintainer: Martin Quinson <mquinson@debian.org>
-Build-Depends: debhelper (>> 8), javahelper (>= 0.32), ant, quilt
+Build-Depends: debhelper-compat (= 12), javahelper (>= 0.32), ant, quilt
 Build-Depends-Indep: default-jdk, scala, libmiglayout-java, librsyntaxtextarea-java,
   junit4, libgettext-commons-java, libjson-simple-java, libhttpclient-java, libhttpmime-java, libjgit-java,
   jython, libgettext-ant-tasks-java, imagemagick,
   libmockito-java
 Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/plm.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/plm.git
-Homepage: http://www.loria.fr/~quinson/Teaching/PLM/
+Vcs-Git: https://salsa.debian.org/mquinson/plm.git
+Vcs-Browser: https://salsa.debian.org/mquinson/plm
+Homepage: https://www.loria.fr/~quinson/Teaching/PLM/
 
 Package: plm
 Architecture: all
 Depends: java-wrappers, ${java:Depends}, ${misc:Depends}, libhttpmime-java,
-  default-jdk, jruby, jython, 
+  default-jdk, jruby, jython,
 Recommends: ${java:Recommends}
 Description: Programming exerciser in Java, Python, Scala and others
  The Programmer's Learning Machine (PLM) is a free cross-platform programming
- exerciser. It lets you explore various concepts of programming through 
- over 200 interactive exercises, that you can solve in either Java, 
+ exerciser. It lets you explore various concepts of programming through
+ over 200 interactive exercises, that you can solve in either Java,
  Python or Scala.
  .
  The PLM interface and content is thoughtfully translated to English,
- French and Brazilian; Other translations may be added in the future. 
+ French and Brazilian; Other translations may be added in the future.
  .
  The following concepts are included in this package:
  .
diff --git a/debian/rules b/debian/rules
index 8aac150..7dd65d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ httppath=/usr/share/java/httpclient.jar:/usr/share/java/httpcore.jar:/usr/share/
 export CLASSPATH=$(depspath):$(gitpath):$(langpath):$(httppath):$(scalapath):.
 
 %:
-	dh  $@  --with javahelper --with quilt
+	dh $@   --with javahelper
 
 override_dh_auto_install:
 	dh_install
@@ -35,7 +35,7 @@ override_dh_auto_install:
 	# desktop
 	install -D -m 644 debian/plm.desktop $(DESTDIR)/usr/share/applications/plm.desktop
 		
-	# wrapper script 
+	# wrapper script
 	install -d -m 755 $(DESTDIR)/usr/bin
 	cp debian/plm.sh $(DESTDIR)/usr/bin/plm
 	chmod 755 $(DESTDIR)/usr/bin/plm
@@ -46,7 +46,7 @@ wrkdir:=$(shell pwd)
 
 get-orig-source:
 	rm -f ${wrkdir}/../plm_${version}+repack.orig.tar.gz
-	rm -f ${wrkdir}/../plm_${version}.orig.tar.gz 
+	rm -f ${wrkdir}/../plm_${version}.orig.tar.gz
 	uscan --verbose --force-download && cp ../${version}.tar.gz ${tmpdir} || true
 	set +ex; cd ${tmpdir} && \
 	    tar xf ${version}.tar.gz && rm -f ${version}.tar.gz && \

Run locally

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

debcheckout plm
cd plm
lintian-brush

More details

Full run details