Merge lp:~aeves-nate/ubuntu/wily/mydumper/fix-for-1402381 into lp:ubuntu/wily/mydumper

Proposed by Nate Olander on 2015-07-04
Status: Needs review
Proposed branch: lp:~aeves-nate/ubuntu/wily/mydumper/fix-for-1402381
Merge into: lp:ubuntu/wily/mydumper
Diff against target: 59 lines (+20/-1)
5 files modified
.pc/applied-patches (+1/-0)
debian/changelog (+6/-0)
debian/patches/0004-manpages-fix-inconsistency.patch (+11/-0)
debian/patches/series (+1/-0)
docs/mydumper_usage.rst (+1/-1)
To merge this branch: bzr merge lp:~aeves-nate/ubuntu/wily/mydumper/fix-for-1402381
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2015-07-04 Needs Fixing on 2015-09-28
Review via email: mp+263839@code.launchpad.net

Description of the change

Fixed inconsistency in manpages. Copying upstream fix from LP bug #1428608

To post a comment you must log in.
9. By Nate Olander on 2015-07-04

Added --fixes lp:1402381 to changelog to mark as associated

Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks otherwise fine, but there shouldn't be a "-- fixes lp:1402381" in debian/changelog. Please use "(LP: #1402381)" instead, tacking it at the end of the sentence where you write that changed, along with the other bug number.

Also, have you sent this patch to Debian? It would be good to attach it to the bug report there: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=773990

review: Needs Fixing
10. By Nate Olander on 2015-09-29

Fixed inconsistency in manpages. Copying upstream fix from LP bug #1428608 (LP: #1402381)

Fixed mistake as reported by mathieu-tl on Launchpad

Nate Olander (aeves-nate) wrote :

Does that take care of it? I haven't done bug fixes in a while so I may have messed something up.

Unmerged revisions

10. By Nate Olander on 2015-09-29

Fixed inconsistency in manpages. Copying upstream fix from LP bug #1428608 (LP: #1402381)

Fixed mistake as reported by mathieu-tl on Launchpad

9. By Nate Olander on 2015-07-04

Added --fixes lp:1402381 to changelog to mark as associated

8. By Nate Olander on 2015-07-04

Updated changelog with correct email address

7. By Nate Olander on 2015-07-04

Fixed inconsistency in manpages. Copying upstream fix from LP bug #1428608

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2014-03-20 01:17:43 +0000
3+++ .pc/applied-patches 2015-09-29 00:55:54 +0000
4@@ -1,3 +1,4 @@
5 0001-manpage-whatis-description.patch
6 0002-dont-install-documentation-source.patch
7 0003-explicitly-link-libm.patch
8+0004-manpages-fix-inconsistency.patch
9
10=== modified file 'debian/changelog'
11--- debian/changelog 2014-03-20 01:17:43 +0000
12+++ debian/changelog 2015-09-29 00:55:54 +0000
13@@ -1,3 +1,9 @@
14+mydumper (0.6.1-1ubuntu1) UNRELEASED; urgency=medium
15+
16+ * Fixed inconsistency in manpages. Copying upstream fix from LP bug #1428608 (LP: #1402381)
17+
18+ -- Nathanael Olander <aeves-nate@gmail.com> Sat, 04 Jul 2015 17:22:00 -0400
19+
20 mydumper (0.6.1-1) unstable; urgency=medium
21
22 * updated standards version
23
24=== added file 'debian/patches/0004-manpages-fix-inconsistency.patch'
25--- debian/patches/0004-manpages-fix-inconsistency.patch 1970-01-01 00:00:00 +0000
26+++ debian/patches/0004-manpages-fix-inconsistency.patch 2015-09-29 00:55:54 +0000
27@@ -0,0 +1,11 @@
28+--- a/docs/mydumper_usage.rst
29++++ b/docs/mydumper_usage.rst
30+@@ -113,7 +113,7 @@ The :program:`mydumper` tool has several
31+
32+ Timeout for long query execution in seconds, default 60
33+
34+-.. option:: --kill-long-queries, -k
35++.. option:: --kill-long-queries, -K
36+
37+ Kill long running queries instead of aborting the dump
38+
39
40=== modified file 'debian/patches/series'
41--- debian/patches/series 2014-03-20 01:17:43 +0000
42+++ debian/patches/series 2015-09-29 00:55:54 +0000
43@@ -1,3 +1,4 @@
44 0001-manpage-whatis-description.patch
45 0002-dont-install-documentation-source.patch
46 0003-explicitly-link-libm.patch
47+0004-manpages-fix-inconsistency.patch
48
49=== modified file 'docs/mydumper_usage.rst'
50--- docs/mydumper_usage.rst 2014-03-20 01:17:43 +0000
51+++ docs/mydumper_usage.rst 2015-09-29 00:55:54 +0000
52@@ -113,7 +113,7 @@
53
54 Timeout for long query execution in seconds, default 60
55
56-.. option:: --kill-long-queries, -k
57+.. option:: --kill-long-queries, -K
58
59 Kill long running queries instead of aborting the dump
60

Subscribers

People subscribed via source and target branches

to all changes: