Merge lp:~debian-janitor/debian/sid/bzr-debian/lintian-fixes into lp:~debian-bazaar/debian/sid/bzr-debian/experimental

Proposed by Debian Janitor
Status: Merged
Merged at revision: 771
Proposed branch: lp:~debian-janitor/debian/sid/bzr-debian/lintian-fixes
Merge into: lp:~debian-bazaar/debian/sid/bzr-debian/experimental
Diff against target: 63 lines (+12/-5)
2 files modified
debian/changelog (+11/-4)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~debian-janitor/debian/sid/bzr-debian/lintian-fixes
Reviewer Review Type Date Requested Status
Debian/Ubuntu Bazaar Maintainers Pending
Review via email: mp+377681@code.launchpad.net

Commit message

Fix lintian issues: Use dh $@ sequencer., Wrap long lines in changelog entries: 2.8.0, 2.5.1, 2.1~0ubuntu1, 0.14ubuntu1.

Description of the change

Fix some issues reported by lintian
* Wrap long lines in changelog entries: 2.8.0, 2.5.1, 2.1~0ubuntu1, 0.14ubuntu1. (debian-changelog-line-too-long)
* Use dh $@ sequencer. (no-dh-sequencer)

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/bzr-builddeb/76232377-3606-4c89-8a0e-87dca444dfc5.

These changes have no impact on the binary debdiff. See
https://janitor.debian.net/api/run/76232377-3606-4c89-8a0e-87dca444dfc5/debdiff?filter_boring=1 to
download the raw debdiff.

You can also view the diffoscope diff at
https://janitor.debian.net/api/run/76232377-3606-4c89-8a0e-87dca444dfc5/diffoscope?filter_boring=1,
or unfiltered at https://janitor.debian.net/api/run/76232377-3606-4c89-8a0e-87dca444dfc5/diffoscope.

To post a comment you must log in.
771. By Jelmer Vernooij

Fix lintian issues: Use dh $@ sequencer., Wrap long lines in changelog entries: 2.8.0, 2.5.1, 2.1~0ubuntu1, 0.14ubuntu1.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2019-10-20 17:55:44 +0000
+++ debian/changelog 2020-01-16 05:58:28 +0000
@@ -1,6 +1,9 @@
1bzr-builddeb (2.8.12+bsa) UNRELEASED; urgency=medium1bzr-builddeb (2.8.12+bsa) UNRELEASED; urgency=medium
22
3 * Update standards version to 4.4.1, no changes needed.3 * Update standards version to 4.4.1, no changes needed.
4 * Wrap long lines in changelog entries: 2.8.0, 2.5.1, 2.1~0ubuntu1,
5 0.14ubuntu1.
6 * Use dh $@ sequencer.
47
5 -- Debian Janitor <janitor@jelmer.uk> Sun, 20 Oct 2019 17:55:29 +00008 -- Debian Janitor <janitor@jelmer.uk> Sun, 20 Oct 2019 17:55:29 +0000
69
@@ -180,7 +183,8 @@
180 LP: #874263183 LP: #874263
181 * Support --revision argument to merge-package. LP: #888590184 * Support --revision argument to merge-package. LP: #888590
182 * By default, don't override the commit message from debian/changelog185 * By default, don't override the commit message from debian/changelog
183 unless 'commit-message-from-changelog' is explicitly set to True. LP: #812749186 unless 'commit-message-from-changelog' is explicitly set to True. LP:
187 #812749
184 * Support running dep3-patch against remote repositories, and with188 * Support running dep3-patch against remote repositories, and with
185 open-ended revision ranges. LP: #893608189 open-ended revision ranges. LP: #893608
186 * Fix finding orig tarballs in directories also containing filenames190 * Fix finding orig tarballs in directories also containing filenames
@@ -425,7 +429,8 @@
425 * Don't crash when doing merge-upstream with a branch that does a rename429 * Don't crash when doing merge-upstream with a branch that does a rename
426 and then ships another file with the old path in the tarball that isn't430 and then ships another file with the old path in the tarball that isn't
427 in the branch.431 in the branch.
428 * Accept None as a valid previous_version value in merge_upstream(). LP: #680945432 * Accept None as a valid previous_version value in merge_upstream(). LP:
433 #680945
429434
430 [ Jelmer Vernooij ]435 [ Jelmer Vernooij ]
431436
@@ -695,7 +700,8 @@
695bzr-builddeb (2.1~0ubuntu1) jaunty; urgency=low700bzr-builddeb (2.1~0ubuntu1) jaunty; urgency=low
696701
697 [ Jelmer Vernooij ]702 [ Jelmer Vernooij ]
698 * Add simple deb: directory service for Bazaar that uses the dpkg Vcs-* fields.703 * Add simple deb: directory service for Bazaar that uses the dpkg Vcs-*
704 fields.
699 * Fix mark-uploaded when used in merge mode. (Closes: #500851)705 * Fix mark-uploaded when used in merge mode. (Closes: #500851)
700 * Support merging upstream from a Bazaar branch. (Closes: #493386)706 * Support merging upstream from a Bazaar branch. (Closes: #493386)
701 + Also support merging from upstream Subversion branches. (LP: #295275)707 + Also support merging from upstream Subversion branches. (LP: #295275)
@@ -1083,7 +1089,8 @@
10831089
1084bzr-builddeb (0.14ubuntu1) feisty; urgency=low1090bzr-builddeb (0.14ubuntu1) feisty; urgency=low
10851091
1086 * revert the smart options patch so that the package gets usable with bzr 0.13 again.1092 * revert the smart options patch so that the package gets usable with bzr 0.13
1093 again.
10871094
1088 -- Reinhard Tartler <siretart@tauware.de> Tue, 16 Jan 2007 23:16:44 +01001095 -- Reinhard Tartler <siretart@tauware.de> Tue, 16 Jan 2007 23:16:44 +0100
10891096
10901097
=== modified file 'debian/rules'
--- debian/rules 2019-02-24 01:52:39 +0000
+++ debian/rules 2020-01-16 05:58:28 +0000
@@ -5,4 +5,4 @@
5override_dh_auto_install:5override_dh_auto_install:
66
7%:7%:
8 dh $*8 dh $@

Subscribers

People subscribed via source and target branches