Merge lp:~debian-janitor/debian/sid/loggerhead/lintian-fixes into lp:~debian-bazaar/debian/sid/loggerhead/unstable

Proposed by Debian Janitor on 2019-04-21
Status: Merged
Merged at revision: 320
Proposed branch: lp:~debian-janitor/debian/sid/loggerhead/lintian-fixes
Merge into: lp:~debian-bazaar/debian/sid/loggerhead/unstable
Diff against target: 78 lines (+13/-6)
6 files modified
debian/changelog (+6/-1)
debian/compat (+1/-1)
debian/control (+1/-1)
debian/postinst (+3/-1)
debian/prerm (+1/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~debian-janitor/debian/sid/loggerhead/lintian-fixes
Reviewer Review Type Date Requested Status
Debian/Ubuntu Bazaar Maintainers 2019-04-21 Pending
Review via email: mp+366339@code.launchpad.net

Description of the change

Fix some issues reported by lintian
* Trim trailing whitespace.
* Bump debhelper from old 9 to 10.
* Use set -e rather than passing -e on the shebang-line.

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

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/pkg/loggerhead/4b4e47fb-a6f5-42bb-9cd9-880dfcfbec3a/.

To post a comment you must log in.

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 2018-09-22 17:45:20 +0000
3+++ debian/changelog 2019-04-21 18:31:37 +0000
4@@ -1,10 +1,16 @@
5 loggerhead (1.19~bzr479+dfsg-4) UNRELEASED; urgency=medium
6
7+ [ Jelmer Vernooń≥ ]
8 * Use secure copyright file specification URI.
9 * Remove unnecessary X-Python{,3}-Version field in debian/control.
10 * Trim trailing whitespace.
11 * Use secure URI in debian/watch.
12
13+ [ Debian Janitor ]
14+ * Trim trailing whitespace.
15+ * Bump debhelper from old 9 to 10.
16+ * Use set -e rather than passing -e on the shebang-line.
17+
18 -- Jelmer Vernooń≥ <jelmer@debian.org> Sat, 22 Sep 2018 17:43:05 +0000
19
20 loggerhead (1.19~bzr479+dfsg-3) unstable; urgency=medium
21@@ -255,4 +261,3 @@
22 * Initial release. (Closes: #492477)
23
24 -- Jelmer Vernooij <jelmer@samba.org> Fri, 25 Jul 2008 22:43:49 +0200
25-
26
27=== modified file 'debian/compat'
28--- debian/compat 2018-09-08 18:30:13 +0000
29+++ debian/compat 2019-04-21 18:31:37 +0000
30@@ -1,1 +1,1 @@
31-9
32+10
33
34=== modified file 'debian/control'
35--- debian/control 2018-09-22 17:43:06 +0000
36+++ debian/control 2019-04-21 18:31:37 +0000
37@@ -14,7 +14,7 @@
38 python-sphinx,
39 python-subunit,
40 python-testtools
41-Build-Depends: debhelper (>= 9),
42+Build-Depends: debhelper (>= 10~),
43 python (>= 2.6.6-3),
44 python-paste (>= 1.6),
45 python-pkg-resources,
46
47=== modified file 'debian/postinst'
48--- debian/postinst 2008-12-22 21:11:44 +0000
49+++ debian/postinst 2019-04-21 18:31:37 +0000
50@@ -1,5 +1,7 @@
51-#!/bin/sh -e
52+#!/bin/sh
53 #DEBHELPER#
54
55+set -e
56+
57 adduser --system --group --home / loggerhead > /dev/null 2>&1
58 chown loggerhead /var/log/loggerhead
59
60=== modified file 'debian/prerm'
61--- debian/prerm 2008-08-06 19:53:37 +0000
62+++ debian/prerm 2019-04-21 18:31:37 +0000
63@@ -1,2 +1,2 @@
64-#!/bin/sh -e
65+#!/bin/sh
66 #DEBHELPER#
67
68=== modified file 'debian/rules'
69--- debian/rules 2018-09-08 18:30:13 +0000
70+++ debian/rules 2019-04-21 18:31:37 +0000
71@@ -31,7 +31,7 @@
72 cd docs/ && $(MAKE) clean
73
74 override_dh_auto_build:
75- dh_auto_build
76+ dh_auto_build
77 cd docs/ && $(MAKE) html
78 cd docs/_build/html/_static/ && rm jquery.js underscore.js
79

Subscribers

People subscribed via source and target branches