Merge lp:~jelmer/debian/sid/bzr-email/lintian-fixes into lp:~debian-bazaar/debian/sid/bzr-email/unstable

Proposed by Jelmer Vernooij
Status: Needs review
Proposed branch: lp:~jelmer/debian/sid/bzr-email/lintian-fixes
Merge into: lp:~debian-bazaar/debian/sid/bzr-email/unstable
Diff against target: 43 lines (+9/-3)
4 files modified
debian/changelog (+7/-0)
debian/compat (+1/-1)
debian/control (+1/-1)
debian/rules (+0/-1)
To merge this branch: bzr merge lp:~jelmer/debian/sid/bzr-email/lintian-fixes
Reviewer Review Type Date Requested Status
Debian/Ubuntu Bazaar Maintainers Pending
Review via email: mp+361376@code.launchpad.net

Description of the change

Fix some issues reported by lintian
* Trim trailing whitespace.
* Bump debhelper from deprecated 7 to 11.

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/bzr-email/logs/ec16fa24-c5d1-4859-bdda-7fe6ccb7d2ea.

To post a comment you must log in.

Unmerged revisions

93. By Jelmer Vernooij

Bump debhelper from deprecated 7 to 11.

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

92. By Jelmer Vernooij

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
=== modified file 'debian/changelog'
--- debian/changelog 2018-09-20 17:31:25 +0000
+++ debian/changelog 2019-01-04 02:24:06 +0000
@@ -1,3 +1,10 @@
1bzr-email (0.0.1~bzr58-7) UNRELEASED; urgency=medium
2
3 * Trim trailing whitespace.
4 * Bump debhelper from deprecated 7 to 11.
5
6 -- Jelmer Vernooij <jelmer@debian.org> Fri, 04 Jan 2019 02:13:27 +0000
7
1bzr-email (0.0.1~bzr58-6) unstable; urgency=medium8bzr-email (0.0.1~bzr58-6) unstable; urgency=medium
29
3 * Remove unnecessary XS-Testsuite field in debian/control.10 * Remove unnecessary XS-Testsuite field in debian/control.
411
=== modified file 'debian/compat'
--- debian/compat 2011-03-07 04:08:01 +0000
+++ debian/compat 2019-01-04 02:24:06 +0000
@@ -1,1 +1,1 @@
17111
22
=== modified file 'debian/control'
--- debian/control 2018-09-20 17:31:25 +0000
+++ debian/control 2019-01-04 02:24:06 +0000
@@ -7,7 +7,7 @@
7Build-Depends-Indep: python-bzrlib.tests | bzr (<< 2.4.0~beta1-2),7Build-Depends-Indep: python-bzrlib.tests | bzr (<< 2.4.0~beta1-2),
8 bzr (>= 1.0),8 bzr (>= 1.0),
9 python-testtools (>= 0.9.5)9 python-testtools (>= 0.9.5)
10Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3)10Build-Depends: debhelper (>= 11~), python (>= 2.6.6-3)
11Standards-Version: 3.9.811Standards-Version: 3.9.8
12Vcs-Bzr: https://code.launchpad.net/~debian-bazaar/debian/sid/bzr-email/unstable12Vcs-Bzr: https://code.launchpad.net/~debian-bazaar/debian/sid/bzr-email/unstable
13Vcs-Browser: https://code.launchpad.net/~debian-bazaar/debian/sid/bzr-email/unstable13Vcs-Browser: https://code.launchpad.net/~debian-bazaar/debian/sid/bzr-email/unstable
1414
=== modified file 'debian/rules'
--- debian/rules 2019-01-04 02:08:15 +0000
+++ debian/rules 2019-01-04 02:24:06 +0000
@@ -14,4 +14,3 @@
14 mv \~bzr/bzr-email/trunk bzr-email-0.0.1\~bzr5814 mv \~bzr/bzr-email/trunk bzr-email-0.0.1\~bzr58
15 tar cf - bzr-email-0.0.1\~bzr58 | gzip -9 > ../bzr-email_0.0.1\~bzr58.orig.tar.gz15 tar cf - bzr-email-0.0.1\~bzr58 | gzip -9 > ../bzr-email_0.0.1\~bzr58.orig.tar.gz
16 rm -r \~bzr bzr-email-0.0.1\~bzr58 bzr-email.new.tgz16 rm -r \~bzr bzr-email-0.0.1\~bzr58 bzr-email.new.tgz
17

Subscribers

People subscribed via source and target branches