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

Proposed by Nate Olander
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 Needs Fixing
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

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

Revision history for this message
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

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

Fixed mistake as reported by mathieu-tl on Launchpad

Revision history for this message
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

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

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

8. By Nate Olander

Updated changelog with correct email address

7. By Nate Olander

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
=== modified file '.pc/applied-patches'
--- .pc/applied-patches 2014-03-20 01:17:43 +0000
+++ .pc/applied-patches 2015-09-29 00:55:54 +0000
@@ -1,3 +1,4 @@
10001-manpage-whatis-description.patch10001-manpage-whatis-description.patch
20002-dont-install-documentation-source.patch20002-dont-install-documentation-source.patch
30003-explicitly-link-libm.patch30003-explicitly-link-libm.patch
40004-manpages-fix-inconsistency.patch
45
=== modified file 'debian/changelog'
--- debian/changelog 2014-03-20 01:17:43 +0000
+++ debian/changelog 2015-09-29 00:55:54 +0000
@@ -1,3 +1,9 @@
1mydumper (0.6.1-1ubuntu1) UNRELEASED; urgency=medium
2
3 * Fixed inconsistency in manpages. Copying upstream fix from LP bug #1428608 (LP: #1402381)
4
5 -- Nathanael Olander <aeves-nate@gmail.com> Sat, 04 Jul 2015 17:22:00 -0400
6
1mydumper (0.6.1-1) unstable; urgency=medium7mydumper (0.6.1-1) unstable; urgency=medium
28
3 * updated standards version9 * updated standards version
410
=== added file 'debian/patches/0004-manpages-fix-inconsistency.patch'
--- debian/patches/0004-manpages-fix-inconsistency.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/0004-manpages-fix-inconsistency.patch 2015-09-29 00:55:54 +0000
@@ -0,0 +1,11 @@
1--- a/docs/mydumper_usage.rst
2+++ b/docs/mydumper_usage.rst
3@@ -113,7 +113,7 @@ The :program:`mydumper` tool has several
4
5 Timeout for long query execution in seconds, default 60
6
7-.. option:: --kill-long-queries, -k
8+.. option:: --kill-long-queries, -K
9
10 Kill long running queries instead of aborting the dump
11
012
=== modified file 'debian/patches/series'
--- debian/patches/series 2014-03-20 01:17:43 +0000
+++ debian/patches/series 2015-09-29 00:55:54 +0000
@@ -1,3 +1,4 @@
10001-manpage-whatis-description.patch10001-manpage-whatis-description.patch
20002-dont-install-documentation-source.patch20002-dont-install-documentation-source.patch
30003-explicitly-link-libm.patch30003-explicitly-link-libm.patch
40004-manpages-fix-inconsistency.patch
45
=== modified file 'docs/mydumper_usage.rst'
--- docs/mydumper_usage.rst 2014-03-20 01:17:43 +0000
+++ docs/mydumper_usage.rst 2015-09-29 00:55:54 +0000
@@ -113,7 +113,7 @@
113113
114 Timeout for long query execution in seconds, default 60114 Timeout for long query execution in seconds, default 60
115115
116.. option:: --kill-long-queries, -k116.. option:: --kill-long-queries, -K
117117
118 Kill long running queries instead of aborting the dump118 Kill long running queries instead of aborting the dump
119119

Subscribers

People subscribed via source and target branches

to all changes: