Merge lp:~debian-janitor/friendly-recovery/lintian-fixes into lp:~ubuntu-core-dev/friendly-recovery/ubuntu

[Debian Janitor]

Fix lintian issues: Add missing build dependency on dh addon., Bump debhelper from old 10 to 12., Set debhelper-compat version in Build-Depends., Trim trailing whitespace., Use secure URI in Vcs control header Vcs-Bzr.

Fix some issues reported by lintian
* Trim trailing whitespace. (file-contains-trailing-whitespace)
* Add missing build dependency on dh addon. (missing-build-dependency-for-dh-addon)
* Bump debhelper from old 10 to 12. (package-uses-old-debhelper-compat-version)
* Set debhelper-compat version in Build-Depends. (uses-debhelper-compat-file)
* Use secure URI in Vcs control header Vcs-Bzr. (vcs-field-uses-insecure-uri)

This merge proposal was created automatically by the Janitor bot.
For more information, including instructions on how to disable
these merge proposals, see https://janitor.debian.net/lintian-fixes.

You can follow up to this merge proposal as you normally would.

The bot will automatically update the merge proposal to resolve merge conflicts
or close the merge proposal when all changes are applied through other means
(e.g. cherry-picks). Updates may take several hours to propagate.

Build and test logs for this branch can be found at
https://janitor.debian.net/lintian-fixes/pkg/friendly-recovery/117675fd-4d49-4b3e-8c4a-1f14f880fda6.

These changes have no impact on the binary debdiff. See
https://janitor.debian.net/api/run/117675fd-4d49-4b3e-8c4a-1f14f880fda6/debdiff?filter_boring=1 to
download the raw debdiff.

You can also view the diffoscope diff at
https://janitor.debian.net/api/run/117675fd-4d49-4b3e-8c4a-1f14f880fda6/diffoscope?filter_boring=1,
or unfiltered at https://janitor.debian.net/api/run/117675fd-4d49-4b3e-8c4a-1f14f880fda6/diffoscope.

[lp:~debian-janitor/friendly-recovery/lintian-fixes]

166. By Debian Janitor on 2020-01-16

Trim trailing whitespace.

Fixes: lintian: file-contains-trailing-whitespace
See-also: https://lintian.debian.org/tags/file-contains-trailing-whitespace.html

167. By Debian Janitor on 2020-01-16

Add missing build dependency on dh addon.

Fixes: lintian: missing-build-dependency-for-dh-addon
See-also: https://lintian.debian.org/tags/missing-build-dependency-for-dh-addon.html

168. By Debian Janitor on 2020-01-16

Bump debhelper from old 10 to 12.
+ Use dh_installsystemd rather than deprecated dh_systemd_start.

Fixes: lintian: package-uses-old-debhelper-compat-version
See-also: https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html

169. By Debian Janitor on 2020-01-16

Set debhelper-compat version in Build-Depends.

Fixes: lintian: uses-debhelper-compat-file
See-also: https://lintian.debian.org/tags/uses-debhelper-compat-file.html

170. By Debian Janitor on 2020-01-16

Use secure URI in Vcs control header Vcs-Bzr.

Fixes: lintian: vcs-field-uses-insecure-uri
See-also: https://lintian.debian.org/tags/vcs-field-uses-insecure-uri.html

[Balint Reczey (rbalint)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2019-06-21 12:31:13 +0000
+++ debian/changelog	2020-01-16 03:47:07 +0000
@@ -1,3 +1,13 @@
+friendly-recovery (0.2.42) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Add missing build dependency on dh addon.
+  * Bump debhelper from old 10 to 12.
+  * Set debhelper-compat version in Build-Depends.
+  * Use secure URI in Vcs control header Vcs-Bzr.
+
+ -- Debian Janitor <[e-mail]>  Thu, 16 Jan 2020 01:13:13 +0000
+
 friendly-recovery (0.2.41) experimental; urgency=medium
 
   [ Janitor ]
@@ -5,8 +15,8 @@
   * Use secure URI in Vcs control header.
 
   [ Steven Clarkson ]
-  * Symlink default.taget to earlydir instead of normaldir to be able 
-    to access recovery mode even if default target has been set via 
+  * Symlink default.taget to earlydir instead of normaldir to be able
+    to access recovery mode even if default target has been set via
     systemctl set-default (LP: #1821252).
 
  -- Dimitri John Ledkov <[e-mail]>  Fri, 21 Jun 2019 13:29:33 +0100
 
=== removed file 'debian/compat'
--- debian/compat	2018-03-29 13:08:15 +0000
+++ debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-10
 
=== modified file 'debian/control'
--- debian/control	2019-06-21 12:27:43 +0000
+++ debian/control	2020-01-16 03:47:07 +0000
@@ -2,9 +2,9 @@
 Section: admin
 Priority: optional
 Maintainer: Debian QA Group <[e-mail]>
-Build-Depends: debhelper (>= 10)
+Build-Depends: debhelper-compat (= 12)
 Standards-Version: 4.2.1
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/friendly-recovery/ubuntu
+Vcs-Bzr: https://bazaar.launchpad.net/~ubuntu-core-dev/friendly-recovery/ubuntu
 
 Package: friendly-recovery
 Architecture: all
@@ -14,4 +14,3 @@
 Description: Make recovery boot mode more user-friendly
  Make the recovery boot mode more user-friendly by providing a menu
  with pluggable options.
-
 
=== modified file 'debian/rules'
--- debian/rules	2017-03-29 16:52:25 +0000
+++ debian/rules	2020-01-16 03:47:07 +0000
@@ -6,7 +6,7 @@
 endif
 
 %:
-	dh "$@" --with systemd
+	dh "$@"
 
 override_dh_auto_build:
 	cd po; make
@@ -14,8 +14,8 @@
 override_dh_installinit:
 	dh_installinit --no-start
 
-override_dh_systemd_start:
-	dh_systemd_start --no-start
+override_dh_installsystemd:
+	dh_installsystemd --no-start
 
 override_dh_gencontrol:
 	dh_gencontrol -- -VUbuntu:Recommends=$(UBUNTU_RECOMMENDS)