[Pkg-mysql-commits] r1022 - in branches/sid-5.0/debian: . additions patches

Norbert Tretkowski nobse at alioth.debian.org
Mon Nov 26 17:48:17 UTC 2007


Author: nobse
Date: 2007-11-26 17:48:17 +0000 (Mon, 26 Nov 2007)
New Revision: 1022

Removed:
   branches/sid-5.0/debian/additions/comp_err.1
   branches/sid-5.0/debian/additions/msql2mysql.1
   branches/sid-5.0/debian/additions/my_print_defaults.1
   branches/sid-5.0/debian/additions/myisam_ftdump.1
   branches/sid-5.0/debian/additions/myisamchk.1
   branches/sid-5.0/debian/additions/myisamlog.1
   branches/sid-5.0/debian/additions/myisampack.1
   branches/sid-5.0/debian/additions/mysql-license-dummy.1
   branches/sid-5.0/debian/additions/mysql_config.1
   branches/sid-5.0/debian/additions/mysql_convert_table_format.1
   branches/sid-5.0/debian/additions/mysql_explain_log.1
   branches/sid-5.0/debian/additions/mysql_find_rows.1
   branches/sid-5.0/debian/additions/mysql_fix_extensions.1
   branches/sid-5.0/debian/additions/mysql_install_db.1
   branches/sid-5.0/debian/additions/mysql_secure_installation.1
   branches/sid-5.0/debian/additions/mysql_setpermission.1
   branches/sid-5.0/debian/additions/mysql_tableinfo.1
   branches/sid-5.0/debian/additions/mysql_waitpid.1
   branches/sid-5.0/debian/additions/mysqlbinlog.1
   branches/sid-5.0/debian/additions/mysqlcheck.1
   branches/sid-5.0/debian/additions/mysqld-license-dummy.1
   branches/sid-5.0/debian/additions/mysqlimport.1
   branches/sid-5.0/debian/additions/mysqlmanager.1
   branches/sid-5.0/debian/additions/mysqltest.1
   branches/sid-5.0/debian/additions/pack_isam.1
   branches/sid-5.0/debian/additions/resolve_stack_dump.1
   branches/sid-5.0/debian/additions/resolveip.1
   branches/sid-5.0/debian/patches/01_MAKEFILES__man_Makefile.in.dpatch
Modified:
   branches/sid-5.0/debian/changelog
   branches/sid-5.0/debian/mysql-client-5.0.files
   branches/sid-5.0/debian/mysql-server-5.0.files
   branches/sid-5.0/debian/patches/00list
   branches/sid-5.0/debian/rules
Log:
Re-add manpages, they are licensed under GPL in the next upstream release now and redistribution is permitted.

Deleted: branches/sid-5.0/debian/additions/comp_err.1
===================================================================
--- branches/sid-5.0/debian/additions/comp_err.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/comp_err.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,16 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysqlerr \- MySQL helper program to compile error messages.
-.SH SYNOPSIS
-mysqlerr [options]
-.SH DESCRIPTION
-This program compiles some kind of error messages.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/msql2mysql.1
===================================================================
--- branches/sid-5.0/debian/additions/msql2mysql.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/msql2mysql.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,16 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-msql2mysql \- MySQL importer for msql style data.
-.SH SYNOPSIS
-msql2mysql [options]
-.SH DESCRIPTION
-This program imports old msql database files.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/my_print_defaults.1
===================================================================
--- branches/sid-5.0/debian/additions/my_print_defaults.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/my_print_defaults.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,16 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-my_print_defaults \- MySQL helper script that prints defaults.
-.SH SYNOPSIS
-my_print_defaults [options]
-.SH DESCRIPTION
-Prints all arguments that is give to some program using the default files.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/myisam_ftdump.1
===================================================================
--- branches/sid-5.0/debian/additions/myisam_ftdump.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/myisam_ftdump.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,16 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-myisam_ftdump \- Dumps full text tables.
-.SH SYNOPSIS
-myisam_ftdump [options]
-.SH DESCRIPTION
-Dumps information and contents of full text tables.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/myisamchk.1
===================================================================
--- branches/sid-5.0/debian/additions/myisamchk.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/myisamchk.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,17 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-myisamchk \- Checks MySQL myisam type databases. 
-.SH SYNOPSIS
-myisamchk [options]
-.SH DESCRIPTION
-Description, check and repair of ISAM tables.
-Used without options all tables on the command will be checked for errors
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/myisamlog.1
===================================================================
--- branches/sid-5.0/debian/additions/myisamlog.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/myisamlog.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,16 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-myisamlog \- MySQL helper script.
-.SH SYNOPSIS
-myisamlog [options]
-.SH DESCRIPTION
-Function unknown. Mail to ch at debian.org.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/myisampack.1
===================================================================
--- branches/sid-5.0/debian/additions/myisampack.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/myisampack.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,19 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-myisampack \- Compresses MySQL database files.
-.SH SYNOPSIS
-myisampack [options]
-.SH DESCRIPTION
-Pack a MyISAM-table to take much less space.
-Keys are not updated, you must run myisamchk -rq on the datafile
-afterwards to update the keys.
-You should give the .MYI file as the filename argument.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysql-license-dummy.1
===================================================================
--- branches/sid-5.0/debian/additions/mysql-license-dummy.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysql-license-dummy.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,15 +0,0 @@
-.TH mysql 1 "21 June 2007" "MySQL 5.0" "MySQL database"
-.SH NAME
-mysql \- MySQL database programs
-.SH COPYRIGHT
-MySQL decided to release the documentation, even the manpages, under a
-license which does not allow Debian to redistribute it. 
-Feel free to contact MySQL at <docs at mysql.com> if you would like to share your
-opinion on the matter :)
-.SH "SEE ALSO"
-For more information start the program with '--help' or
-refer to the MySQL Reference Manual which
-is available online at http://dev.mysql.com/doc/.
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysql_config.1
===================================================================
--- branches/sid-5.0/debian/additions/mysql_config.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysql_config.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,17 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysqlconfig \- MySQL compile settings.
-.SH SYNOPSIS
-mysqlconfig [options]
-.SH DESCRIPTION
-This program is only useful for people who want to compile agains
-libmysqlclient.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysql_convert_table_format.1
===================================================================
--- branches/sid-5.0/debian/additions/mysql_convert_table_format.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysql_convert_table_format.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,17 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysql_convert_table_format \- MySQL table converter.
-.SH SYNOPSIS
-mysql_convert_table_format [options]
-.SH DESCRIPTION
-Conversion of a MySQL tables to other table types.
-If no tables has been specifed, all tables in the database will be converted.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysql_explain_log.1
===================================================================
--- branches/sid-5.0/debian/additions/mysql_explain_log.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysql_explain_log.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,16 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysql_explain_log \- Explains queries from binary logs.
-.SH SYNOPSIS
-mysql_explain_log [options]
-.SH DESCRIPTION
-Read logfile from STDIN an try to EXPLAIN all SELECT statements. All UPDATE statements are rewritten to an EXPLAIN SELECT statement. The results of the EXPLAIN statement are collected and counted. All results with type=ALL are collected in an separete list. Results are printed to STDOUT.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysql_find_rows.1
===================================================================
--- branches/sid-5.0/debian/additions/mysql_find_rows.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysql_find_rows.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,18 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysql_find_rows \- MySQL shell skript for searching in update logs.
-.SH SYNOPSIS
-mysql_find_rows [options]
-.SH DESCRIPTION
-Prints all SQL queries that matches a regexp or contains a 'use
-database' or 'set ..' command to stdout.  A SQL query may contain
-newlines.  This is useful to find things in a MySQL update log.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysql_fix_extensions.1
===================================================================
--- branches/sid-5.0/debian/additions/mysql_fix_extensions.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysql_fix_extensions.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,18 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysql_fix_extensions \- Corrects MySQL database file names.
-.SH SYNOPSIS
-mysql_fix_extensions <datadir>
-.SH DESCRIPTION
-Makes .frm lowercase and .MYI/MYD/ISM/ISD uppercase
-useful when datafiles are copied from windows.
-Does not work with RAID, with InnoDB or BDB tables.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (8)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysql_install_db.1
===================================================================
--- branches/sid-5.0/debian/additions/mysql_install_db.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysql_install_db.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,16 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysql_install_db \- MySQL helper program.
-.SH SYNOPSIS
-mysql_install_db [options]
-.SH DESCRIPTION
-This program is normally not needed by any user.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysql_secure_installation.1
===================================================================
--- branches/sid-5.0/debian/additions/mysql_secure_installation.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysql_secure_installation.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,17 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysql_secure_installation \- Secures the MySQL access control lists.
-.SH SYNOPSIS
-mysql_secure_installation [options]
-.SH DESCRIPTION
-This interactive programm suggests changes like removing anonymous users that
-are supposed to make your installation more secure.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (8)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysql_setpermission.1
===================================================================
--- branches/sid-5.0/debian/additions/mysql_setpermission.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysql_setpermission.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,23 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysql_setpermission \- Adds MySQL users or changes passwords.
-.SH SYNOPSIS
-mysql_setpermission [options]
-.SH DESCRIPTION
-The permission setter is a little program which can help you add users
-or databases or change passwords in MySQL. Keep in mind that we don't
-check permissions which already been set in MySQL. So if you can't
-connect to MySQL using the permission you just added, take a look at
-the permissions which have already been set in MySQL.
-
-The permission setter first reads your .my.cnf file in your Home
-directory if it exists.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysql_tableinfo.1
===================================================================
--- branches/sid-5.0/debian/additions/mysql_tableinfo.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysql_tableinfo.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,322 +0,0 @@
-.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.13
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  | will give a
-.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.if \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.\"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "MYSQL_TABLEINFO 1"
-.TH MYSQL_TABLEINFO 1 "2003-04-05" "perl v5.8.0" "User Contributed Perl Documentation"
-.SH "NAME"
-mysql_tableinfo \- creates and populates information tables with 
-the output of SHOW DATABASES, SHOW TABLES (or SHOW TABLE STATUS), 
-SHOW COLUMNS and SHOW INDEX.
-.PP
-This is version 1.1.
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 1
-\&  mysql_tableinfo [OPTIONS] database_to_write [database_like_wild] [table_like_wild]
-.Ve
-.PP
-.Vb 2
-\&  Do not backquote (``) database_to_write, 
-\&  and do not quote ('') database_like_wild or table_like_wild
-.Ve
-.PP
-.Vb 1
-\&  Examples:
-.Ve
-.PP
-.Vb 1
-\&  mysql_tableinfo info
-.Ve
-.PP
-.Vb 1
-\&  mysql_tableinfo info this_db
-.Ve
-.PP
-.Vb 1
-\&  mysql_tableinfo info %a% b%
-.Ve
-.PP
-.Vb 1
-\&  mysql_tableinfo info --clear-only
-.Ve
-.PP
-.Vb 1
-\&  mysql_tableinfo info --col --idx --table-status
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-mysql_tableinfo asks a MySQL server information about its
-databases, tables, table columns and index, and stores this
-in tables called `db`, `tbl` (or `tbl_status`), `col`, `idx` 
-(with an optional prefix specified with \-\-prefix).
-After that, you can query these information tables, for example
-to build your admin scripts with \s-1SQL\s0 queries, like
-.PP
-\&\s-1SELECT\s0 \s-1CONCAT\s0(\*(L"\s-1CHECK\s0 \s-1TABLE\s0 \*(R",`database`,\*(L".\*(R",`table`,\*(L" \s-1EXTENDED\s0;\*(R") 
-\&\s-1FROM\s0 info.tbl \s-1WHERE\s0 ... ;
-.PP
-as people usually do with some other \s-1RDBMS\s0
-(note: to increase the speed of your queries on the info tables,
-you may add some index on them).
-.PP
-The database_like_wild and table_like_wild instructs the program
-to gather information only about databases and tables
-whose names match these patterns. If the info
-tables already exist, their rows matching the patterns are simply
-deleted and replaced by the new ones. That is,
-old rows not matching the patterns are not touched.
-If the database_like_wild and table_like_wild arguments
-are not specified on the command-line they default to \*(L"%\*(R".
-.PP
-The program :
-.PP
-\&\- does \s-1CREATE\s0 \s-1DATABASE\s0 \s-1IF\s0 \s-1NOT\s0 \s-1EXISTS\s0 database_to_write
-where database_to_write is the database name specified on the command\-line.
-.PP
-\&\- does \s-1CREATE\s0 \s-1TABLE\s0 \s-1IF\s0 \s-1NOT\s0 \s-1EXISTS\s0 database_to_write.`db`
-.PP
-\&\- fills database_to_write.`db` with the output of
-\&\s-1SHOW\s0 \s-1DATABASES\s0 \s-1LIKE\s0 database_like_wild
-.PP
-\&\- does \s-1CREATE\s0 \s-1TABLE\s0 \s-1IF\s0 \s-1NOT\s0 \s-1EXISTS\s0 database_to_write.`tbl`
-(respectively database_to_write.`tbl_status`
-if the \-\-tbl\-status option is on)
-.PP
-\&\- for every found database,
-fills database_to_write.`tbl` (respectively database_to_write.`tbl_status`)
-with the output of 
-\&\s-1SHOW\s0 \s-1TABLES\s0 \s-1FROM\s0 found_db \s-1LIKE\s0 table_like_wild
-(respectively \s-1SHOW\s0 \s-1TABLE\s0 \s-1STATUS\s0 \s-1FROM\s0 found_db \s-1LIKE\s0 table_like_wild)
-.PP
-\&\- if the \-\-col option is on,
-    * does \s-1CREATE\s0 \s-1TABLE\s0 \s-1IF\s0 \s-1NOT\s0 \s-1EXISTS\s0 database_to_write.`col`
-    * for every found table,
-      fills database_to_write.`col` with the output of 
-      \s-1SHOW\s0 \s-1COLUMNS\s0 \s-1FROM\s0 found_tbl \s-1FROM\s0 found_db
-.PP
-\&\- if the \-\-idx option is on,
-    * does \s-1CREATE\s0 \s-1TABLE\s0 \s-1IF\s0 \s-1NOT\s0 \s-1EXISTS\s0 database_to_write.`idx`
-    * for every found table,
-      fills database_to_write.`idx` with the output of 
-      \s-1SHOW\s0 \s-1INDEX\s0 \s-1FROM\s0 found_tbl \s-1FROM\s0 found_db
-.PP
-Some options may modify this general scheme (see below).
-.PP
-As mentioned, the contents of the info tables are the output of
-\&\s-1SHOW\s0 commands. In fact the contents are slightly more complete :
-.PP
-\&\- the `tbl` (or `tbl_status`) info table 
-  has an extra column which contains the database name,
-.PP
-\&\- the `col` info table
-  has an extra column which contains the table name,
-  and an extra column which contains, for each described column,
-  the number of this column in the table owning it (this extra column
-  is called `Seq_in_table`). `Seq_in_table` makes it possible for you
-  to retrieve your columns in sorted order, when you are querying
-  the `col` table. 
-.PP
-\&\- the `index` info table
-  has an extra column which contains the database name.
-.PP
-Caution: info tables contain certain columns (e.g.
-Database, Table, Null...) whose names, as they are MySQL reserved words,
-need to be backquoted (`...`) when used in \s-1SQL\s0 statements.
-.PP
-Caution: as information fetching and info tables filling happen at the
-same time, info tables may contain inaccurate information about
-themselves.
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-.IP "\-\-clear" 4
-.IX Item "--clear"
-Does \s-1DROP\s0 \s-1TABLE\s0 on the info tables (only those that the program is
-going to fill, for example if you do not use \-\-col it won't drop
-the `col` table) and processes normally. Does not drop database_to_write.
-.IP "\-\-clear\-only" 4
-.IX Item "--clear-only"
-Same as \-\-clear but exits after the DROPs.
-.IP "\-\-col" 4
-.IX Item "--col"
-Adds columns information (into table `col`).
-.IP "\-\-idx" 4
-.IX Item "--idx"
-Adds index information (into table `idx`).
-.IP "\-\-prefix prefix" 4
-.IX Item "--prefix prefix"
-The info tables are named from the concatenation of prefix and,
-respectively, db, tbl (or tbl_status), col, idx. Do not quote ('')
-or backquote (``) prefix.
-.IP "\-q, \-\-quiet" 4
-.IX Item "-q, --quiet"
-Does not warn you about what the script is going to do (\s-1DROP\s0 \s-1TABLE\s0 etc)
-and does not ask for a confirmation before starting.
-.IP "\-\-tbl\-status" 4
-.IX Item "--tbl-status"
-Instead of using \s-1SHOW\s0 \s-1TABLES\s0, uses \s-1SHOW\s0 \s-1TABLE\s0 \s-1STATUS\s0
-(much more complete information, but slower). 
-.IP "\-\-help" 4
-.IX Item "--help"
-Display helpscreen and exit
-.IP "\-u, \-\-user=#" 4
-.IX Item "-u, --user=#"
-user for database login if not current user. Give a user
-who has sufficient privileges (\s-1CREATE\s0, ...).
-.IP "\-p, \-\-password=# (INSECURE)" 4
-.IX Item "-p, --password=# (INSECURE)"
-password to use when connecting to server.
-WARNING: Providing a password on command line is insecure as it is visible through /proc to anyone for a short time.
-.IP "\-h, \-\-host=#" 4
-.IX Item "-h, --host=#"
-host to connect to
-.IP "\-P, \-\-port=#" 4
-.IX Item "-P, --port=#"
-port to use when connecting to server
-.IP "\-S, \-\-socket=#" 4
-.IX Item "-S, --socket=#"
-\&\s-1UNIX\s0 domain socket to use when connecting to server
-.SH "WARRANTY"
-.IX Header "WARRANTY"
-This software is free and comes without warranty of any kind. You
-should never trust backup software without studying the code yourself.
-Study the code inside this script and only rely on it if \fIyou\fR believe
-that it does the right thing for you.
-.Sp
-Patches adding bug fixes, documentation and new features are welcome.
-.SH "TO DO"
-.IX Header "TO DO"
-Use extended inserts to be faster (for servers with many databases
-or tables). But to do that, must care about net\-buffer\-length.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-2002\-06\-18 Guilhem Bichot (guilhem.bichot at mines\-paris.org)
-.Sp
-And all the authors of mysqlhotcopy, which served as a model for 
-the structure of the program.

Deleted: branches/sid-5.0/debian/additions/mysql_waitpid.1
===================================================================
--- branches/sid-5.0/debian/additions/mysql_waitpid.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysql_waitpid.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,20 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysql_waitpid \- Waits a specified amount of seconds for a PID to terminate.
-.SH SYNOPSIS
-mysql_waitpid [options] <pid> <seconds>
-.SH DESCRIPTION
-Description: Waits for a program, which program id is #pid, to
-terminate within #time seconds. If the program terminates within
-this time, or if the #pid no longer exists, value 0 is returned.
-Otherwise 1 is returned. Both #pid and #time must be positive
-integer arguments.
-
-See mysql_waitpid for options.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysqlbinlog.1
===================================================================
--- branches/sid-5.0/debian/additions/mysqlbinlog.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysqlbinlog.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,17 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysqlbinlog \- Dumps MySQL binary logs.
-.SH SYNOPSIS
-mysqlbinlog [options]
-.SH DESCRIPTION
-Dumps a MySQL binary log in a format usable for viewing or for pipeing to
-the mysql command line client
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysqlcheck.1
===================================================================
--- branches/sid-5.0/debian/additions/mysqlcheck.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysqlcheck.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,28 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysqlcheck \- MySQL program for repairing, checking and optimizing tables.
-.SH SYNOPSIS
-mysqlcheck | mysqlanalyze | mysqloptimize [options]
-.SH DESCRIPTION
-This program can be used to CHECK (-c,-m,-C), REPAIR (-r), ANALYZE (-a)
-or OPTIMIZE (-o) tables. Some of the options (like -e or -q) can be
-used same time. It works on MyISAM and in some cases on BDB tables.
-Please consult the MySQL manual for latest information about the
-above. The options -c,-r,-a and -o are exclusive to each other, which
-means that the last option will be used, if several was specified.
-
-The option -c will be used by default, if none was specified. You
-can change the default behavior by making a symbolic link, or
-copying this file somewhere with another name, the alternatives are:
-mysqlrepair:   The default option will be -r
-mysqlanalyze:  The default option will be -a
-mysqloptimize: The default option will be -o
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (8)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysqld-license-dummy.1
===================================================================
--- branches/sid-5.0/debian/additions/mysqld-license-dummy.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysqld-license-dummy.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,15 +0,0 @@
-.TH mysql 1 "21 June 2007" "MySQL 5.0" "MySQL database"
-.SH NAME
-mysql \- MySQL database programs
-.SH COPYRIGHT
-MySQL decided to release the documentation, even the manpages, under a
-license which does not allow Debian to redistribute it. 
-Feel free to contact MySQL at <docs at mysql.com> if you would like to share your
-opinion on the matter :)
-.SH "SEE ALSO"
-For more information start the program with '--help' or
-refer to the MySQL Reference Manual which
-is available online at http://dev.mysql.com/doc/.
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysqlimport.1
===================================================================
--- branches/sid-5.0/debian/additions/mysqlimport.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysqlimport.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,20 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysqlimport \- Imports text files with MySQL database queries.
-.SH SYNOPSIS
-mysqlimport [options]
-.SH DESCRIPTION
-Loads tables from text files in various formats.  The base name of the
-text file must be the name of the table that should be used.
-If one uses sockets to connect to the MySQL server, the server will open and
-read the text file directly. In other cases the client will open the text
-file. The SQL command 'LOAD DATA INFILE' is used to import the rows.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/mysqlmanager.1
===================================================================
--- branches/sid-5.0/debian/additions/mysqlmanager.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysqlmanager.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -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 written by Christian Hammers <ch at debian.org>
-using help2man.

Deleted: branches/sid-5.0/debian/additions/mysqltest.1
===================================================================
--- branches/sid-5.0/debian/additions/mysqltest.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/mysqltest.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,16 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysqltest \- Regressiontest program for MySQL.
-.SH SYNOPSIS
-mysqltest [options]
-.SH DESCRIPTION
-Runs a test against the mysql server and compares output with a results file.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/pack_isam.1
===================================================================
--- branches/sid-5.0/debian/additions/pack_isam.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/pack_isam.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,19 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-myisampack \- Compresses MySQL database files.
-.SH SYNOPSIS
-myisampack [options]
-.SH DESCRIPTION
-Pack a ISAM-table to take much smaller space
-Keys are not updated, so you must run isamchk -rq on any table
-that has keys after you have compressed it
-You should give the .ISM file as the filename argument
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/resolve_stack_dump.1
===================================================================
--- branches/sid-5.0/debian/additions/resolve_stack_dump.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/resolve_stack_dump.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,16 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-resolve_stack_dump \- MySQL helper program for reporting bugs.
-.SH SYNOPSIS
-resolve_stack_dump [options]
-.SH DESCRIPTION
-Resolve numeric stack strace dump into symbols.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Deleted: branches/sid-5.0/debian/additions/resolveip.1
===================================================================
--- branches/sid-5.0/debian/additions/resolveip.1	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/additions/resolveip.1	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,16 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-resolveip \- MySQL helper program to retrive IP addresses.
-.SH SYNOPSIS
-resolveip [options]
-.SH DESCRIPTION
-Get hostname based on IP-address or IP-address based on hostname.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page

Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/changelog	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,15 +1,15 @@
 mysql-dfsg-5.0 (5.0.45-4) UNRELEASED; urgency=low
 
+  * Re-add manpages, they are licensed under GPL now and redistribution is
+    permitted.
   * Drop linux-libc-dev build-dependency, it's now being pulled by libc-dev
     which is build-essential. (closes: #431018)
   * Remove old optimizations for MySQL 3.23.x, they are no longer required.
     (closes: #436552)
   * New Finnish debconf translation from Esko Arajärvi. (closes: #448776)
-  * Add get-orig-source target, and prepare for re-adding manpages (which are
-    now under GPL) with the next upstream release.
   * Add Vcs-* and Homepage flags to source stanza in control file.
 
- -- Norbert Tretkowski <nobse at debian.org>  Tue, 20 Nov 2007 17:17:20 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Mon, 26 Nov 2007 17:12:05 +0100
 
 mysql-dfsg-5.0 (5.0.45-3) unstable; urgency=high
 

Modified: branches/sid-5.0/debian/mysql-client-5.0.files
===================================================================
--- branches/sid-5.0/debian/mysql-client-5.0.files	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/mysql-client-5.0.files	2007-11-26 17:48:17 UTC (rev 1022)
@@ -23,7 +23,7 @@
 usr/bin/mysql_waitpid
 usr/sbin/mysqlmanager
 usr/share/lintian/overrides/mysql-client-5.0
-usr/share/man/man1/mysql-license-dummy.1
+usr/share/man/man8/mysqlmanager.8
 usr/share/man/man1/innotop.1
 usr/share/man/man1/myisam_ftdump.1
 usr/share/man/man1/mysql.1
@@ -37,7 +37,6 @@
 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/mysqlmanagerc.1
 usr/share/man/man1/mysqlmanager-pwgen.1
 usr/share/man/man1/mysqlreport.1

Modified: branches/sid-5.0/debian/mysql-server-5.0.files
===================================================================
--- branches/sid-5.0/debian/mysql-server-5.0.files	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/mysql-server-5.0.files	2007-11-26 17:48:17 UTC (rev 1022)
@@ -45,7 +45,6 @@
 usr/share/doc/mysql-server-5.0/
 usr/share/lintian/overrides/mysql-server-5.0
 usr/share/man/man1/comp_err.1
-usr/share/man/man1/mysqld-license-dummy.1
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/myisamchk.1
 usr/share/man/man1/myisamlog.1

Modified: branches/sid-5.0/debian/patches/00list
===================================================================
--- branches/sid-5.0/debian/patches/00list	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/patches/00list	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,6 +1,5 @@
 01_MAKEFILES__Docs_Images_Makefile.in.dpatch
 01_MAKEFILES__Docs_Makefile.in.dpatch
-01_MAKEFILES__man_Makefile.in.dpatch
 25_mysys__default.c.dpatch
 37_scripts__mysqld_safe.sh__syslog.dpatch
 38_scripts__mysqld_safe.sh__signals.dpatch

Deleted: branches/sid-5.0/debian/patches/01_MAKEFILES__man_Makefile.in.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/01_MAKEFILES__man_Makefile.in.dpatch	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/patches/01_MAKEFILES__man_Makefile.in.dpatch	2007-11-26 17:48:17 UTC (rev 1022)
@@ -1,776 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_MAKEFILES__Docs_Makefile.in.dpatch by  <ch at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Creates man/Makefile.in
-
- at DPATCH@
-
---- old/man/Makefile.in	2005-03-01 02:08:01.877429040 +0100
-+++ new/man/Makefile.in	2005-02-28 21:21:24.000000000 +0100
-@@ -0,0 +1,765 @@
-+# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-+# Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-+# 
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+# 
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+# 
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+
-+# Process this file with automake to create Makefile.in
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = .
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+AS = @AS@
-+ASSEMBLER_FALSE = @ASSEMBLER_FALSE@
-+ASSEMBLER_TRUE = @ASSEMBLER_TRUE@
-+ASSEMBLER_sparc32_FALSE = @ASSEMBLER_sparc32_FALSE@
-+ASSEMBLER_sparc32_TRUE = @ASSEMBLER_sparc32_TRUE@
-+ASSEMBLER_sparc64_FALSE = @ASSEMBLER_sparc64_FALSE@
-+ASSEMBLER_sparc64_TRUE = @ASSEMBLER_sparc64_TRUE@
-+ASSEMBLER_x86_FALSE = @ASSEMBLER_x86_FALSE@
-+ASSEMBLER_x86_TRUE = @ASSEMBLER_x86_TRUE@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@
-+AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@
-+AWK = @AWK@
-+CC = @CC@
-+CCAS = @CCAS@
-+CCASFLAGS = @CCASFLAGS@
-+CCDEPMODE = @CCDEPMODE@
-+CC_VERSION = @CC_VERSION@
-+CFLAGS = @CFLAGS@
-+CHARSETS_NEED_SOURCE = @CHARSETS_NEED_SOURCE@
-+CHARSET_OBJS = @CHARSET_OBJS@
-+CHARSET_SRCS = @CHARSET_SRCS@
-+CHECK_PID = @CHECK_PID@
-+CHMOD = @CHMOD@
-+CLIENT_EXTRA_LDFLAGS = @CLIENT_EXTRA_LDFLAGS@
-+CLIENT_LIBS = @CLIENT_LIBS@
-+CMP = @CMP@
-+COMPILATION_COMMENT = @COMPILATION_COMMENT@
-+COMPILE_PSTACK_FALSE = @COMPILE_PSTACK_FALSE@
-+COMPILE_PSTACK_TRUE = @COMPILE_PSTACK_TRUE@
-+CONF_COMMAND = @CONF_COMMAND@
-+CP = @CP@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CXXLDFLAGS = @CXXLDFLAGS@
-+CXX_VERSION = @CXX_VERSION@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOT_FRM_VERSION = @DOT_FRM_VERSION@
-+DVIS = @DVIS@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FIND_PROC = @FIND_PROC@
-+GETCONF = @GETCONF@
-+GXX = @GXX@
-+HAVE_NETWARE_FALSE = @HAVE_NETWARE_FALSE@
-+HAVE_NETWARE_TRUE = @HAVE_NETWARE_TRUE@
-+HOSTNAME = @HOSTNAME@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+IS_LINUX = @IS_LINUX@
-+KILL = @KILL@
-+LD = @LD@
-+LDFLAGS = @LDFLAGS@
-+LIBDL = @LIBDL@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBTOOL = @LIBTOOL@
-+LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-+LM_CFLAGS = @LM_CFLAGS@
-+LN = @LN@
-+LN_CP_F = @LN_CP_F@
-+LN_S = @LN_S@
-+LOCAL_FALSE = @LOCAL_FALSE@
-+LOCAL_TRUE = @LOCAL_TRUE@
-+LTLIBOBJS = @LTLIBOBJS@
-+MACHINE_TYPE = @MACHINE_TYPE@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKE_BINARY_DISTRIBUTION_OPTIONS = @MAKE_BINARY_DISTRIBUTION_OPTIONS@
-+MAKE_SHELL = @MAKE_SHELL@
-+MT_INCLUDES = @MT_INCLUDES@
-+MT_LD_ADD = @MT_LD_ADD@
-+MV = @MV@
-+MYSQLD_DEFAULT_SWITCHES = @MYSQLD_DEFAULT_SWITCHES@
-+MYSQLD_EXTRA_LDFLAGS = @MYSQLD_EXTRA_LDFLAGS@
-+MYSQLD_USER = @MYSQLD_USER@
-+MYSQL_BASE_VERSION = @MYSQL_BASE_VERSION@
-+MYSQL_NO_DASH_VERSION = @MYSQL_NO_DASH_VERSION@
-+MYSQL_SERVER_SUFFIX = @MYSQL_SERVER_SUFFIX@
-+MYSQL_TCP_PORT = @MYSQL_TCP_PORT@
-+MYSQL_TCP_PORT_DEFAULT = @MYSQL_TCP_PORT_DEFAULT@
-+MYSQL_UNIX_ADDR = @MYSQL_UNIX_ADDR@
-+MYSQL_VERSION_ID = @MYSQL_VERSION_ID@
-+NOINST_LDFLAGS = @NOINST_LDFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PDFMANUAL = @PDFMANUAL@
-+PERL = @PERL@
-+PERL5 = @PERL5@
-+PROTOCOL_VERSION = @PROTOCOL_VERSION@
-+PS = @PS@
-+RANLIB = @RANLIB@
-+RM = @RM@
-+SAVE_ASFLAGS = @SAVE_ASFLAGS@
-+SAVE_CFLAGS = @SAVE_CFLAGS@
-+SAVE_CXXFLAGS = @SAVE_CXXFLAGS@
-+SAVE_CXXLDFLAGS = @SAVE_CXXLDFLAGS@
-+SAVE_LDFLAGS = @SAVE_LDFLAGS@
-+SED = @SED@
-+SET_MAKE = @SET_MAKE@
-+SHARED_LIB_VERSION = @SHARED_LIB_VERSION@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+SYSTEM_TYPE = @SYSTEM_TYPE@
-+TAR = @TAR@
-+TERMCAP_LIB = @TERMCAP_LIB@
-+THREAD_LOBJECTS = @THREAD_LOBJECTS@
-+THREAD_LPROGRAMS = @THREAD_LPROGRAMS@
-+VERSION = @VERSION@
-+WRAPLIBS = @WRAPLIBS@
-+YACC = @YACC@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_GETCONF = @ac_ct_GETCONF@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+bdb_includes = @bdb_includes@
-+bdb_libs = @bdb_libs@
-+bdb_libs_with_path = @bdb_libs_with_path@
-+bench_dirs = @bench_dirs@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+default_charset = @default_charset@
-+docs_dirs = @docs_dirs@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+innodb_includes = @innodb_includes@
-+innodb_libs = @innodb_libs@
-+innodb_system_libs = @innodb_system_libs@
-+install_sh = @install_sh@
-+isam_libs = @isam_libs@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libmysqld_dirs = @libmysqld_dirs@
-+linked_client_targets = @linked_client_targets@
-+linked_netware_sources = @linked_netware_sources@
-+localstatedir = @localstatedir@
-+man_dirs = @man_dirs@
-+mandir = @mandir@
-+netware_dir = @netware_dir@
-+oldincludedir = @oldincludedir@
-+openssl_includes = @openssl_includes@
-+openssl_libs = @openssl_libs@
-+orbit_idl = @orbit_idl@
-+orbit_includes = @orbit_includes@
-+orbit_libs = @orbit_libs@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+pstack_dirs = @pstack_dirs@
-+pstack_libs = @pstack_libs@
-+readline_dir = @readline_dir@
-+readline_link = @readline_link@
-+sbindir = @sbindir@
-+server_scripts = @server_scripts@
-+sharedstatedir = @sharedstatedir@
-+sql_client_dirs = @sql_client_dirs@
-+sql_server_dirs = @sql_server_dirs@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+thread_dirs = @thread_dirs@
-+tools_dirs = @tools_dirs@
-+uname_prog = @uname_prog@
-+vio_dir = @vio_dir@
-+vio_libs = @vio_libs@
-+
-+AUTOMAKE_OPTIONS = foreign
-+
-+# These are built from source in the Docs directory
-+EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
-+SUBDIRS = . include @docs_dirs@ @readline_dir@ \
-+			@thread_dirs@ pstack @sql_client_dirs@ \
-+			@sql_server_dirs@ scripts @man_dirs@ tests \
-+			BUILD netware os2 @libmysqld_dirs@ \
-+			@bench_dirs@ support-files @tools_dirs@
-+
-+
-+# Relink after clean
-+linked_sources = linked_client_sources linked_server_sources \
-+		 linked_libmysql_sources linked_libmysql_r_sources \
-+		 linked_libmysqld_sources  linked_libmysqldex_sources \
-+		 linked_include_sources @linked_netware_sources@
-+
-+
-+CLEANFILES = $(linked_sources)
-+subdir = .
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = config.h
-+CONFIG_CLEAN_FILES = bdb/Makefile
-+DIST_SOURCES =
-+
-+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-+	ps-recursive install-info-recursive uninstall-info-recursive \
-+	all-recursive install-data-recursive install-exec-recursive \
-+	installdirs-recursive install-recursive uninstall-recursive \
-+	check-recursive installcheck-recursive
-+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure COPYING \
-+	ChangeLog Makefile.am acconfig.h acinclude.m4 aclocal.m4 \
-+	config.guess config.h.in config.sub configure configure.in \
-+	depcomp install-sh ltconfig ltmain.sh missing mkinstalldirs
-+DIST_SUBDIRS = $(SUBDIRS)
-+all: config.h
-+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-+
-+.SUFFIXES:
-+
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-+
-+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
-+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-+	cd $(srcdir) && $(AUTOCONF)
-+
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
-+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+
-+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-+	@rm -f stamp-h1
-+	cd $(top_builddir) && $(SHELL) ./config.status config.h
-+
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h
-+	cd $(top_srcdir) && $(AUTOHEADER)
-+	touch $(srcdir)/config.h.in
-+
-+distclean-hdr:
-+	-rm -f config.h stamp-h1
-+bdb/Makefile: $(top_builddir)/config.status $(top_srcdir)/bdb/Makefile.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
-+
-+ETAGS = etags
-+ETAGSFLAGS =
-+
-+CTAGS = ctags
-+CTAGSFLAGS =
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	else \
-+	  include_option=--include; \
-+	fi; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -f $$subdir/TAGS && \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	     $$tags $$unique
-+
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = .
-+distdir = $(PACKAGE)-$(VERSION)
-+
-+am__remove_distdir = \
-+  { test ! -d $(distdir) \
-+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr $(distdir); }; }
-+
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
-+
-+distdir: $(DISTFILES)
-+	$(am__remove_distdir)
-+	mkdir $(distdir)
-+	$(mkinstalldirs) $(distdir)/bdb $(distdir)/include
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d $(distdir)/$$subdir \
-+	    || mkdir $(distdir)/$$subdir \
-+	    || exit 1; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$(top_distdir)" \
-+	        distdir=../$(distdir)/$$subdir \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+	$(MAKE) $(AM_MAKEFLAGS) \
-+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-+	  dist-hook
-+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+	|| chmod -R a+r $(distdir)
-+dist-gzip: distdir
-+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
-+
-+dist dist-all: distdir
-+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	$(am__remove_distdir)
-+	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
-+	chmod -R a-w $(distdir); chmod a+w $(distdir)
-+	mkdir $(distdir)/_build
-+	mkdir $(distdir)/_inst
-+	chmod a-w $(distdir)
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+	  && cd $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+	    $(DISTCHECK_CONFIGURE_FLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+	        distuninstallcheck \
-+	  && chmod -R a-w "$$dc_install_base" \
-+	  && ({ \
-+	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+	  && rm -rf "$$dc_destdir" \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
-+	  && rm -f $(distdir).tar.gz \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-+	$(am__remove_distdir)
-+	@echo "$(distdir).tar.gz is ready for distribution" | \
-+	  sed 'h;s/./=/g;p;x;p;x'
-+distuninstallcheck:
-+	@cd $(distuninstallcheck_dir) \
-+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+	   || { echo "ERROR: files left after uninstall:" ; \
-+	        if test -n "$(DESTDIR)"; then \
-+	          echo "  (check DESTDIR support)"; \
-+	        fi ; \
-+	        $(distuninstallcheck_listfiles) ; \
-+	        exit 1; } >&2
-+distcleancheck: distclean
-+	@if test '$(srcdir)' = . ; then \
-+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+	  exit 1 ; \
-+	fi
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	  || { echo "ERROR: files left in build directory after distclean:" ; \
-+	       $(distcleancheck_listfiles) ; \
-+	       exit 1; } >&2
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile config.h
-+installdirs: installdirs-recursive
-+installdirs-am:
-+
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+distclean-generic:
-+	-rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
-+
-+clean-am: clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-recursive
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
-+	distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am:
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf $(top_srcdir)/autom4te.cache
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-+	clean-generic clean-libtool clean-recursive ctags \
-+	ctags-recursive dist dist-all dist-gzip distcheck distclean \
-+	distclean-generic distclean-hdr distclean-libtool \
-+	distclean-recursive distclean-tags distcleancheck distdir \
-+	distuninstallcheck dvi dvi-am dvi-recursive info info-am \
-+	info-recursive install install-am install-data install-data-am \
-+	install-data-recursive install-exec install-exec-am \
-+	install-exec-recursive install-info install-info-am \
-+	install-info-recursive install-man install-recursive \
-+	install-strip installcheck installcheck-am installdirs \
-+	installdirs-am installdirs-recursive maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-+	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-+	tags-recursive uninstall uninstall-am uninstall-info-am \
-+	uninstall-info-recursive uninstall-recursive
-+
-+
-+# This is just so that the linking is done early.
-+config.h: $(linked_sources)
-+
-+linked_include_sources:
-+	cd include; $(MAKE) link_sources
-+	echo timestamp > linked_include_sources
-+
-+linked_client_sources:  @linked_client_targets@
-+	cd client; $(MAKE) link_sources
-+	echo timestamp > linked_client_sources
-+
-+linked_libmysql_sources:
-+	cd libmysql; $(MAKE) link_sources
-+	echo timestamp > linked_libmysql_sources
-+
-+linked_libmysql_r_sources: linked_libmysql_sources
-+	cd libmysql_r; $(MAKE) link_sources
-+	echo timestamp > linked_libmysql_r_sources
-+
-+linked_libmysqld_sources:
-+	cd libmysqld; $(MAKE) link_sources
-+	echo timestamp > linked_libmysqld_sources
-+
-+linked_libmysqldex_sources:
-+	cd libmysqld/examples; $(MAKE) link_sources
-+	echo timestamp > linked_libmysqldex_sources
-+
-+linked_netware_sources:
-+	cd @netware_dir@; $(MAKE) link_sources
-+	echo timestamp > linked_netware_sources
-+
-+#avoid recursive make calls in sql directory
-+linked_server_sources:
-+	cd sql; rm -f mini_client_errors.c;@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c
-+	echo timestamp > linked_server_sources
-+
-+# Create permission databases
-+init-db:		all
-+	$(top_builddir)/scripts/mysql_install_db
-+
-+bin-dist:		all
-+	$(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@
-+
-+# Remove BK's "SCCS" subdirectories from source distribution
-+dist-hook:
-+	rm -rf `find $(distdir) -type d -name SCCS`
-+
-+tags:
-+	support-files/build-tags
-+.PHONY:		init-db bin-dist
-+
-+# Test installation
-+
-+test:
-+	cd mysql-test ; ./mysql-test-run
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:

Modified: branches/sid-5.0/debian/rules
===================================================================
--- branches/sid-5.0/debian/rules	2007-11-26 13:22:02 UTC (rev 1021)
+++ branches/sid-5.0/debian/rules	2007-11-26 17:48:17 UTC (rev 1022)
@@ -100,7 +100,6 @@
 		--without-ndb-test \
 		--with-embedded-server \
 		--with-embedded-privilege-control \
-		--without-man \
 		--with-ndb-docs'
 		
 	#       --sysconfdir=/etc/mysql 	-- Appends /etc/mysql after ~/ in the my.cnf search patch!
@@ -171,13 +170,7 @@
 	# mysql-client package they get not compressed and end up stale
 	mkdir -p $(TMP)/usr/share/man/man1/
 	mkdir -p $(TMP)/usr/share/man/man8/
-	for i in `grep /man/man1/ debian/mysql-client*.files`; do ln -sf mysql-license-dummy.1 $(TMP)/usr/share/man/man1/`basename $$i`; done
-	for i in `grep /man/man1/ debian/mysql-server*.files`; do ln -sf mysqld-license-dummy.1 $(TMP)/usr/share/man/man1/`basename $$i`; done
-	for i in `grep /man/man8/ debian/mysql-server*.files`; do ln -sf ../man1/mysqld-license-dummy.1 $(TMP)/usr/share/man/man8/`basename $$i`; done
-	# some self written manpages which hopefully get added upstream
-	cp --no-dereference --remove-destination debian/additions/*.1 $(TMP)/usr/share/man/man1/
-	ln -sf mysqlmanager.1 $(TMP)/usr/share/man/man1/mysqlmanager-pwgen.1
-	ln -sf mysqlmanager.1 $(TMP)/usr/share/man/man1/mysqlmanagerc.1
+	cp debian/additions/*.1 $(TMP)/usr/share/man/man1/
 
 	# make install (trailing slash needed for innobase)
 	$(MAKE) install DESTDIR=$(TMP)/




More information about the Pkg-mysql-commits mailing list