diff -u mtop-0.6.6/mtop.PL mtop-0.6.6/mtop.PL --- mtop-0.6.6/mtop.PL +++ mtop-0.6.6/mtop.PL @@ -3,7 +3,6 @@ # (DO NOT EDIT mtop, instead edit mtop.PL and run make use Config; -use Config::INI::Simple (); use File::Basename qw(&basename &dirname); use Getopt::Long; use strict; @@ -446,6 +445,7 @@ use vars qw( $VERSION $RELEASE %PROC_COLS @PROC_COLS %EXPLAIN_COLS @EXPLAIN_COLS $WINDOW_RESIZE ); +use Config::INI::Simple (); use DBI; use DBD::mysql; use Getopt::Long; @@ -1898,9 +1898,9 @@ } -=begin showsatus +=begin showstatus -show status; +C -=end +=end showstatus !NO!SUBS! diff -u mtop-0.6.6/mkill.PL mtop-0.6.6/mkill.PL --- mtop-0.6.6/mkill.PL +++ mtop-0.6.6/mkill.PL @@ -1,7 +1,6 @@ #!/usr/local/bin/perl use Config; -use Config::INI::Simple (); use File::Basename qw(&basename &dirname); use Getopt::Long; use strict; @@ -273,6 +272,7 @@ use vars qw( $VERSION $RELEASE %PROC_COLS @PROC_COLS %EXPLAIN_COLS @EXPLAIN_COLS $WINDOW_RESIZE ); +use Config::INI::Simple (); use DBI; use DBD::mysql; use Getopt::Long; @@ -679,9 +679,9 @@ } -=begin showsatus +=begin showstatus -show status; +C -=end +=end showstatus !NO!SUBS! diff -u mtop-0.6.6/debian/mtop.config mtop-0.6.6/debian/mtop.config --- mtop-0.6.6/debian/mtop.config +++ mtop-0.6.6/debian/mtop.config @@ -1,5 +1,7 @@ #!/bin/sh +set -e + # Source debconf library. . /usr/share/debconf/confmodule diff -u mtop-0.6.6/debian/mtop.postinst mtop-0.6.6/debian/mtop.postinst --- mtop-0.6.6/debian/mtop.postinst +++ mtop-0.6.6/debian/mtop.postinst @@ -5,6 +5,9 @@ set -e +# Source debconf library. +. /usr/share/debconf/confmodule + case "$1" in configure) diff -u mtop-0.6.6/debian/control mtop-0.6.6/debian/control --- mtop-0.6.6/debian/control +++ mtop-0.6.6/debian/control @@ -10,7 +10,7 @@ Package: mtop Architecture: all -Depends: ${perl:Depends}, ${misc:Depends}, debconf (>= 1.2.9) | debconf-2.0, libcurses-perl, libdbd-mysql-perl, libnet-perl, mysql-client +Depends: ${perl:Depends}, ${misc:Depends}, debconf (>= 1.2.9) | debconf-2.0, libcurses-perl, libdbd-mysql-perl, libnet-perl, mysql-client, libconfig-ini-simple-perl Description: MySQL terminal based query monitor mtop (MySQL top) monitors a MySQL database showing the queries which are taking the most amount of time to complete. Features include diff -u mtop-0.6.6/debian/mtop.postrm mtop-0.6.6/debian/mtop.postrm --- mtop-0.6.6/debian/mtop.postrm +++ mtop-0.6.6/debian/mtop.postrm @@ -8,21 +8,20 @@ case "$1" in purge|remove) - if [ -f /usr/bin/mysql -a -f /etc/mysql/debian.cnf -a -f /usr/sbin/mysqld ]; then - # Former versions of mtop automaticly added a user to mysql - mysqlcmd="mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names -B -e " - hits=`${mysqlcmd} "SELECT COUNT(user) FROM user WHERE user='mysqltop'" mysql` - if [ $hits -gt 0 ]; then - echo "Removing user 'mysqltop'" - ${mysqlcmd} "DELETE FROM user WHERE user='mysqltop'; FLUSH PRIVILEGES" mysql - fi - fi + if [ -f /usr/bin/mysql -a -f /etc/mysql/debian.cnf -a -f /usr/sbin/mysqld ]; then + # Former versions of mtop automaticly added a user to mysql + mysqlcmd="mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names -B -e " + hits=`${mysqlcmd} "SELECT COUNT(user) FROM user WHERE user='mysqltop'" mysql` + if [ $hits -gt 0 ]; then + echo "Removing user 'mysqltop'" + ${mysqlcmd} "DELETE FROM user WHERE user='mysqltop'; FLUSH PRIVILEGES" mysql + fi + fi ;; upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - - ;; + ;; *) echo "postrm called with unknown argument \`$1'" >&2 diff -u mtop-0.6.6/debian/changelog mtop-0.6.6/debian/changelog --- mtop-0.6.6/debian/changelog +++ mtop-0.6.6/debian/changelog @@ -1,4 +1,4 @@ -mtop (0.6.6-1.2ubuntu1~ppa0) jaunty; urgency=low +mtop (0.6.6-1.2ubuntu1~ppa1) jaunty; urgency=low * New feature --local for mkill and mtop (to use /etc/mysql/debian.cnf) - Depend on libconfig-ini-simple-perl @@ -13,6 +13,7 @@ - Fixed debhelper-but-no-misc-depends - Fixed binary-arch-rules-but-pkg-is-arch-indep - Bumped Standards-Version to 3.8.0 + * Satisfy pod2man -- Patrick Kuijvenhoven Mon, 16 Feb 2009 20:26:39 +0100