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: Needs review
Proposed branch: lp:~debian-janitor/friendly-recovery/lintian-fixes
Merge into: lp:~ubuntu-core-dev/friendly-recovery/ubuntu
Diff against target: 76 lines (+15/-8)
4 files modified
debian/changelog (+11/-2)
debian/compat (+0/-1)
debian/control (+2/-3)
debian/rules (+2/-2)
To merge this branch: bzr merge lp:~debian-janitor/friendly-recovery/lintian-fixes
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2019-11-25 Pending
Review via email: mp+375943@code.launchpad.net

Commit message

Fix lintian issues: Bump debhelper from old 10 to 12., Set debhelper-compat version in Build-Depends., Trim trailing whitespace., Use secure URI in Vcs control header.

Description of the change

Fix some issues reported by lintian
* Trim trailing whitespace.
* Bump debhelper from old 10 to 12.
* Set debhelper-compat version in Build-Depends.
* Use secure URI in Vcs control header.

This merge proposal was created automatically by the Janitor bot
(https://janitor.debian.net/lintian-fixes).

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

Build and test logs for this branch can be found at
https://janitor.debian.net/lintian-fixes/pkg/friendly-recovery/7f364d09-5c71-4974-ba75-389233da2706.

To post a comment you must log in.

Unmerged revisions

169. By Debian Janitor on 2019-11-24

Use secure URI in Vcs control header.

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

168. By Debian Janitor on 2019-11-24

Set debhelper-compat version in Build-Depends.

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

167. By Debian Janitor on 2019-11-24

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 https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html for more details.

166. By Debian Janitor on 2019-11-24

Trim trailing whitespace.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2019-06-21 12:31:13 +0000
3+++ debian/changelog 2019-11-25 08:46:59 +0000
4@@ -1,3 +1,12 @@
5+friendly-recovery (0.2.42) UNRELEASED; urgency=medium
6+
7+ * Trim trailing whitespace.
8+ * Bump debhelper from old 10 to 12.
9+ * Set debhelper-compat version in Build-Depends.
10+ * Use secure URI in Vcs control header.
11+
12+ -- Debian Janitor <janitor@jelmer.uk> Sun, 24 Nov 2019 17:29:18 +0000
13+
14 friendly-recovery (0.2.41) experimental; urgency=medium
15
16 [ Janitor ]
17@@ -5,8 +14,8 @@
18 * Use secure URI in Vcs control header.
19
20 [ Steven Clarkson ]
21- * Symlink default.taget to earlydir instead of normaldir to be able
22- to access recovery mode even if default target has been set via
23+ * Symlink default.taget to earlydir instead of normaldir to be able
24+ to access recovery mode even if default target has been set via
25 systemctl set-default (LP: #1821252).
26
27 -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 21 Jun 2019 13:29:33 +0100
28
29=== removed file 'debian/compat'
30--- debian/compat 2018-03-29 13:08:15 +0000
31+++ debian/compat 1970-01-01 00:00:00 +0000
32@@ -1,1 +0,0 @@
33-10
34
35=== modified file 'debian/control'
36--- debian/control 2019-06-21 12:27:43 +0000
37+++ debian/control 2019-11-25 08:46:59 +0000
38@@ -2,9 +2,9 @@
39 Section: admin
40 Priority: optional
41 Maintainer: Debian QA Group <packages@qa.debian.org>
42-Build-Depends: debhelper (>= 10)
43+Build-Depends: debhelper-compat (= 12)
44 Standards-Version: 4.2.1
45-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/friendly-recovery/ubuntu
46+Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/friendly-recovery/ubuntu
47
48 Package: friendly-recovery
49 Architecture: all
50@@ -14,4 +14,3 @@
51 Description: Make recovery boot mode more user-friendly
52 Make the recovery boot mode more user-friendly by providing a menu
53 with pluggable options.
54-
55
56=== modified file 'debian/rules'
57--- debian/rules 2017-03-29 16:52:25 +0000
58+++ debian/rules 2019-11-25 08:46:59 +0000
59@@ -6,7 +6,7 @@
60 endif
61
62 %:
63- dh "$@" --with systemd
64+ dh "$@"
65
66 override_dh_auto_build:
67 cd po; make
68@@ -15,7 +15,7 @@
69 dh_installinit --no-start
70
71 override_dh_systemd_start:
72- dh_systemd_start --no-start
73+ dh_installsystemd --no-start
74
75 override_dh_gencontrol:
76 dh_gencontrol -- -VUbuntu:Recommends=$(UBUNTU_RECOMMENDS)

Subscribers

People subscribed via source and target branches