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

[Nate Olander]

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

[lp:~aeves-nate/ubuntu/wily/mydumper/fix-for-1402381]

9. By Nate Olander on 2015-07-04

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

[Mathieu Trudel-Lapierre (cyphermox)]

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

[lp:~aeves-nate/ubuntu/wily/mydumper/fix-for-1402381]

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)]

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

=== 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 @@
 0001-manpage-whatis-description.patch
 0002-dont-install-documentation-source.patch
 0003-explicitly-link-libm.patch
+0004-manpages-fix-inconsistency.patch

=== 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 @@
+mydumper (0.6.1-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Fixed inconsistency in manpages. Copying upstream fix from LP bug #1428608 (LP: #1402381)
+
+ -- Nathanael Olander <[e-mail]>  Sat, 04 Jul 2015 17:22:00 -0400
+
 mydumper (0.6.1-1) unstable; urgency=medium
 
   * updated standards version

=== 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 @@
+--- a/docs/mydumper_usage.rst
++++ b/docs/mydumper_usage.rst
+@@ -113,7 +113,7 @@ The :program:`mydumper` tool has several
+ 
+    Timeout for long query execution in seconds, default 60
+ 
+-.. option:: --kill-long-queries, -k
++.. option:: --kill-long-queries, -K
+ 
+    Kill long running queries instead of aborting the dump
+ 

=== 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 @@
 0001-manpage-whatis-description.patch
 0002-dont-install-documentation-source.patch
 0003-explicitly-link-libm.patch
+0004-manpages-fix-inconsistency.patch

=== 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 @@
 
    Timeout for long query execution in seconds, default 60
 
-.. option:: --kill-long-queries, -k
+.. option:: --kill-long-queries, -K
 
    Kill long running queries instead of aborting the dump