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

Proposed by Debian Janitor on 2019-11-25
Status: Merged
Merged at revision: 166
Proposed branch: lp:~debian-janitor/friendly-recovery/lintian-fixes
Merge into: lp:~ubuntu-core-dev/friendly-recovery/ubuntu
Diff against target: 79 lines (+17/-9)
4 files modified
debian/changelog (+12/-2)
debian/compat (+0/-1)
debian/control (+2/-3)
debian/rules (+3/-3)
To merge this branch: bzr merge lp:~debian-janitor/friendly-recovery/lintian-fixes
Reviewer Review Type Date Requested Status
Balint Reczey 2019-11-25 Approve on 2020-05-21
Review via email: mp+375943@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1friendly-recovery (0.2.42) UNRELEASED; urgency=medium
2
3 * Trim trailing whitespace.
4 * Add missing build dependency on dh addon.
5 * Bump debhelper from old 10 to 12.
6 * Set debhelper-compat version in Build-Depends.
7 * Use secure URI in Vcs control header Vcs-Bzr.
8
9 -- Debian Janitor <janitor@jelmer.uk> Thu, 16 Jan 2020 01:13:13 +0000
10
1friendly-recovery (0.2.41) experimental; urgency=medium11friendly-recovery (0.2.41) experimental; urgency=medium
212
3 [ Janitor ]13 [ Janitor ]
@@ -5,8 +15,8 @@
5 * Use secure URI in Vcs control header.15 * Use secure URI in Vcs control header.
616
7 [ Steven Clarkson ]17 [ Steven Clarkson ]
8 * Symlink default.taget to earlydir instead of normaldir to be able 18 * Symlink default.taget to earlydir instead of normaldir to be able
9 to access recovery mode even if default target has been set via 19 to access recovery mode even if default target has been set via
10 systemctl set-default (LP: #1821252).20 systemctl set-default (LP: #1821252).
1121
12 -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 21 Jun 2019 13:29:33 +010022 -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 21 Jun 2019 13:29:33 +0100
1323
=== 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 @@
110
20
=== 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 @@
2Section: admin2Section: admin
3Priority: optional3Priority: optional
4Maintainer: Debian QA Group <packages@qa.debian.org>4Maintainer: Debian QA Group <packages@qa.debian.org>
5Build-Depends: debhelper (>= 10)5Build-Depends: debhelper-compat (= 12)
6Standards-Version: 4.2.16Standards-Version: 4.2.1
7Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/friendly-recovery/ubuntu7Vcs-Bzr: https://bazaar.launchpad.net/~ubuntu-core-dev/friendly-recovery/ubuntu
88
9Package: friendly-recovery9Package: friendly-recovery
10Architecture: all10Architecture: all
@@ -14,4 +14,3 @@
14Description: Make recovery boot mode more user-friendly14Description: Make recovery boot mode more user-friendly
15 Make the recovery boot mode more user-friendly by providing a menu15 Make the recovery boot mode more user-friendly by providing a menu
16 with pluggable options.16 with pluggable options.
17
1817
=== 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 @@
6endif6endif
77
8%:8%:
9 dh "$@" --with systemd9 dh "$@"
1010
11override_dh_auto_build:11override_dh_auto_build:
12 cd po; make12 cd po; make
@@ -14,8 +14,8 @@
14override_dh_installinit:14override_dh_installinit:
15 dh_installinit --no-start15 dh_installinit --no-start
1616
17override_dh_systemd_start:17override_dh_installsystemd:
18 dh_systemd_start --no-start18 dh_installsystemd --no-start
1919
20override_dh_gencontrol:20override_dh_gencontrol:
21 dh_gencontrol -- -VUbuntu:Recommends=$(UBUNTU_RECOMMENDS)21 dh_gencontrol -- -VUbuntu:Recommends=$(UBUNTU_RECOMMENDS)

Subscribers

People subscribed via source and target branches