Re: Bug#756436: RFS: mytop/1.9.1-2
Hi,
I've just reuploaded the package to mentors. Diff attached.
Thanks,
Werner Detter
---
diff -Nru mytop-1.9.1/debian/changelog mytop-1.9.1/debian/changelog
--- mytop-1.9.1/debian/changelog 2013-05-11 17:42:29.000000000 +0200
+++ mytop-1.9.1/debian/changelog 2014-07-29 23:02:41.000000000 +0200
@@ -1,3 +1,14 @@
+mytop (1.9.1-2) unstable; urgency=low
+
+ * Add 13_fix_scope_for_show_slave_status_data.patch which fixes incorrect
+ scope for SHOW SLAVE STATUS data variable (Closes: #756434)
+ * Add 12_fix_spelling_and_allignment.patch which fixes spelling in
+ help context and aligment (Closes: #712642, #732852)
+ * Updated standards version to 3.9.5
+ * Fixed wrong weekday in changelog
+
+ -- Werner Detter <werner@aloah-from-hell.de> Tue, 29 Jul 2014 20:44:41 +0100
+
mytop (1.9.1-1) unstable; urgency=low
* New upstream release (Closes: #590505, #538164, #565759, #558100,
@@ -28,7 +39,7 @@
* Deleted debian/menu, debian/postrm, debian/postinst, debian/prerm
* Renamed mytop.example to mytop.sample.conf
- -- Werner Detter <werner@aloah-from-hell.de> Sat, 13 May 2013 17:41:05 +0100
+ -- Werner Detter <werner@aloah-from-hell.de> Mon, 13 May 2013 17:41:05 +0100
mytop (1.6-6) unstable; urgency=low
diff -Nru mytop-1.9.1/debian/control mytop-1.9.1/debian/control
--- mytop-1.9.1/debian/control 2013-05-11 17:39:42.000000000 +0200
+++ mytop-1.9.1/debian/control 2014-07-29 23:02:41.000000000 +0200
@@ -4,7 +4,7 @@
Maintainer: Werner Detter <werner@aloah-from-hell.de>
Build-Depends: debhelper (>= 7)
Homepage: http://www.mysqlfanboy.com/mytop/
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Package: mytop
Architecture: all
diff -Nru mytop-1.9.1/debian/patches/12_fix_spelling_and_allignment.patch mytop-1.9.1/debian/patches/12_fix_spelling_and_allignment.patch
--- mytop-1.9.1/debian/patches/12_fix_spelling_and_allignment.patch 1970-01-01 01:00:00.000000000 +0100
+++ mytop-1.9.1/debian/patches/12_fix_spelling_and_allignment.patch 2014-07-29 23:02:41.000000000 +0200
@@ -0,0 +1,35 @@
+Description: fix spelling and alignment
+Origin: Olaf van der Spek <olaf@xwis.net>
+Author: Werner Detter <werner@aloah-from-hell.de>
+DEP: 3
+Bug-Debian: http://bugs.debian.org/712642
+Bug-Debian: http://bugs.debian.org/732852
+--- a/mytop
++++ b/mytop
+@@ -976,7 +976,7 @@
+ my $q_diff = ( $STATUS{Questions} - $OLD_STATUS{Questions} );
+ # print("q_diff: $STATUS{Questions} - $OLD_STATUS{Questions} / $t_delta = $q_diff\n");
+
+- printf(" Sorts: %5.0f qps now: %4.0f Slow qps: %3.1f Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f \n",
++ printf(" Sorts: %6.0f qps now: %4.0f Slow qps: %3.1f Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f \n",
+ ( $STATUS{Sort_rows} - $OLD_STATUS{Sort_rows} ) / $t_delta,
+ ( $STATUS{Questions} - $OLD_STATUS{Questions} ) / $t_delta,
+ ( # slow now (qps)
+@@ -1682,7 +1682,7 @@
+ e - explain the query that a thread is running
+ E - display current replication error
+ f - show full query info for a given thread
+- F - unFilter the dispaly
++ F - unfilter the display
+ h - show only a specifc host's connections
+ H - toggle the mytop header
+ i - toggle the display of idle (sleeping) threads
+@@ -1696,7 +1696,7 @@
+ r - reset the status counters (via FLUSH STATUS on your server)
+ R - change reverse IP lookup
+ s - change the delay between screen updates
+- S - change slow quiery hightlighting
++ S - change slow query hightlighting
+ t - switch to thread view (default)
+ u - show only a specific user
+ : - enter a command (not yet implemented)
diff -Nru mytop-1.9.1/debian/patches/13_fix_scope_for_show_slave_status_data.patch mytop-1.9.1/debian/patches/13_fix_scope_for_show_slave_status_data.patch
--- mytop-1.9.1/debian/patches/13_fix_scope_for_show_slave_status_data.patch 1970-01-01 01:00:00.000000000 +0100
+++ mytop-1.9.1/debian/patches/13_fix_scope_for_show_slave_status_data.patch 2014-07-29 23:24:28.000000000 +0200
@@ -0,0 +1,34 @@
+Description: fixes incorrect scope for SHOW SLAVE STATUS data variable
+Origin: Steffen Zieger
+Author: Werner Detter <werner@aloah-from-hell.de>
+DEP: 3
+Bug-Debian: http://bugs.debian.org/756434
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1325004
+--- a/mytop
++++ b/mytop
+@@ -1059,21 +1059,16 @@
+
+ $lines_left--;
+
+- my($data) = Hashes('show global variables like "read_only"');
+- if ($data->{Value} ne "OFF")
++ my($read_only) = Hashes('show global variables like "read_only"');
++ if ($read_only->{Value} ne "OFF")
+ {
+ print RED() if ($HAS_COLOR) ;
+ print " ReadOnly";
+ RESET() if ($HAS_COLOR);
+ }
+
+- if(not defined $data)
+- {
+- my($data);
+- }
+-
+- $data = Hashes('SHOW SLAVE STATUS');
+- if ($data != 0 and defined($data->{Master_Host}))
++ my($data) = Hashes('SHOW SLAVE STATUS');
++ if (defined($data->{Master_Host}))
+ {
+ if (defined($data->{Seconds_Behind_Master}))
+ {
diff -Nru mytop-1.9.1/debian/patches/series mytop-1.9.1/debian/patches/series
--- mytop-1.9.1/debian/patches/series 2013-05-11 17:40:53.000000000 +0200
+++ mytop-1.9.1/debian/patches/series 2014-07-29 23:02:41.000000000 +0200
@@ -9,3 +9,5 @@
09_q_is_quit.patch
10_fix_perl_warnings.patch
11_fix_url_manpage.patch
+12_fix_spelling_and_allignment.patch
+13_fix_scope_for_show_slave_status_data.patch
Reply to: