[Pkg-mysql-commits] r1643 - in mysql-dfsg-5.1/branches/experimental/debian: . additions

[Christian Hammers]

Author: ch
Date: 2009-07-22 07:05:30 +0000 (Wed, 22 Jul 2009)
New Revision: 1643

Removed:
   mysql-dfsg-5.1/branches/experimental/debian/additions/mysqlmanager.1
Modified:
   mysql-dfsg-5.1/branches/experimental/debian/control
   mysql-dfsg-5.1/branches/experimental/debian/libmysqlclient-dev.files
   mysql-dfsg-5.1/branches/experimental/debian/libmysqld-dev.files
   mysql-dfsg-5.1/branches/experimental/debian/mysql-client-5.1.files
   mysql-dfsg-5.1/branches/experimental/debian/mysql-common.files
   mysql-dfsg-5.1/branches/experimental/debian/rules
Log:
Added some new and removed some old files


Deleted: mysql-dfsg-5.1/branches/experimental/debian/additions/mysqlmanager.1
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/additions/mysqlmanager.1	2009-07-21 23:33:17 UTC (rev 1642)
+++ mysql-dfsg-5.1/branches/experimental/debian/additions/mysqlmanager.1	2009-07-22 07:05:30 UTC (rev 1643)
@@ -1,49 +0,0 @@
-.TH mysql 1 "March 2005" "MySQL 4.1" "MySQL database"
-.SH NAME
-mysqlmanager \- Manages instances of MySQL server.
-.SH SYNOPSIS
-.B mysqlmanager
-[\fIOPTIONS\fR]
-.SH DESCRIPTION
-Manages instances of MySQL server.
-.TP
-\-?, \fB\-\-help\fR
-Display this help and exit.
-.TP
-\fB\-P\fR, \fB\-\-port=\fR#
-Port number to listen on.
-.TP
-\fB\-l\fR, \fB\-\-log\fR=\fIname\fR
-Path to log file.
-.TP
-\fB\-b\fR, \fB\-\-bind\-address=\fR#
-Address to listen on.
-.HP
-\fB\-B\fR, \fB\-\-tcp\-backlog=\fR# Size of TCP/IP listen queue.
-.HP
-\fB\-g\fR, \fB\-\-greeting\fR=\fIname\fR Set greeting on connect.
-.TP
-\fB\-m\fR, \fB\-\-max\-command\-len=\fR#
-Maximum command length.
-.TP
-\fB\-d\fR, \fB\-\-one\-thread\fR
-Use one thread ( for debugging).
-.TP
-\fB\-C\fR, \fB\-\-connect\-retries=\fR#
-Number of attempts to establish MySQL connection.
-.TP
-\fB\-p\fR, \fB\-\-password\-file\fR=\fIname\fR
-Password file for manager.
-.HP
-\fB\-f\fR, \fB\-\-pid\-file\fR=\fIname\fR Pid file to use.
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-Output version information and exit.
-.SH "SEE ALSO"
-The full documentation for
-.B mysqlmanager
-is available in the package mysql-doc-4.1 or on the MySQL
-homepage www.mysql.com.
-.SH AUTHOR
-This manpage was created by Christian Hammers <ch at debian.org>
-using help2man.

Modified: mysql-dfsg-5.1/branches/experimental/debian/control
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/control	2009-07-21 23:33:17 UTC (rev 1642)
+++ mysql-dfsg-5.1/branches/experimental/debian/control	2009-07-22 07:05:30 UTC (rev 1643)
@@ -52,7 +52,6 @@
  .
  This package includes the -fPIC version of the embedded server library.
 
-# This must come after libmysqld* because it grabs "/usr/lib/mysql/*.a".
 Package: libmysqlclient-dev
 Architecture: any
 Section: libdevel

Modified: mysql-dfsg-5.1/branches/experimental/debian/libmysqlclient-dev.files
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/libmysqlclient-dev.files	2009-07-21 23:33:17 UTC (rev 1642)
+++ mysql-dfsg-5.1/branches/experimental/debian/libmysqlclient-dev.files	2009-07-22 07:05:30 UTC (rev 1643)
@@ -2,6 +2,8 @@
 usr/include/mysql/*.h
 usr/lib/libmysqlclient.a
 usr/lib/libmysqlclient.la
-usr/lib/mysql/*.a
-usr/lib/mysql/*.la
+usr/lib/libmysqlclient_r.a
+usr/lib/libmysqlclient_r.la
+usr/lib/mysql/plugin/
+usr/share/aclocal/mysql.m4
 usr/share/man/man1/mysql_config.1

Modified: mysql-dfsg-5.1/branches/experimental/debian/libmysqld-dev.files
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/libmysqld-dev.files	2009-07-21 23:33:17 UTC (rev 1642)
+++ mysql-dfsg-5.1/branches/experimental/debian/libmysqld-dev.files	2009-07-22 07:05:30 UTC (rev 1643)
@@ -1 +1,2 @@
-usr/lib/mysql/libmysqld.a
+usr/lib/mysql/*.a
+usr/lib/mysql/*.la

Modified: mysql-dfsg-5.1/branches/experimental/debian/mysql-client-5.1.files
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/mysql-client-5.1.files	2009-07-21 23:33:17 UTC (rev 1642)
+++ mysql-dfsg-5.1/branches/experimental/debian/mysql-client-5.1.files	2009-07-22 07:05:30 UTC (rev 1643)
@@ -1,3 +1,4 @@
+usr/bin/innochecksum
 usr/bin/innotop
 usr/bin/myisam_ftdump
 usr/bin/mysql
@@ -14,6 +15,7 @@
 usr/bin/mysqlimport
 usr/bin/mysqlreport
 usr/bin/mysqlshow
+usr/bin/mysqlslap
 usr/bin/mysqltest_embedded
 usr/bin/mysql_waitpid
 usr/sbin/mysqlmanager
@@ -25,18 +27,19 @@
 usr/share/man/man1/mysqladmin.1
 usr/share/man/man1/mysqlbug.1
 usr/share/man/man1/mysqlcheck.1
+usr/share/man/man1/mysql_client_test.1
+usr/share/man/man1/mysql_client_test_embedded.1
 usr/share/man/man1/mysqldump.1
 usr/share/man/man1/mysqldumpslow.1
 usr/share/man/man1/mysql_find_rows.1
 usr/share/man/man1/mysql_fix_extensions.1
 usr/share/man/man1/mysqlimport.1
-usr/share/man/man1/mysqlmanager.1
+usr/share/man/man1/mysqlman.1
+usr/share/man/man1/mysqlmanager.8
 usr/share/man/man1/mysqlmanagerc.1
-usr/share/man/man1/mysqlmanager-pwgen.1
 usr/share/man/man1/mysqlreport.1
 usr/share/man/man1/mysqlshow.1
+usr/share/man/man1/mysqlslap.1
 usr/share/man/man1/mysql_tableinfo.1
 usr/share/man/man1/mysql_waitpid.1
-usr/share/man/man1/mysql_client_test.1
-usr/share/man/man1/mysql_client_test_embedded.1
 usr/share/perl5/InnoDBParser.pm

Modified: mysql-dfsg-5.1/branches/experimental/debian/mysql-common.files
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/mysql-common.files	2009-07-21 23:33:17 UTC (rev 1642)
+++ mysql-dfsg-5.1/branches/experimental/debian/mysql-common.files	2009-07-22 07:05:30 UTC (rev 1643)
@@ -1,2 +1,3 @@
 etc/mysql/my.cnf
 usr/share/mysql-common/internal-use-only
+usr/share/lintian/overrides/mysql-common

Modified: mysql-dfsg-5.1/branches/experimental/debian/rules
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/rules	2009-07-21 23:33:17 UTC (rev 1642)
+++ mysql-dfsg-5.1/branches/experimental/debian/rules	2009-07-22 07:05:30 UTC (rev 1643)
@@ -198,8 +198,6 @@
 	cp debian/additions/*.1 $(TMP)/usr/share/man/man1/
 	mkdir -p $(TMP)/etc/mysql/conf.d/
 	cp debian/additions/mysqld_safe_syslog.cnf $(TMP)/etc/mysql/conf.d/
-	ln -s mysqlmanager.1 $(TMP)/usr/share/man/man1/mysqlmanager-pwgen.1
-	ln -s mysqlmanager.1 $(TMP)/usr/share/man/man1/mysqlmanagerc.1
 
 	# make install (trailing slash needed for innobase)
 	cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/