And now moving wheezy branch to be unstable.

git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2201 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1
author: spamaps-guest <spamaps-guest@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1> 2012-11-16 08:09:49 +0000
committer: spamaps-guest <spamaps-guest@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1> 2012-11-16 08:09:49 +0000
commit: 13f6ba21c5b062bdc080f7f88e1a37c1b928f27e (patch)
tree: 1de8b2f2222ff3a99f97a75c25e3152518aa0e65
parent: bf5905b4ab3bb98faf770c9131df0de067033118 (diff)
download: mysql-5.5-13f6ba21c5b062bdc080f7f88e1a37c1b928f27e.tar.gz
69 files changed, 1296 insertions, 777 deletions
diff --git a/debian/additions/msql2mysql.1 b/debian/additions/msql2mysql.1
new file mode 100644
index 0000000..8fe05e7
--- /dev/null
+++ b/debian/additions/msql2mysql.1
@@ -0,0 +1,16 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/my_print_defaults.1 b/debian/additions/my_print_defaults.1
new file mode 100644
index 0000000..ebef415
--- /dev/null
+++ b/debian/additions/my_print_defaults.1
@@ -0,0 +1,16 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/myisam_ftdump.1 b/debian/additions/myisam_ftdump.1
new file mode 100644
index 0000000..e2de358
--- /dev/null
+++ b/debian/additions/myisam_ftdump.1
@@ -0,0 +1,16 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/myisamchk.1 b/debian/additions/myisamchk.1
new file mode 100644
index 0000000..fe7f349
--- /dev/null
+++ b/debian/additions/myisamchk.1
@@ -0,0 +1,17 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/myisamlog.1 b/debian/additions/myisamlog.1
new file mode 100644
index 0000000..959d547
--- /dev/null
+++ b/debian/additions/myisamlog.1
@@ -0,0 +1,16 @@
+.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@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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/myisampack.1 b/debian/additions/myisampack.1
new file mode 100644
index 0000000..9316830
--- /dev/null
+++ b/debian/additions/myisampack.1
@@ -0,0 +1,19 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysql_config.1 b/debian/additions/mysql_config.1
new file mode 100644
index 0000000..88095e2
--- /dev/null
+++ b/debian/additions/mysql_config.1
@@ -0,0 +1,17 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysql_convert_table_format.1 b/debian/additions/mysql_convert_table_format.1
new file mode 100644
index 0000000..3c23581
--- /dev/null
+++ b/debian/additions/mysql_convert_table_format.1
@@ -0,0 +1,17 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysql_find_rows.1 b/debian/additions/mysql_find_rows.1
new file mode 100644
index 0000000..35a70b1
--- /dev/null
+++ b/debian/additions/mysql_find_rows.1
@@ -0,0 +1,18 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysql_fix_extensions.1 b/debian/additions/mysql_fix_extensions.1
new file mode 100644
index 0000000..3f0a028
--- /dev/null
+++ b/debian/additions/mysql_fix_extensions.1
@@ -0,0 +1,18 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysql_install_db.1 b/debian/additions/mysql_install_db.1
new file mode 100644
index 0000000..11f1f29
--- /dev/null
+++ b/debian/additions/mysql_install_db.1
@@ -0,0 +1,16 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysql_secure_installation.1 b/debian/additions/mysql_secure_installation.1
new file mode 100644
index 0000000..d65b7f5
--- /dev/null
+++ b/debian/additions/mysql_secure_installation.1
@@ -0,0 +1,17 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysql_setpermission.1 b/debian/additions/mysql_setpermission.1
new file mode 100644
index 0000000..77167e0
--- /dev/null
+++ b/debian/additions/mysql_setpermission.1
@@ -0,0 +1,23 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysql_tableinfo.1 b/debian/additions/mysql_tableinfo.1
new file mode 100644
index 0000000..1de4f5d
--- /dev/null
+++ b/debian/additions/mysql_tableinfo.1
@@ -0,0 +1,322 @@
+.\" 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@mines\-paris.org)
+.Sp
+And all the authors of mysqlhotcopy, which served as a model for 
+the structure of the program.
diff --git a/debian/additions/mysql_waitpid.1 b/debian/additions/mysql_waitpid.1
new file mode 100644
index 0000000..f687786
--- /dev/null
+++ b/debian/additions/mysql_waitpid.1
@@ -0,0 +1,20 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysqlbinlog.1 b/debian/additions/mysqlbinlog.1
new file mode 100644
index 0000000..fcdf2a0
--- /dev/null
+++ b/debian/additions/mysqlbinlog.1
@@ -0,0 +1,17 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysqlbug.1 b/debian/additions/mysqlbug.1
new file mode 100644
index 0000000..133330d
--- /dev/null
+++ b/debian/additions/mysqlbug.1
@@ -0,0 +1,14 @@
+.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
+.SH NAME
+mysqlbug \- MySQL bug reporting tool.
+.SH SYNOPSIS
+mysqlbug [options]
+.SH DESCRIPTION
+Interactive bug reporting tool. Use reportbug on Debian systems.
+.SH "SEE ALSO"
+mysql (1), mysqld (1)
+.SH AUTHOR
+This manpage was written by Christian Hammers <ch@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysqlcheck.1 b/debian/additions/mysqlcheck.1
new file mode 100644
index 0000000..b36ba2d
--- /dev/null
+++ b/debian/additions/mysqlcheck.1
@@ -0,0 +1,28 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysqldumpslow.1 b/debian/additions/mysqldumpslow.1
new file mode 100644
index 0000000..0431ef0
--- /dev/null
+++ b/debian/additions/mysqldumpslow.1
@@ -0,0 +1,50 @@
+.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
+.SH NAME
+mysqldumpslow \- Parse and summarize the MySQL slow query log.
+.SH SYNOPSIS
+mysqldumpslow [options]
+.SH DESCRIPTION
+This program parses and summarizes a 'slow query log'.
+
+.TP
+\fB\-v\fR 
+verbose
+.TP
+\fB\-d\fR 
+debug
+.TP
+\fB\-s=WORD\fR 
+what to sort by (t, at, l, al, r, ar etc)
+.TP
+\fB\-r\fR  
+reverse the sort order (largest last instead of first)
+.TP
+\fB\-t=NUMBER\fR 
+just show the top n queries
+.TP
+\fB\-a\fR  
+don't abstract all numbers to N and strings to 'S'
+.TP
+\fB\-n=NUMBER\fR
+abstract numbers with at least n digits within names
+.TP
+\fB\-g=WORD\fR 
+grep: only consider stmts that include this string
+.TP
+\fB\-h=WORD\fR
+hostname of db server for *-slow.log filename (can be wildcard)
+.TP
+\fB\-i=WORD\fR 
+name of server instance (if using mysql.server startup script)
+.TP
+\fB\-l\fR  
+don't subtract lock time from total time
+
+.SH "SEE ALSO"
+mysql (1), mysqld (1)
+.SH AUTHOR
+This manpage was written by Christian Hammers <ch@debian.org> based on
+the commends in the code.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysqlimport.1 b/debian/additions/mysqlimport.1
new file mode 100644
index 0000000..9007307
--- /dev/null
+++ b/debian/additions/mysqlimport.1
@@ -0,0 +1,20 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/mysqltest.1 b/debian/additions/mysqltest.1
new file mode 100644
index 0000000..3469765
--- /dev/null
+++ b/debian/additions/mysqltest.1
@@ -0,0 +1,16 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/pack_isam.1 b/debian/additions/pack_isam.1
new file mode 100644
index 0000000..cad153e
--- /dev/null
+++ b/debian/additions/pack_isam.1
@@ -0,0 +1,19 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/resolve_stack_dump.1 b/debian/additions/resolve_stack_dump.1
new file mode 100644
index 0000000..2a1e277
--- /dev/null
+++ b/debian/additions/resolve_stack_dump.1
@@ -0,0 +1,16 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/additions/resolveip.1 b/debian/additions/resolveip.1
new file mode 100644
index 0000000..7aa9439
--- /dev/null
+++ b/debian/additions/resolveip.1
@@ -0,0 +1,16 @@
+.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@debian.org>.
+
+MySQL is available at http://www.mysql.com/.
+.\" end of man page
diff --git a/debian/changelog b/debian/changelog
index e6a81e2..cd170e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,64 +1,123 @@
-mysql-5.5 (5.5.25+dfsg-1) UNRELEASED; urgency=low
+mysql-5.5 (5.5.28+dfsg-1) unstable; urgency=low
+
+  * New upstream release (resolves CVE-2012-3163, CVE-2012-3158, CVE-2012-3177,
+    CVE-2012-3147, CVE-2012-3166, CVE-2012-3173, CVE-2012-3144, CVE-2012-3150,
+    CVE-2012-3180, CVE-2012-3149, CVE-2012-3156, CVE-2012-3167, CVE-2012-3197,
+    CVE-2012-3160) (Closes: #690778)
+  * Removed debian/patches/73_mysqlcheck_tests.patch and
+    debian/patches/2_main_openssl_1.patch as they did not apply cleanly and did
+    not seem to be required any longer
+  * Refreshed patches and updated headers:
+    - debian/patches/73_mysqlcheck_tests.patch
+    - debian/patches/94_spelling.patch
+    - debian/patches/70_mysql_va_list.patch
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk>  Sun, 28 Oct 2012 09:22:24 +0000
+
+mysql-5.5 (5.5.24+dfsg-9) unstable; urgency=low
+
+  * Danish debconf translation (Closes: #684566)
+  * Turkish debconf translation (Closes: #688294)
+  * Loosened versioned dependency between mysql-server-5.5 and
+    mysql-server-core-5.5, hopefully (Closes: #686803)
+  * Restored zlib1g-dev (>= 1:1.1.3-5) as a build dependency
+    and made the use of system libz explicit in debian/rules
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk>  Sat, 22 Sep 2012 15:01:11 +0100
+
+mysql-5.5 (5.5.24+dfsg-8) unstable; urgency=low
+
+  * Updated debian/copyright after analysis from development version
+    of license-reconcile (Closes: #682311)
+    - 'Comments' field to corrected to 'Comment'
+    - Missing paragraphs for '*', 'debian/*' and for the mysqlreport
+      and innotop scripts
+    - Removed duplicate entries from Files listings
+    - Added clause for files licensed under BSD (4-clause)
+    - Clarified 'BSD (3 clause) GPL-2' as being 'BSD (3 clause) or GPL-2'
+  * Updated Slovak debconf translation (Closes: #684644)
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk>  Tue, 04 Sep 2012 06:56:24 +0100
+
+mysql-5.5 (5.5.24+dfsg-7) unstable; urgency=low
+
+  * Updated Turkish debconf translation (Closes: #683733)
+  * Use xz compression for binary packages (Closes: #684146)
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk>  Sat, 11 Aug 2012 21:02:27 +0100
+
+mysql-5.5 (5.5.24+dfsg-6) unstable; urgency=low
+
+  * Updated Czech debconf translation (Closes: #681711)
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk>  Sun, 29 Jul 2012 13:04:46 +0100
+
+mysql-5.5 (5.5.24+dfsg-5) unstable; urgency=medium
+
+  * Spanish debconf translation (Closes: #679053)
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk>  Sat, 14 Jul 2012 13:36:13 +0100
+
+mysql-5.5 (5.5.24+dfsg-4) unstable; urgency=low
+
+  * Made DFSG repacking mechanism independent of local installs, improved
+    the documentation and added debian/README.source
+  * Setting the gcc/g++ version to 4.4 on i386 platforms and removed
+    patch disabling tests (Closes: #674267) but see #678252 for follow
+    up from upstream
+  * Danish debconf translation (Closes: #599483)
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk>  Thu, 21 Jun 2012 13:36:40 +0100
+
+mysql-5.5 (5.5.24+dfsg-3) unstable; urgency=high
+
+  * Added versioned dependency on initscripts and revert /var/run
+    to /run change (Closes: #676560)
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk>  Thu, 07 Jun 2012 23:29:32 +0100
+
+mysql-5.5 (5.5.24+dfsg-2) unstable; urgency=low
+
+  * Really bumped the version in shlibs
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk>  Mon, 04 Jun 2012 23:03:35 +0100
+
+mysql-5.5 (5.5.24+dfsg-1) unstable; urgency=low
+
+  * New upstream release. Fixes CVE-2012-2102 mysql DoS by authenticated user
+  * Updated Portuguese translation (Closes: #674953)
+  * Updated Swedish translation (Closes: #675108)
+  * Updated German translation (Closes: #675766)
+  * Refreshed spelling patch
+  * Added patch to libmysql/CMakeLists.txt to restore symbol versioning
+    and bumped dependency in shlibs (Closes: #660686)
+  * Ensured that /etc/mysql/conf.d is installed as part of mysql-common
+    so that client programs work without a co-located server (Closes: #672359)
+  * Added versioned Breaks clause against amarok (cf. #675304)
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk>  Mon, 04 Jun 2012 18:17:04 +0100
+
+mysql-5.5 (5.5.23+dfsg-2) unstable; urgency=low
 
   * Fixing regular expression in tests to guard against build path containing
     the '+' symbol (Closes: #674210)
-  * Setting the gcc/g++ version to 4.4 on i386 platforms (Closes: #674267)
-    but see #678252 for follow up from upstream
-  * Removed main_openssl_1 patch
-  * Set SYSTEM_TYPE according to GNU Build System
-  * In an effort to get a better handle on test coverage, made test failures
-    on kfreebsd-i386 fatal and re-enabled full tests on hurd, skipped certain
-    tests on kfreebsd and changed disabled tests to selectively skipped tests
+  * Disabled certain SSL tests pending investigation (cf. #674267)
   * Updated French translation (Closes: #674025)
   * Updated Dutch translation (Closes: #674124)
   * Updated Russian translation (Closes: #674189)
-  * Updated Portuguese translation (Closes: #674953)
-  * Updated Swedish translation (Closes: #675108)
-  * Updated German translation (Closes: #675766)
-  * Danish debconf translation (Closes: #599483)
-  * Spanish debconf translation (Closes: #679053)
-  * Migrated libmysqlclient-dev, mysql-client-5.5, mysql-server-core-5.5
-    and mysql-server-5.5 off dh_movefiles
-  * Removed dh_movefiles override
-  * Rewrote libmysqlclient_r linking stuff to generate
-    ephemeral dh_link files so that the hack is more comprehensible
-  * Stopped attempts to install non-existent files for libmysqlclient-dev
-    and mysql-server-5.5
-  * Added --fail-missing to dh_install to catch executables not being installed
-  * Distributed unused resources amongst packages appropriately
-  * Added fixes to mop up various permissions issues in auto-install rule
-  * Enhanced documentation around the source package and the reasons for it
-    being arch:any
-  * Removed source cruft: debian/additions/*.1 (apart from mysqlreport.1)
-  * Restored zlib1g-dev build dependency pending further investigation
-  * Removed the numerical prefix from the patch files
-  * Applied fix-mysqldump-test.patch from Ubuntu
-  * Applied mysql-testsuite and mysql-client-core-5.5 package definitions
-    from Ubuntu
-  * Located and installed upstream changelog
-  * Removed doxygen-latex, ghostscript as build dependency
-    as these were needed only for the NDB docs
-  * Added lintian overrides
-    - spelling false positive: yuR
-    - long lines in man pages that cannot be reformatted
-    - missing symbols file (cf. #590905)
-  * Added patch for hyphen/minus sign confusion
-  * Dropped mailx to Suggests clause (Closes: #535496)
-  * New upstream source
-  * Refreshed patches
-  * Standardized debian/watch and get-orig-source and made DFSG exclusion
-    of Docs/mysql.info explicit (Closes: #673528)
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk>  Fri, 25 May 2012 23:38:16 +0100
+
+mysql-5.5 (5.5.23+dfsg-1) unstable; urgency=low
+
   * Revert having libssl-dev as a build dependency and changed
     WITH_SSL option to 'bundled' from 'yes' (Closes: #590905)
     and (Closes: #673865)
-  * Added patch to libmysql/CMakeLists.txt to restore symbol versioning
-    and bumped dependency in shlibs (Closes: #660686)
-  * Ensured that /etc/mysql/conf.d is installed as part of mysql-common
-    so that client programs work without a co-located server (Closes: #672359)
-  * Added versioned dependency on initscripts and revert /var/run
-    to /run change (Closes: #676560)
+  * Standardized debian/watch and get-orig-source and made DFSG exclusion
+    of Docs/mysql.info explicit (Closes: #673528)
+  * Located and installed upstream changelog
 
- -- Nicholas Bamber <nicholas@periapt.co.uk>  Tue, 08 May 2012 09:04:25 +0100
+ -- Nicholas Bamber <nicholas@periapt.co.uk>  Tue, 22 May 2012 21:42:39 +0100
 
 mysql-5.5 (5.5.23-2) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 16b91f4..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/libmysqlclient18.links
-debian/libmysqlclient-dev.links
diff --git a/debian/control b/debian/control
index 0808e98..df3d7e5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <norbert@tretkowski.de>,
  Clint Byrum <clint@ubuntu.com>, Nicholas Bamber <nicholas@periapt.co.uk>
-Build-Depends: debhelper (>= 8.1.3~), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, po-debconf, psmisc, chrpath, gawk, bison, lsb-release, hardening-wrapper, cmake, gcc-4.4 [any-i386], g++-4.4 [any-i386]
+Build-Depends: debhelper (>= 8.1.3~), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, po-debconf, psmisc, chrpath, doxygen-latex, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake, gcc-4.4 [any-i386], g++-4.4 [any-i386]
 Standards-Version: 3.9.3
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/
@@ -51,7 +51,7 @@ Description: MySQL embedded database development files
 Package: libmysqlclient-dev
 Architecture: any
 Section: libdevel
-Depends: libmysqlclient18 (= ${binary:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends}
+Depends: libmysqlclient18 (= ${binary:Version}), zlib1g-dev, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev
 Provides: libmysqlclient15-dev
 Replaces: libmysqlclient15-dev
@@ -66,7 +66,7 @@ Description: MySQL database development files
 Package: mysql-common
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: mysql-server-5.1 (<< 5.5), mysql-client-5.1 (<< 5.5), mysql-server-core-5.1 (<< 5.5)
+Breaks: mysql-server-5.1 (<< 5.5), mysql-client-5.1 (<< 5.5), mysql-server-core-5.1 (<< 5.5), amarok (<< 2.5.0-2)
 Multi-Arch: foreign
 Description: MySQL database common files, e.g. /etc/mysql/my.cnf
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
@@ -77,22 +77,9 @@ Description: MySQL database common files, e.g. /etc/mysql/my.cnf
  This package includes files needed by all versions of the client library,
  e.g. /etc/mysql/my.cnf.
 
-Package: mysql-client-core-5.5
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: mysql-client-5.5 (<< ${source:Version})
-Replaces: mysql-client-5.5 (<< ${source:Version})
-Description: MySQL database core client binaries
- MySQL is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MySQL are speed, robustness and
- ease of use.
- .
- This package includes the core client files, as used by Akonadi.
-
 Package: mysql-client-5.5
 Architecture: any
-Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, mysql-client-core-5.5
+Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: virtual-mysql-client, mysql-client
 Breaks: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1
 Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1
@@ -123,14 +110,14 @@ Description: MySQL database server binaries
 
 Package: mysql-server-5.5
 Architecture: any
-Recommends: libhtml-template-perl
-Suggests: tinyca, mailx
+Suggests: tinyca
+Recommends: mailx, libhtml-template-perl
 Pre-Depends: mysql-common (>= ${source:Version}), adduser (>= 3.40), debconf
-Depends: mysql-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mysql-server-core-5.5 (= ${binary:Version}), initscripts (>= 2.88dsf-13.3)
+Depends: mysql-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mysql-server-core-5.5 (>= ${source:Version}), initscripts (>= 2.88dsf-13.3)
 Breaks: mysql-server (<< ${source:Version}), mysql-server-5.1, libmysqlclient-dev ( << 5.5.17~), mysql-client-5.1
 Provides: virtual-mysql-server
-Replaces: mysql-server (<< ${source:Version}), mysql-server-5.1,  mysql-server-5.0,
- mysql-client-5.1, libmysqlclient-dev ( << 5.5.17~)
+Replaces: mysql-server (<< ${source:Version}), mysql-server-5.1,  mysql-server-5.0, , mysql-client-5.1,
+ libmysqlclient-dev ( << 5.5.17~)
 Description: MySQL database server binaries and system database setup 
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -165,19 +152,10 @@ Description: MySQL database client (metapackage depending on the latest version)
  you want, as this is the one considered to be in the best shape by the
  Maintainers.
 
-Package: mysql-testsuite
-Architecture: all
-Depends: mysql-testsuite-5.5, ${misc:Depends}
-Description: MySQL testsuite
- This is an empty package that depends on the current "best" version of
- mysql-testsuite (currently mysql-testsuite-5.5), as determined by the
- MySQL maintainers.  Install this package if in doubt about which MySQL
- version you want, as this is the one considered to be in the best shape.
-
 Package: mysql-testsuite-5.5
 Architecture: any
 Depends: mysql-server (= ${source:Version}), mysql-client (= ${source:Version}), ${misc:Depends},  ${shlibs:Depends}
-Description: MySQL 5.5 testsuite
+Description: MySQL testsuite
  MySQL is a fast, stable, and true multi-user, multi-threaded SQL database
  server.  SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MySQL are speed, robustness and
@@ -194,6 +172,4 @@ Description: MySQL source
  language in the world. The main goals of MySQL are speed, robustness and
  ease of use.
  .
- This package includes the MySQL source code as configured before building
- - but after the arch specific configuration. This is currently required for
- building plugins.
+ This package includes the MySQL source code as configured before building.
diff --git a/debian/copyright b/debian/copyright
index 54ffa5f..d2654a3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,14 +2,16 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: MySQL 5.5
 Upstream-Contact: http://bugs.mysql.com/
 Source: http://dev.mysql.com/downloads/mysql/5.5.html
-Comments:
+Comment:
  The file Docs/mysql.info is removed from the upstream source
  because it is incompatible with the Debian Free Software Guidelines.
  See debian/README.source for how this repacking was done.
  .
  Originally produced by a modified version of licensecheck2dep5
  from CDBS by Clint Byrum <clint@ubuntu.com>. Hand modified to reduce 
- redundancy in the output and add appropriate license text.
+ redundancy in the output and add appropriate license text. The file
+ has been rechecked against the source using the development version
+ of license-reconcile, see #686485.
  .
  Also, MySQL carries the "FOSS License Exception" specified in README
  .
@@ -124,6 +126,37 @@ Comments:
  The above text is subject to this copyright notice:
  © 2010, Oracle and/or its affiliates.
 
+Files: *
+Copyright: 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+License: GPL-2
+
+Files: debian/*
+Copyright: 
+ 1997-1998, Scott Hanson <shanson@debian.org>
+ 1997, Christian Schwarz <schwarz@debian.org>
+ 1999-2007, 2009, Christian Hammers <ch@debian.org>
+ 2000-2001, Christopher C. Chimelis <chris@debian.org>
+ 2001, Matthew Wilcox <willy@debian.org>
+ 2005-2007, sean finney <seanius@debian.org>
+ 2006, Adam Conrad <adconrad@0c3.net>
+ 2007-2011, Norbert Tretkowski <norbert@tretkowski.de>
+ 2007-2008, Monty Taylor <mordred@inaugust.com>
+ 2008, Devin Carraway <devin@debian.org>
+ 2008, Steffen Joeris <white@debian.org>
+ 2010, Xavier Oswald <xoswald@debian.org>
+ 2011, Clint Byrum <clint@ubuntu.com>
+ 2011, Ondřej Surý <ondrej@debian.org>
+ 2012, Nicholas Bamber <nicholas@periapt.co.uk>
+License: GPL-2+
+
+Files: debian/additions/mysqlreport*
+Copyright: 2006-2008, Daniel Nichter <public@codenode.com>
+License: GPL-2+
+
+Files: debian/additions/innotop/*
+Copyright: 2006, Baron Schwartz <baron at xaprb dot com>
+License: Artistic or GPL-2
+
 Files: cmd-line-utils/libedit/config.h
  dbug/example1.c
  dbug/example2.c
@@ -151,6 +184,7 @@ Files: cmd-line-utils/libedit/config.h
  support-files/mysqld_multi.server.sh
  support-files/mysql-log-rotate.sh
  support-files/mysql.server-sys5.sh
+ Docs/*
 Copyright: UNKNOWN
 Comment: These files fall under the blanket license specified in the file
  COPYING and README
@@ -165,7 +199,6 @@ License: GPL-2
  of which version of the GPL is applied is otherwise unspecified.
 
 Files: BUILD/*
- Docs/*
  client/*
  client/echo.c
  client/get_password.c
@@ -177,7 +210,6 @@ Files: BUILD/*
  libmysqld/*
  libservices/*
  mysql-test/include/have_perfschema.inc
- mysql-test/include/have_perfschema.inc
  mysql-test/lib/mtr_cases.pm
  mysql-test/lib/mtr_gcov.pl
  mysql-test/lib/mtr_gprof.pl
@@ -189,7 +221,6 @@ Files: BUILD/*
  mysql-test/lib/mtr_results.pm
  mysql-test/lib/mtr_stress.pl
  mysql-test/lib/mtr_unique.pm
- mysql-test/lib/My/ConfigFactory.pm
  mysql-test/lib/My/Config.pm
  mysql-test/lib/My/CoreDump.pm
  mysql-test/lib/My/File/*
@@ -198,7 +229,6 @@ Files: BUILD/*
  mysql-test/lib/My/Options.pm
  mysql-test/lib/My/Platform.pm
  mysql-test/lib/My/SafeProcess/Base.pm
- mysql-test/lib/My/SafeProcess.pm
  mysql-test/lib/My/SafeProcess/safe_kill_win.cc
  mysql-test/lib/My/SafeProcess/safe_process.cc
  mysql-test/lib/My/SafeProcess/safe_process.pl
@@ -219,14 +249,12 @@ Files: BUILD/*
  mysql-test/lib/v1/mtr_timer.pl
  mysql-test/lib/v1/mtr_unique.pl
  mysql-test/lib/v1/My/*
- mysql-test/lib/v1/My/*
  mysql-test/lib/v1/mysql-test-run.pl
  mysql-test/mysql-stress-test.pl
  mysql-test/mysql-test-run.pl
  mysql-test/std_data/*
  mysql-test/suite/perfschema/include/*
  mysql-test/suite/perfschema_stress/include/*
- mysql-test/suite/perfschema_stress/include/*
  mysys/*
  packaging/WiX/ca/*
  plugin/audit_null/*
@@ -269,6 +297,10 @@ Files: cmd-line-utils/libedit/*
 Copyright: 1989-1990,1992-1993 The Regents of the University of California.
 License: BSD (3 clause)
 
+Files: cmd-line-utils/libedit/chartype.* cmd-line-utils/libedit/eln.c
+Copyright: 2009, The NetBSD Foundation, Inc.
+License: BSD (4 clause)
+
 Files: cmd-line-utils/libedit/filecomplete.c
  cmd-line-utils/libedit/filecomplete.h
  cmd-line-utils/libedit/np/fgetln.c
@@ -308,18 +340,35 @@ Files: client/completion_hash.h
  sql-bench/*
  storage/myisam/ftbench/ft-test-run.sh
  storage/myisam/mi_test_all.sh
- storage/ndb/test/run-test/atrt-analyze-result.sh
- storage/ndb/test/run-test/atrt-clear-result.sh
- storage/ndb/test/run-test/atrt-gather-result.sh
- storage/ndb/test/run-test/atrt-setup.sh
+ storage/ndb/test/run-test/atrt-*
  storage/ndb/test/run-test/make-config.sh
  storage/ndb/test/run-test/make-html-reports.sh
  storage/ndb/test/run-test/make-index.sh
  storage/ndb/test/run-test/ndb-autotest.sh
  strings/strxmov.c
  strings/strxnmov.c
+ strings/ctype-uca.c
+ strings/ctype-ucs2.c
+ strings/strend.c
+ strings/ctype-utf8.c
  support-files/MacOSX/postflight.sh
  support-files/MacOSX/preflight.sh
+ mysql-test/lib/My/SafeProcess.pm
+ mysql-test/lib/My/ConfigFactory.pm
+ mysql-test/lib/mtr_misc.pl
+ mysql-test/mysql-stress-test.pl
+ BUILD/*.sh
+ BUILD/compile-amd64-debug-max-no-ndb
+ BUILD/compile-solaris-amd64
+ BUILD/compile-amd64-valgrind-max
+ BUILD/compile-pentium64-max
+ BUILD/compile-pentium64
+ BUILD/compile-pentium-valgrind-max-no-ndb
+ scripts/mysqlhotcopy.sh
+ scripts/mysqld_multi.sh
+ mysql-test/lib/mtr_misc.pl
+ mysql-test/mysql-stress-test.pl
+ mysql-test/std_data/checkDBI_DBD-mysql.pl
 Copyright: 2000-2009 MySQL AB Sun Microsystems Inc
            2000-2007 MySQL AB
 License: LGPL
@@ -553,50 +602,7 @@ License: BSD (3 clause)
 Files: storage/ndb/test/include/getarg.h
 Copyright: 2003 MySQL AB
  1997-1999 Kungliga Tekniska Högskolan
-License: BSD (3 clause) GPL-2
- 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; version 2 of the License.
- .
- 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.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- Copyright (c) 1997, 1999 Kungliga Tekniska Högskolan
- (Royal Institute of Technology, Stockholm, Sweden). 
- All rights reserved. 
- .
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions 
- are met: 
- .
- 1. Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer. 
- .
- 2. Redistributions in binary form must reproduce the above copyright 
-    notice, this list of conditions and the following disclaimer in the 
-    documentation and/or other materials provided with the distribution. 
- .
- 3. Neither the name of the Institute nor the names of its contributors 
-    may be used to endorse or promote products derived from this software 
-    without specific prior written permission. 
- .
- THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- SUCH DAMAGE. 
+License: BSD (3 clause) or GPL-2
 
 Files: storage/innobase/handler/ha_innodb.cc
 Copyright: 2008-2009 Google Inc
@@ -687,6 +693,13 @@ License: BSD-like
  3. Altered versions must be plainly marked as such, and must not
     be misrepresented as being the original software.
 
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
+
 License: GPL-2
  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
@@ -771,3 +784,32 @@ License: BSD (3 clause)
  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
+
+License: BSD (4 clause)
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+        This product includes software developed by the NetBSD
+        Foundation, Inc. and its contributors.
+ 4. Neither the name of The NetBSD Foundation nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/libmysqlclient-dev.files b/debian/libmysqlclient-dev.files
new file mode 100644
index 0000000..ea5554a
--- /dev/null
+++ b/debian/libmysqlclient-dev.files
@@ -0,0 +1,11 @@
+usr/bin/mysql_config
+usr/include/mysql/*
+usr/lib/*/libmysqlclient.a
+usr/lib/*/libmysqlclient.so
+usr/lib/*/libmysqlclient_r.a
+usr/lib/*/libmysqlclient_r.so
+usr/lib/*/mysql/plugin/ha_example.*
+usr/lib/*/mysql/plugin/ha_*_plugin.a
+usr/lib/*/mysql/plugin/ha_*_plugin.la
+usr/share/aclocal/mysql.m4
+usr/share/man/man1/mysql_config.1
diff --git a/debian/libmysqlclient-dev.install b/debian/libmysqlclient-dev.install
deleted file mode 100644
index 6506609..0000000
--- a/debian/libmysqlclient-dev.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/mysql_config
-usr/include/mysql/*
-usr/lib/*/libmysqlclient.a
-usr/lib/*/libmysqlclient.so
-usr/lib/*/libmysqlclient_r.a
-usr/share/aclocal/mysql.m4
diff --git a/debian/libmysqlclient-dev.manpages b/debian/libmysqlclient-dev.manpages
deleted file mode 100644
index 3aac7f4..0000000
--- a/debian/libmysqlclient-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/mysql_config.1
diff --git a/debian/libmysqlclient18.install b/debian/libmysqlclient18.install
index 02b89c4..fc62998 100644
--- a/debian/libmysqlclient18.install
+++ b/debian/libmysqlclient18.install
@@ -1 +1,2 @@
 usr/lib/*/libmysqlclient.so.*
+usr/lib/*/libmysqlclient_r.so.*
diff --git a/debian/libmysqlclient18.lintian-overrides b/debian/libmysqlclient18.lintian-overrides
deleted file mode 100644
index ba11d3a..0000000
--- a/debian/libmysqlclient18.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# I take this issue seriously but as per bug #590905
-# it will need playing with in experimental. - periapt
-libmysqlclient18: no-symbols-control-file usr/lib/i386-linux-gnu/libmysqlclient.so.18.0.0
diff --git a/debian/mysql-client-5.5.examples b/debian/mysql-client-5.5.examples
deleted file mode 100644
index ef08ce1..0000000
--- a/debian/mysql-client-5.5.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/bin/mysqlaccess.conf
diff --git a/debian/mysql-client-5.5.files b/debian/mysql-client-5.5.files
new file mode 100644
index 0000000..5dc5f19
--- /dev/null
+++ b/debian/mysql-client-5.5.files
@@ -0,0 +1,40 @@
+usr/bin/mysql
+usr/bin/mysqlcheck
+usr/share/man/man1/mysql.1
+usr/share/man/man1/mysqlcheck.1
+usr/bin/innochecksum
+usr/bin/innotop
+usr/bin/myisam_ftdump
+usr/bin/mysqlaccess
+usr/bin/mysqladmin
+usr/bin/mysqlbug
+usr/bin/mysql_client_test
+usr/bin/mysqldump
+usr/bin/mysqldumpslow
+usr/bin/mysql_find_rows
+usr/bin/mysql_fix_extensions
+usr/bin/mysqlimport
+usr/bin/mysqlreport
+usr/bin/mysqlshow
+usr/bin/mysqlslap
+usr/bin/mysql_waitpid
+usr/bin/mysql_plugin
+usr/share/man/man1/innotop.1
+usr/share/man/man1/myisam_ftdump.1
+usr/share/man/man1/mysqlaccess.1
+usr/share/man/man1/mysqladmin.1
+usr/share/man/man1/mysqlbug.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/mysqlman.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_plugin.1
diff --git a/debian/mysql-client-5.5.install b/debian/mysql-client-5.5.install
deleted file mode 100644
index 5a4c2fb..0000000
--- a/debian/mysql-client-5.5.install
+++ /dev/null
@@ -1,17 +0,0 @@
-usr/bin/innochecksum
-debian/additions/innotop/innotop usr/bin/
-usr/bin/myisam_ftdump
-usr/bin/mysqlaccess
-usr/bin/mysqladmin
-usr/bin/mysqlbug
-usr/bin/mysql_client_test
-usr/bin/mysqldump
-usr/bin/mysqldumpslow
-usr/bin/mysql_find_rows
-usr/bin/mysql_fix_extensions
-usr/bin/mysqlimport
-debian/additions/mysqlreport usr/bin/
-usr/bin/mysqlshow
-usr/bin/mysqlslap
-usr/bin/mysql_waitpid
-usr/bin/mysql_plugin
diff --git a/debian/mysql-client-5.5.lintian-overrides b/debian/mysql-client-5.5.lintian-overrides
index 1a04269..e7705d5 100644
--- a/debian/mysql-client-5.5.lintian-overrides
+++ b/debian/mysql-client-5.5.lintian-overrides
@@ -1,7 +1,2 @@
-# Will look at man pages later 
 # 2012-03-08 periapt
 mysql-client-5.5: binary-without-manpage usr/bin/innochecksum
-# These long lines reproduce actual output and to reformat them
-# would damage the integrity of the man page.
-mysql-client-5.5: manpage-has-errors-from-man usr/share/man/man1/mysqladmin.1.gz 28: warning [p 1, 1.5i]: can't break line
-mysql-client-5.5: manpage-has-errors-from-man usr/share/man/man1/mysqldump.1.gz 2151: warning [p 12, 6.5i, div `3tbd2,1', 0.2i]: can't break line
diff --git a/debian/mysql-client-5.5.manpages b/debian/mysql-client-5.5.manpages
deleted file mode 100644
index 132f602..0000000
--- a/debian/mysql-client-5.5.manpages
+++ /dev/null
@@ -1,18 +0,0 @@
-debian/additions/innotop/innotop.1
-debian/tmp/usr/share/man/man1/myisam_ftdump.1
-debian/tmp/usr/share/man/man1/mysqlaccess.1
-debian/tmp/usr/share/man/man1/mysqladmin.1
-debian/tmp/usr/share/man/man1/mysqlbug.1
-debian/tmp/usr/share/man/man1/mysql_client_test.1
-debian/tmp/usr/share/man/man1/mysql_client_test_embedded.1
-debian/tmp/usr/share/man/man1/mysqldump.1
-debian/tmp/usr/share/man/man1/mysqldumpslow.1
-debian/tmp/usr/share/man/man1/mysql_find_rows.1
-debian/tmp/usr/share/man/man1/mysql_fix_extensions.1
-debian/tmp/usr/share/man/man1/mysqlimport.1
-debian/tmp/usr/share/man/man1/mysqlman.1
-debian/additions/mysqlreport.1
-debian/tmp/usr/share/man/man1/mysqlshow.1
-debian/tmp/usr/share/man/man1/mysqlslap.1
-debian/tmp/usr/share/man/man1/mysql_waitpid.1
-debian/tmp/usr/share/man/man1/mysql_plugin.1
diff --git a/debian/mysql-client-core-5.5.install b/debian/mysql-client-core-5.5.install
deleted file mode 100644
index 6308d76..0000000
--- a/debian/mysql-client-core-5.5.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/mysql
-usr/bin/mysqlcheck
diff --git a/debian/mysql-client-core-5.5.manpages b/debian/mysql-client-core-5.5.manpages
deleted file mode 100644
index 2be91d8..0000000
--- a/debian/mysql-client-core-5.5.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/man/man1/mysql.1
-debian/tmp/usr/share/man/man1/mysqlcheck.1
diff --git a/debian/mysql-server-5.5.examples b/debian/mysql-server-5.5.examples
deleted file mode 100644
index e0d832f..0000000
--- a/debian/mysql-server-5.5.examples
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/share/mysql/*cnf
-debian/tmp/usr/share/mysql/magic
-debian/tmp/usr/lib/mysql/plugin/daemon_example.ini
diff --git a/debian/mysql-server-5.5.files b/debian/mysql-server-5.5.files
new file mode 100644
index 0000000..626f78d
--- /dev/null
+++ b/debian/mysql-server-5.5.files
@@ -0,0 +1,57 @@
+usr/lib/mysql/*so*
+usr/lib/mysql/plugin/*.so
+etc/mysql/debian-start
+etc/mysql/conf.d/mysqld_safe_syslog.cnf
+usr/bin/msql2mysql
+usr/bin/myisamchk
+usr/bin/myisamlog
+usr/bin/myisampack
+usr/bin/mysql_convert_table_format
+usr/bin/mysql_secure_installation
+usr/bin/mysql_setpermission
+usr/bin/mysql_tzinfo_to_sql
+usr/bin/mysql_zap
+usr/bin/mysqlbinlog
+usr/bin/mysqld_multi
+usr/bin/mysqld_safe
+usr/bin/mysqlhotcopy
+usr/bin/mysqltest
+usr/bin/perror
+usr/bin/replace
+usr/bin/resolve_stack_dump
+usr/bin/resolveip
+usr/share/doc/mysql-server-5.5/
+usr/share/man/man1/msql2mysql.1
+usr/share/man/man1/myisamchk.1
+usr/share/man/man1/myisamlog.1
+usr/share/man/man1/myisampack.1
+usr/share/man/man1/mysqlbinlog.1
+usr/share/man/man1/mysql_convert_table_format.1
+usr/share/man/man1/mysqld_multi.1
+usr/share/man/man1/mysqld_safe.1
+usr/share/man/man1/mysqlhotcopy.1
+usr/share/man/man1/mysql_secure_installation.1
+usr/share/man/man1/mysql_setpermission.1
+usr/share/man/man1/mysqltest.1
+usr/share/man/man1/mysql_zap.1
+usr/share/man/man1/perror.1
+usr/share/man/man1/replace.1
+usr/share/man/man1/resolveip.1
+usr/share/man/man1/resolve_stack_dump.1
+usr/share/man/man1/innochecksum.1
+usr/share/man/man1/mysqltest_embedded.1
+usr/share/man/man1/mysql_tzinfo_to_sql.1
+usr/share/mysql/debian-start.inc.sh
+usr/share/mysql/echo_stderr
+usr/share/mysql/errmsg-utf8.txt
+usr/share/mysql/mysqld_multi.server
+usr/share/mysql/mysql_test_data_timezone.sql
+usr/share/mysql/config.huge.ini
+usr/share/mysql/config.medium.ini
+usr/share/mysql/config.small.ini
+usr/share/mysql/ndb-config-2-node.ini
+usr/share/mysql/debian-start.inc.sh
+usr/share/mysql/echo_stderr
+usr/share/mysql/errmsg-utf8.txt
+usr/share/mysql/mysqld_multi.server
+usr/share/mysql/mysql_test_data_timezone.sql
diff --git a/debian/mysql-server-5.5.install b/debian/mysql-server-5.5.install
deleted file mode 100644
index e676fab..0000000
--- a/debian/mysql-server-5.5.install
+++ /dev/null
@@ -1,31 +0,0 @@
-usr/lib/mysql/plugin/*.so
-etc/mysql/debian-start
-debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d/
-usr/bin/msql2mysql
-usr/bin/myisamchk
-usr/bin/myisamlog
-usr/bin/myisampack
-usr/bin/mysql_convert_table_format
-usr/bin/mysql_secure_installation
-usr/bin/mysql_setpermission
-usr/bin/mysql_tzinfo_to_sql
-usr/bin/mysql_zap
-usr/bin/mysqlbinlog
-usr/bin/mysqld_multi
-usr/bin/mysqld_safe
-usr/bin/mysqlhotcopy
-usr/bin/mysqltest
-usr/bin/perror
-usr/bin/replace
-usr/bin/resolve_stack_dump
-usr/bin/resolveip
-usr/share/doc/mysql-server-5.5/
-usr/share/mysql/debian-start.inc.sh
-usr/share/mysql/echo_stderr
-usr/share/mysql/errmsg-utf8.txt
-usr/share/mysql/mysqld_multi.server
-usr/share/mysql/mysql_test_data_timezone.sql
-usr/share/mysql/config.huge.ini
-usr/share/mysql/config.medium.ini
-usr/share/mysql/config.small.ini
-usr/share/mysql/ndb-config-2-node.ini
diff --git a/debian/mysql-server-5.5.lintian-overrides b/debian/mysql-server-5.5.lintian-overrides
deleted file mode 100644
index b02b5aa..0000000
--- a/debian/mysql-server-5.5.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# These long lines reproduce actual output and to reformat them
-# would damage the integrity of the man page.
-mysql-server-5.5: manpage-has-errors-from-man usr/share/man/man1/mysqlbinlog.1.gz 1405: warning [p 9, 7.5i, div `3tbd3,2', 0.8i]: can't break line
diff --git a/debian/mysql-server-5.5.manpages b/debian/mysql-server-5.5.manpages
deleted file mode 100644
index bfe4d21..0000000
--- a/debian/mysql-server-5.5.manpages
+++ /dev/null
@@ -1,20 +0,0 @@
-debian/tmp/usr/share/man/man1/msql2mysql.1
-debian/tmp/usr/share/man/man1/myisamchk.1
-debian/tmp/usr/share/man/man1/myisamlog.1
-debian/tmp/usr/share/man/man1/myisampack.1
-debian/tmp/usr/share/man/man1/mysqlbinlog.1
-debian/tmp/usr/share/man/man1/mysql_convert_table_format.1
-debian/tmp/usr/share/man/man1/mysqld_multi.1
-debian/tmp/usr/share/man/man1/mysqld_safe.1
-debian/tmp/usr/share/man/man1/mysqlhotcopy.1
-debian/tmp/usr/share/man/man1/mysql_secure_installation.1
-debian/tmp/usr/share/man/man1/mysql_setpermission.1
-debian/tmp/usr/share/man/man1/mysqltest.1
-debian/tmp/usr/share/man/man1/mysql_zap.1
-debian/tmp/usr/share/man/man1/perror.1
-debian/tmp/usr/share/man/man1/replace.1
-debian/tmp/usr/share/man/man1/resolveip.1
-debian/tmp/usr/share/man/man1/resolve_stack_dump.1
-debian/tmp/usr/share/man/man1/innochecksum.1
-debian/tmp/usr/share/man/man1/mysqltest_embedded.1
-debian/tmp/usr/share/man/man1/mysql_tzinfo_to_sql.1
diff --git a/debian/mysql-server-core-5.5.install b/debian/mysql-server-core-5.5.files
index b038e88..0233817 100644
--- a/debian/mysql-server-core-5.5.install
+++ b/debian/mysql-server-core-5.5.files
@@ -2,6 +2,10 @@ usr/bin/my_print_defaults
 usr/bin/mysql_install_db
 usr/bin/mysql_upgrade
 usr/sbin/mysqld
+usr/share/man/man1/my_print_defaults.1
+usr/share/man/man1/mysql_install_db.1
+usr/share/man/man1/mysql_upgrade.1
+usr/share/man/man8/mysqld.8
 usr/share/mysql/charsets
 usr/share/mysql/czech
 usr/share/mysql/danish
@@ -30,6 +34,7 @@ usr/share/mysql/spanish
 usr/share/mysql/swedish
 usr/share/mysql/ukrainian
 usr/sbin/mysqld
+usr/share/man/man8/mysqld.8
 usr/share/mysql/charsets
 usr/share/mysql/czech
 usr/share/mysql/danish
diff --git a/debian/mysql-server-core-5.5.lintian-overrides b/debian/mysql-server-core-5.5.lintian-overrides
deleted file mode 100644
index 04d6ec0..0000000
--- a/debian/mysql-server-core-5.5.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# These are random occurrences of a pseudo word in a binary.
-mysql-server-core-5.5: spelling-error-in-binary usr/sbin/mysqld yuR your
diff --git a/debian/mysql-server-core-5.5.manpages b/debian/mysql-server-core-5.5.manpages
deleted file mode 100644
index 76219c2..0000000
--- a/debian/mysql-server-core-5.5.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/usr/share/man/man1/my_print_defaults.1
-debian/tmp/usr/share/man/man1/mysql_install_db.1
-debian/tmp/usr/share/man/man1/mysql_upgrade.1
-debian/tmp/usr/share/man/man8/mysqld.8
diff --git a/debian/mysql-testsuite-5.5.install b/debian/mysql-testsuite-5.5.install
index 241d0aa..a00d364 100644
--- a/debian/mysql-testsuite-5.5.install
+++ b/debian/mysql-testsuite-5.5.install
@@ -1,4 +1 @@
-usr/share/mysql-test/* usr/lib/mysql-testsuite/
-usr/bin/mysql_client_test_embedded
-usr/bin/mysql_embedded
-usr/bin/mysqltest_embedded
+/usr/share/mysql-test/* /usr/lib/mysql-testsuite/
diff --git a/debian/mysql-testsuite-5.5.lintian-overrides b/debian/mysql-testsuite-5.5.lintian-overrides
deleted file mode 100644
index e1734fa..0000000
--- a/debian/mysql-testsuite-5.5.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# These are random occurrences of a pseudo word in a binary.
-mysql-testsuite-5.5: spelling-error-in-binary usr/bin/mysql_client_test_embedded yuR your
-mysql-testsuite-5.5: spelling-error-in-binary usr/bin/mysql_embedded yuR your
-mysql-testsuite-5.5: spelling-error-in-binary usr/bin/mysqltest_embedded yuR your
diff --git a/debian/patches/hurd.patch b/debian/patches/1_hurd.patch
index dbd44e7..dbd44e7 100644
--- a/debian/patches/hurd.patch
+++ b/debian/patches/1_hurd.patch
diff --git a/debian/patches/scripts__mysqld_safe.sh__signals.patch b/debian/patches/38_scripts__mysqld_safe.sh__signals.patch
index be06efb..be06efb 100644
--- a/debian/patches/scripts__mysqld_safe.sh__signals.patch
+++ b/debian/patches/38_scripts__mysqld_safe.sh__signals.patch
diff --git a/debian/patches/disable_tests.patch b/debian/patches/62_disable_tests.patch
index 740c8df..55dc2f4 100644
--- a/debian/patches/disable_tests.patch
+++ b/debian/patches/62_disable_tests.patch
@@ -5,10 +5,12 @@ Last-Update: 2012-03-07
 Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk>
 --- a/mysql-test/t/disabled.def
 +++ b/mysql-test/t/disabled.def
-@@ -15,3 +15,6 @@
+@@ -15,3 +15,8 @@
  archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
  log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
  mysql_embedded           : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836
 +partition_rename_longfilename : Fails when building with sbuild and schroots
 +file_contents            : Fails without bzr revision id
-+partition_binlog         : Fails on Debian, looks easy to fix but not sure how
++mysqlslap		 : n/a	2012-04-29 Failed once on kfreebsd
++mysqlhotcopy_isam	 : n/a  2012-04-29 Olaf van der Spek reported this failure
++mysqlhotcopy_archive	 : n/a  2012-04-29 Olaf van der Spek reported this failure
diff --git a/debian/patches/mysql_va_list.patch b/debian/patches/70_mysql_va_list.patch
index e4a8b04..21ab4ea 100644
--- a/debian/patches/mysql_va_list.patch
+++ b/debian/patches/70_mysql_va_list.patch
@@ -1,11 +1,12 @@
 Bug: http://bugs.mysql.com/bug.php?id=62769
 Bug-Ubuntu: http://pad.lv/700982
 Description: make sure va_list usage is portable to fix FTBFS on ARM
+Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk>
+Last-Update: 2012-10-24
 
-diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/client_plugin.c
---- mysql-5.5.16.orig/sql-common/client_plugin.c	2011-09-09 11:56:39.000000000 -0400
-+++ mysql-5.5.16/sql-common/client_plugin.c	2011-10-16 23:00:00.708799138 -0400
-@@ -228,11 +228,13 @@
+--- a/sql-common/client_plugin.c
++++ b/sql-common/client_plugin.c
+@@ -233,11 +233,13 @@
  {
    MYSQL mysql;
    struct st_mysql_client_plugin **builtin;
@@ -19,7 +20,7 @@ diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/
  
    pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
    init_alloc_root(&mem_root, 128, 128);
-@@ -244,7 +246,7 @@
+@@ -249,7 +251,7 @@
    pthread_mutex_lock(&LOCK_load_client_plugin);
  
    for (builtin= mysql_client_builtins; *builtin; builtin++)
@@ -28,7 +29,7 @@ diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/
  
    pthread_mutex_unlock(&LOCK_load_client_plugin);
  
-@@ -288,9 +290,13 @@
+@@ -293,9 +295,13 @@
  mysql_client_register_plugin(MYSQL *mysql,
                               struct st_mysql_client_plugin *plugin)
  {
@@ -42,7 +43,7 @@ diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/
    pthread_mutex_lock(&LOCK_load_client_plugin);
  
    /* make sure the plugin wasn't loaded meanwhile */
-@@ -302,7 +308,7 @@
+@@ -307,7 +313,7 @@
      plugin= NULL;
    }
    else
diff --git a/debian/patches/71_disable_rpl_tests.patch b/debian/patches/71_disable_rpl_tests.patch
new file mode 100644
index 0000000..c8fe54e
--- /dev/null
+++ b/debian/patches/71_disable_rpl_tests.patch
@@ -0,0 +1,12 @@
+From: Clint Byrum <clint@ubuntu.com>
+Bug-Ubuntu: http://pad.lv/894146
+Forwarded: no, not needed
+Description: disables test to allow build to pass while this is investigated.
+
+--- a/mysql-test/suite/rpl/t/disabled.def
++++ b/mysql-test/suite/rpl/t/disabled.def
+@@ -15,3 +15,4 @@
+ rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock
+ rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
+ rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
++rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146
diff --git a/debian/patches/fix_standalone_tests.patch b/debian/patches/72_fix_standalone_tests.patch
index 8635025..49f5f7c 100644
--- a/debian/patches/fix_standalone_tests.patch
+++ b/debian/patches/72_fix_standalone_tests.patch
@@ -2,12 +2,11 @@ From: Clint Byrum <clint@ubuntu.com>
 Description: makes mtr look in the standard location from the 
  mysql-testsuite-5.5 package.
 Forwarded: not-needed
-
-Index: mysql-5.5/mysql-test/lib/mtr_cases.pm
-===================================================================
---- mysql-5.5.orig/mysql-test/lib/mtr_cases.pm	2011-11-14 15:35:04.238715000 -0800
-+++ mysql-5.5/mysql-test/lib/mtr_cases.pm	2011-11-25 14:41:00.433887578 -0800
-@@ -286,7 +286,8 @@
+Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk>
+Last-Update: 2012-10-24
+--- a/mysql-test/lib/mtr_cases.pm
++++ b/mysql-test/lib/mtr_cases.pm
+@@ -287,7 +287,8 @@
      else
      {
        $suitedir= my_find_dir($::basedir,
@@ -15,5 +14,5 @@ Index: mysql-5.5/mysql-test/lib/mtr_cases.pm
 +			     ["lib/mysql-testsuite/suite",
 +			      "share/mysql-test/suite",
  			      "mysql-test/suite",
+ 			      "internal/mysql-test/suite",
  			      "mysql-test",
- 			      # Look in storage engine specific suite dirs
diff --git a/debian/patches/kfreebsd_tests.patch b/debian/patches/93_kfreebsd_tests.patch
index 3aaa8ce..3aaa8ce 100644
--- a/debian/patches/kfreebsd_tests.patch
+++ b/debian/patches/93_kfreebsd_tests.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/94_spelling.patch
index ca86d06..1d9c310 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/94_spelling.patch
@@ -1,7 +1,7 @@
 Author <nicholas@periapt.co.uk>
 Subject: spelling errors
  Preceeding -> preceding
-Last-Update: 2012-05-19
+Last-Update: 2012-10-24
 Forwarded: no
 --- a/libmysql/errmsg.c
 +++ b/libmysql/errmsg.c
@@ -108,7 +108,7 @@ Forwarded: no
  --echo **** On Master ****
 --- a/sql/log_event.cc
 +++ b/sql/log_event.cc
-@@ -3236,7 +3236,7 @@
+@@ -3267,7 +3267,7 @@
      if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), thd)))
      {
        const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error,
diff --git a/debian/patches/disable_rpl_tests.patch b/debian/patches/disable_rpl_tests.patch
deleted file mode 100644
index 06d06a1..0000000
--- a/debian/patches/disable_rpl_tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Clint Byrum <clint@ubuntu.com>
-Bug-Ubuntu: http://pad.lv/894146
-Forwarded: not needed
-Description: Skip on AMD64 builds
-Last-Update: 2012-05-29
-Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk>
---- /dev/null
-+++ b/mysql-test/include/debian-fail-lp894146.inc
-@@ -0,0 +1,5 @@
-+if (`select @@version_compile_machine in ('x86_64')`)
-+{
-+  skip Fails intermittently on AMD64 buildds http://pad.lv/894146;
-+}
-+
---- a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
-+++ b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
-@@ -9,6 +9,7 @@
- # * Various states of master and heartbeat
- # * Circular replication
- #############################################################
-+--source include/debian-fail-lp894146.inc
- --source include/master-slave.inc
- #
- # The test runs long and does not have any specifics to 
diff --git a/debian/patches/fix-mysqldump-test.patch b/debian/patches/fix-mysqldump-test.patch
deleted file mode 100644
index fd2c006..0000000
--- a/debian/patches/fix-mysqldump-test.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Author: Clint Byrum <clint@ubuntu.com>
-Description: Works around non-deterministic --verbose behavior in new
- mysqldump test.
-Bug: http://bugs.mysql.com/bug.php?id=64401
-
-=== modified file 'mysql-test/r/mysqldump.result'
---- a/mysql-test/r/mysqldump.result
-+++ b/mysql-test/r/mysqldump.result
-@@ -5118,12 +5118,6 @@
- #        commit starting 5.5.
- 
- #### Dump starts here ####
---- Connecting to localhost...
---- main : logs flushed successfully!
---- Starting transaction...
---- Retrieving table structure for table t1...
---- Sending SELECT query...
---- Retrieving rows...
- --
- -- Host: localhost    Database: b12809202_db
- -- ------------------------------------------------------
-@@ -5158,9 +5152,6 @@
- LOCK TABLES `t1` WRITE;
- /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
- INSERT INTO `t1` VALUES (1),(2),(3);
---- Retrieving table structure for table t2...
---- Sending SELECT query...
---- Retrieving rows...
- /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
- UNLOCK TABLES;
- 
-@@ -5185,7 +5176,6 @@
- INSERT INTO `t2` VALUES (1),(2),(3);
- /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
- UNLOCK TABLES;
---- Disconnecting from localhost...
- /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
- 
- /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
---- a/mysql-test/t/mysqldump.test
-+++ b/mysql-test/t/mysqldump.test
-@@ -2352,7 +2352,7 @@
- --echo
- --echo #### Dump starts here ####
- --replace_regex /-- Server version.*// /-- MySQL dump .*// /-- Dump completed on .*/-- Dump completed/
----exec $MYSQL_DUMP --verbose --single-transaction --flush-log b12809202_db 2>&1
-+--exec $MYSQL_DUMP --single-transaction --flush-log b12809202_db 2>&1
- --echo
- --echo #### Dump ends here ####
- 
diff --git a/debian/patches/hyphens-in-manpages.patch b/debian/patches/hyphens-in-manpages.patch
deleted file mode 100644
index 65c009d..0000000
--- a/debian/patches/hyphens-in-manpages.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Nicholas Bamber <nicholas@periapt.co.uk>
-Subject: minus/hyphen confusion
- Added to keep lintian happy
-Last-Update: 2012-05-17
-Forwarded: no
---- a/man/mysqlman.1
-+++ b/man/mysqlman.1
-@@ -5,7 +5,7 @@
- Certain executables distributed with the MySQL database management system do
- not have specific man pages.
- .SH "SEE ALSO"
--In most cases, you can run the executable from the command line with a "--help"
-+In most cases, you can run the executable from the command line with a "\-\-help"
- argument to display a brief summary of the executable's arguments and function.
- For more information about MySQL, please refer to the MySQL reference manual,
- which may already be installed locally and which is also available online at
---- a/man/mysql_tzinfo_to_sql.1
-+++ b/man/mysql_tzinfo_to_sql.1
-@@ -119,7 +119,7 @@
- .PP
- This documentation 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.
- .PP
--You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
-+You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110\(hy1301 USA or see http://www.gnu.org/licenses/.
- .sp
- .SH "SEE ALSO"
- For more information, please refer to the MySQL Reference Manual,
diff --git a/debian/patches/kfreebsd_fails.patch b/debian/patches/kfreebsd_fails.patch
deleted file mode 100644
index 9035f0d..0000000
--- a/debian/patches/kfreebsd_fails.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Author: Nicholas Bamber <nicholas@periapt.co.uk>
-Subject: Skipping certain tests on kfreebsd
-Last-Update: 2012-05-29
-Forwarded: no
---- /dev/null
-+++ b/mysql-test/include/debian-fail-kfreebsd.inc
-@@ -0,0 +1,5 @@
-+if (`select @@version_compile_os in ('debian-kfreebsd-gnu')`)
-+{
-+  skip Dont run certain tests on Debian kfreebsd pending investigation;
-+}
-+
---- a/mysql-test/t/log_state.test
-+++ b/mysql-test/t/log_state.test
-@@ -1,6 +1,7 @@
- ### t/log_state.test ###
- #
- 
-+--source include/debian-fail-kfreebsd.inc
- --source include/not_embedded.inc
- --source include/have_csv.inc
- 
---- a/mysql-test/t/func_encrypt.test
-+++ b/mysql-test/t/func_encrypt.test
-@@ -1,3 +1,5 @@
-+
-+--source include/debian-fail-kfreebsd.inc
- -- source include/have_ssl_crypto_functs.inc
- 
- --disable_warnings
---- a/mysql-test/t/func_des_encrypt.test
-+++ b/mysql-test/t/func_des_encrypt.test
-@@ -1,3 +1,5 @@
-+
-+--source include/debian-fail-kfreebsd.inc
- -- source include/have_ssl_crypto_functs.inc
- 
- # This test can't be in func_encrypt.test, because it requires
---- a/mysql-test/t/func_encrypt_ucs2.test
-+++ b/mysql-test/t/func_encrypt_ucs2.test
-@@ -1,3 +1,5 @@
-+
-+--source include/debian-fail-kfreebsd.inc
- -- source include/have_ssl_crypto_functs.inc
- -- source include/have_ucs2.inc
- 
---- a/mysql-test/t/func_misc.test
-+++ b/mysql-test/t/func_misc.test
-@@ -2,6 +2,7 @@
- # Testing of misc functions
- #
- 
-+--source include/debian-fail-kfreebsd.inc
- --disable_warnings
- DROP TABLE IF EXISTS t1, t2;
- --enable_warnings
---- a/mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test
-+++ b/mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test
-@@ -4,6 +4,7 @@
- # Purpose: Testing heartbeat for schema
- # 1 master and 2 slaves
- #############################################################
-+--source include/debian-fail-kfreebsd.inc
- --let $rpl_topology= 1->2,1->3
- --source include/rpl_init.inc
- 
---- a/mysql-test/t/events_logs_tests.test
-+++ b/mysql-test/t/events_logs_tests.test
-@@ -1,3 +1,5 @@
-+--source include/debian-fail-kfreebsd.inc
-+
- # Can't test with embedded server that doesn't support grants
- -- source include/not_embedded.inc
- 
diff --git a/debian/patches/mysqlcheck_tests.patch b/debian/patches/mysqlcheck_tests.patch
deleted file mode 100644
index e0b5f28..0000000
--- a/debian/patches/mysqlcheck_tests.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Author: Nicholas Bamber <nicholas@periapt.co.uk>
-Bug: http://bugs.mysql.com/bug.php?id=65288
-Date: 2012-06-02
-Subject: child process picking up external config files
- The effect of the patch should be that the affected tests
- run inside a clean chroot, but are skipped where stray
- config files may upset the tests. These failed tests
- are usually indicated by mysqlcheck triggering a FATAL ERROR.
---- /dev/null
-+++ b/mysql-test/include/debian-fail-local_my_cnf.inc
-@@ -0,0 +1,5 @@
-+if ($FOUND_LOCAL_MY_CNF)
-+{
-+  skip See Oracle Bug#65288 (Debian);
-+}
-+
---- a/mysql-test/mysql-test-run.pl
-+++ b/mysql-test/mysql-test-run.pl
-@@ -2462,6 +2462,17 @@
-   }
- 
-   # ----------------------------------------------------
-+  # found_local_my_cnf
-+  # ----------------------------------------------------
-+  my $found_local_my_cnf =
-+    mtr_file_exists("~/.my.cnf") ||
-+    mtr_file_exists("/etc/my.cnf") ||
-+    mtr_file_exists("/etc/mysql/my.cnf");
-+  if ($found_local_my_cnf) {
-+    $ENV{'FOUND_LOCAL_MY_CNF'} = $found_local_my_cnf;
-+  }
-+
-+  # ----------------------------------------------------
-   # perror
-   # ----------------------------------------------------
-   my $exe_perror= mtr_exe_exists(vs_config_dirs('extra', 'perror'),
---- a/mysql-test/t/mysqladmin.test
-+++ b/mysql-test/t/mysqladmin.test
-@@ -1,4 +1,5 @@
- # Embedded server doesn't support external clients
-+--source include/debian-fail-local_my_cnf.inc
- --source include/not_embedded.inc
- #
- # Test "mysqladmin ping"
---- a/mysql-test/t/log_tables_upgrade.test
-+++ b/mysql-test/t/log_tables_upgrade.test
-@@ -1,3 +1,5 @@
-+
-+-- source include/debian-fail-local_my_cnf.inc
- --source include/not_embedded.inc
- --source include/have_csv.inc
- 
---- a/mysql-test/t/mysql_upgrade.test
-+++ b/mysql-test/t/mysql_upgrade.test
-@@ -1,3 +1,5 @@
-+
-+-- source include/debian-fail-local_my_cnf.inc
- -- source include/mysql_upgrade_preparation.inc
- 
- #
---- a/mysql-test/t/mysql_upgrade_ssl.test
-+++ b/mysql-test/t/mysql_upgrade_ssl.test
-@@ -1,5 +1,6 @@
- # mysql_upgrade tests requiring SSL support
- 
-+-- source include/debian-fail-local_my_cnf.inc
- -- source include/have_ssl_communication.inc
- -- source include/mysql_upgrade_preparation.inc
- 
---- a/mysql-test/t/plugin_auth.test
-+++ b/mysql-test/t/plugin_auth.test
-@@ -1,3 +1,5 @@
-+
-+-- source include/debian-fail-local_my_cnf.inc
- --source include/have_plugin_auth.inc
- --source include/not_embedded.inc
- --source include/mysql_upgrade_preparation.inc
---- a/mysql-test/suite/perfschema/t/pfs_upgrade.test
-+++ b/mysql-test/suite/perfschema/t/pfs_upgrade.test
-@@ -3,6 +3,7 @@
- # database.
- # 
- 
-+-- source include/debian-fail-local_my_cnf.inc
- --source include/not_embedded.inc
- --source include/have_perfschema.inc
- --source include/have_lowercase0.inc
---- a/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
-+++ b/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
-@@ -5,6 +5,7 @@
- # options are added into mysql_upgrade. These options control whether sql
- # statements are binlogged or not. 
- #############################################################################
-+-- source include/debian-fail-local_my_cnf.inc
- --source include/master-slave.inc
- 
- # Only run test if "mysql_upgrade" is found
---- a/mysql-test/t/myisam.test
-+++ b/mysql-test/t/myisam.test
-@@ -1,3 +1,5 @@
-+
-+-- source include/debian-fail-local_my_cnf.inc
- #
- # Test bugs in the MyISAM code
- #
---- a/mysql-test/t/myisampack.test
-+++ b/mysql-test/t/myisampack.test
-@@ -1,3 +1,5 @@
-+
-+-- source include/debian-fail-local_my_cnf.inc
- -- disable_warnings
- DROP TABLE IF EXISTS t1,t2,t3;
- -- enable_warnings
---- a/mysql-test/t/mysqldump.test
-+++ b/mysql-test/t/mysqldump.test
-@@ -1,4 +1,5 @@
- # Embedded server doesn't support external clients
-+-- source include/debian-fail-local_my_cnf.inc
- --source include/not_embedded.inc
- 
- # Binlog is required
diff --git a/debian/patches/series b/debian/patches/series
index 54cb022..44a5b56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,10 @@
-hurd.patch
-scripts__mysqld_safe.sh__signals.patch
-disable_tests.patch
-mysql_va_list.patch
-disable_rpl_tests.patch
-fix_standalone_tests.patch
-mysqlcheck_tests.patch
-kfreebsd_tests.patch
-spelling.patch
-fix-mysqldump-test.patch
-hyphens-in-manpages.patch
+1_hurd.patch
+38_scripts__mysqld_safe.sh__signals.patch
+62_disable_tests.patch
+70_mysql_va_list.patch
+71_disable_rpl_tests.patch
+72_fix_standalone_tests.patch
+93_kfreebsd_tests.patch
+94_spelling.patch
 regex_plus.patch
-kfreebsd_fails.patch
 versioned_symbols.patch
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 9488cb4..6e873f0 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: mysql-dfsg-5.5\n"
 "Report-Msgid-Bugs-To: mysql-5.5@packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
-"PO-Revision-Date: 2007-05-01 13:01+0200\n"
+"PO-Revision-Date: 2012-07-15 21:05+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "Language: cs\n"
@@ -39,10 +39,6 @@ msgstr "V systému existuje soubor /var/lib/mysql/debian-*.flag."
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.5.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Such file is an indication that a mysql-server package with a higher "
-#| "version has been installed earlier."
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -71,14 +67,12 @@ msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
 msgstr ""
+"Používání MySQL pod NIS/YP vyžaduje, aby byl uživatelský účet mysql přidán "
+"na místním systému příkazem:"
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.5.templates:3001
-#, fuzzy
-#| msgid ""
-#| "You should also check the permissions and the owner of the /var/lib/mysql "
-#| "directory:"
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -125,14 +119,14 @@ msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
 msgstr ""
-"MySQL se může spouštět automaticky při startu systému, nebo ručně příkazem '/"
-"etc/init.d/mysql start'."
+"MySQL se může spouštět automaticky při startu systému, nebo ručně příkazem „/"
+"etc/init.d/mysql start“."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.5.templates:6001
 msgid "New password for the MySQL \"root\" user:"
-msgstr "Nové heslo MySQL uživatele \"root\":"
+msgstr "Nové heslo MySQL uživatele „root“:"
 
 #. Type: password
 #. Description
@@ -142,29 +136,25 @@ msgid ""
 "the MySQL administrative \"root\" user."
 msgstr ""
 "Přestože to není nezbytné, je silně doporučeno nastavit heslo u "
-"správcovského MySQL účtu \"root\"."
+"správcovského MySQL účtu „root“."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.5.templates:6001
-#, fuzzy
-#| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Ponecháte-li pole prázdné, heslo se nezmění."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.5.templates:7001
-#, fuzzy
-#| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MySQL \"root\" user:"
-msgstr "Nové heslo MySQL uživatele \"root\":"
+msgstr "Zopakujte heslo MySQL uživatele „root“:"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
-msgstr "Nelze nastavit heslo MySQL uživatele \"root\""
+msgstr "Nelze nastavit heslo MySQL uživatele „root“"
 
 #. Type: error
 #. Description
@@ -181,19 +171,12 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
-#, fuzzy
-#| msgid ""
-#| "You should check the account's password after tha package installation."
 msgid "You should check the account's password after the package installation."
 msgstr "Po instalaci balíku byste měli heslo ověřit."
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
-#, fuzzy
-#| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
-#| "more information."
 msgid ""
 "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
 "information."
@@ -204,19 +187,19 @@ msgstr ""
 #. Description
 #: ../mysql-server-5.5.templates:9001
 msgid "Password input error"
-msgstr ""
+msgstr "Chyba zadávání hesla"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
+msgstr "Zadaná hesla nejsou stejná. Zkuste to prosím znovu."
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:10001
 msgid "NDB Cluster seems to be in use"
-msgstr ""
+msgstr "Zdá se, že je používán NBD cluster"
 
 #. Type: error
 #. Description
@@ -226,6 +209,9 @@ msgid ""
 "mysql-cluster-server package and remove all lines starting with \"ndb\" from "
 "all config files below /etc/mysql/."
 msgstr ""
+"MySQL-5.5 již NBD cluster nepodporuje. Přejděte prosím na nový balík "
+"mysql-cluster-server a ze všech konfiguračních souborů pod /etc/mysql/ "
+"odstraňte všechny řádky začínající na „nbd“."
 
 #~ msgid ""
 #~ "To use MySQL, the following entries for users and groups should be added "
diff --git a/debian/po/da.po b/debian/po/da.po
index 3f2a9f2..02fcccd 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -1,38 +1,37 @@
-# Danish translation mysql-5.1.
-# Copyright (C) 2010 mysql-5.1 & nedenstående oversættere.
-# This file is distributed under the same license as the mysql-5.1 package.
+# Danish translation mysql-5.5.
+# Copyright (C) 2010 mysql-5.5 & nedenstående oversættere.
+# This file is distributed under the same license as the mysql-5.5 package.
 # Claus Hindsgaul <claus_h@image.dk> 2005, 2006, 2007.
-# Joe Hansen <joedalton2@yahoo.dk>, 2010.
+# Joe Hansen <joedalton2@yahoo.dk>, 2010, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-5.1\n"
-"Report-Msgid-Bugs-To: mysql-5.1@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-31 12:35+0200\n"
-"PO-Revision-Date: 2010-10-07 05:26+0100\n"
+"Project-Id-Version: mysql-5.5\n"
+"Report-Msgid-Bugs-To: mysql-5.5@packages.debian.org\n"
+"POT-Creation-Date: 2011-11-08 11:42-0800\n"
+"PO-Revision-Date: 2012-08-11 05:26+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.1.templates:2001
+#: ../mysql-server-5.5.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Ønsker du virkelig at fortsætte nedgraderingen?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.1.templates:2001
+#: ../mysql-server-5.5.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr ""
-"Der er en fil med navnet /var/lib/mysql/debian-*.flag på dette system."
+msgstr "Der er en fil med navnet /var/lib/mysql/debian-*.flag på dette system."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.1.templates:2001
+#: ../mysql-server-5.5.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -42,7 +41,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.1.templates:2001
+#: ../mysql-server-5.5.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -52,13 +51,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.1.templates:3001
+#: ../mysql-server-5.5.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Vigtig oplysning til NIS/YP-brugere"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.1.templates:3001
+#: ../mysql-server-5.5.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -68,7 +67,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.1.templates:3001
+#: ../mysql-server-5.5.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -77,13 +76,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.1.templates:4001
+#: ../mysql-server-5.5.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Fjern alle MySQL-databaser?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.1.templates:4001
+#: ../mysql-server-5.5.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -93,7 +92,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.1.templates:4001
+#: ../mysql-server-5.5.templates:4001
 msgid ""
 "If you're removing the MySQL package in order to later install a more recent "
 "version or if a different mysql-server package is already using it, the data "
@@ -105,13 +104,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.1.templates:5001
+#: ../mysql-server-5.5.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Start MySQL-serveren under systemopstart?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.1.templates:5001
+#: ../mysql-server-5.5.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -121,13 +120,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:6001
+#: ../mysql-server-5.5.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Ny adgangskode for MySQL's »rootbruger«:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:6001
+#: ../mysql-server-5.5.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -137,25 +136,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:6001
+#: ../mysql-server-5.5.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Hvis du lader dette felt stå tomt, vil adgangskoden ikke blive ændret."
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.5.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Gentag adgangskode for MySQL's »root-bruger«:"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.1.templates:8001
+#: ../mysql-server-5.5.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Kunne ikke sætte adgangskoden for MySQL's »root-bruger«"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.1.templates:8001
+#: ../mysql-server-5.5.templates:8001
 msgid ""
 "An error occurred while setting the password for the MySQL administrative "
 "user. This may have happened because the account already has a password, or "
@@ -168,48 +167,47 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.1.templates:8001
+#: ../mysql-server-5.5.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr "Du bør tjekke kontoens adgangskode efter pakkeinstallationen."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.1.templates:8001
+#: ../mysql-server-5.5.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
 "information."
 msgstr ""
-"Læs venligst filen /usr/share/doc/mysql-server-5.1/README.Debian for yderligere "
-"oplysninger."
+"Læs venligst filen /usr/share/doc/mysql-server-5.5/README.Debian for "
+"yderligere oplysninger."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.1.templates:9001
+#: ../mysql-server-5.5.templates:9001
 msgid "Password input error"
 msgstr "Inddatafejl for adgangskode"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.1.templates:9001
+#: ../mysql-server-5.5.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
-msgstr "De to adgangskoder du indtastede var ikke de samme. Forsøg venligst igen."
+msgstr ""
+"De to adgangskoder du indtastede var ikke de samme. Forsøg venligst igen."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.1.templates:10001
+#: ../mysql-server-5.5.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "NDB-cluster ser ud til at være i brug"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.1.templates:10001
+#: ../mysql-server-5.5.templates:10001
 msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
+"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"mysql-cluster-server package and remove all lines starting with \"ndb\" from "
+"all config files below /etc/mysql/."
 msgstr ""
-"MySQL-5.1 tilbyder ikke længere NDB-clusterunderstøttelse. Migrer venligst til "
-"den nye pakke mysql-cluster og fjern alle linjer der starter med »ndb« fra alle "
-"konfigurationsfiler under /etc/mysql/."
-
-
+"MySQL-5.5 tilbyder ikke længere NDB-clusterunderstøttelse. Migrer venligst "
+"til den nye pakke mysql-cluster og fjern alle linjer der starter med »ndb« "
+"fra alle konfigurationsfiler under /etc/mysql/."
diff --git a/debian/po/sk.po b/debian/po/sk.po
index c753da0..e174c18 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -2,21 +2,24 @@
 # Slovenské preklady pre balík mysql-5.1.
 # Copyright (C) 2011 THE mysql-5.1'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the mysql-5.1 package.
-# Slavko <linux@slavino.sk>, 2011.
+# Slavko <linux@slavino.sk>, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-5.1 5.1.49-3\n"
 "Report-Msgid-Bugs-To: mysql-5.5@packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
-"PO-Revision-Date: 2011-01-04 12:55+0100\n"
+"PO-Revision-Date: 2012-08-12 14:25+0200\n"
 "Last-Translator: Slavko <linux@slavino.sk>\n"
-"Language-Team: Slovak <nomail>\n"
+"Language-Team: slovenčina <debian-l10n-slovak@lists.debian.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-POFile-SpellExtra: YP NDB lib start mysql-cluster-server MySQL share\n"
+"X-POFile-SpellExtra: init mysql-server etc flag MySQL-5 usr mysql README\n"
+"X-POFile-SpellExtra: NIS mysql-server-5 debian- ndb Cluster\n"
 
 #. Type: boolean
 #. Description
@@ -172,16 +175,12 @@ msgstr "Po inštalácii balíka by ste mali skontrolovať heslo účtu."
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
-#, fuzzy
-#| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
-#| "more information."
 msgid ""
 "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
 "information."
 msgstr ""
-"Ďalšie podrobností nájdete v súbore /usr/share/doc/mysql-server-5.1/README."
-"Debian."
+"Prečítajte si prosím, ďalšie podrobností v súbore /usr/share/doc/mysql-"
+"server-5.5/README.Debian."
 
 #. Type: error
 #. Description
@@ -204,16 +203,11 @@ msgstr "Vyzerá to, že používate NDB Cluster"
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:10001
-#, fuzzy
-#| msgid ""
-#| "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the "
-#| "new mysql-cluster package and remove all lines starting with \"ndb\" from "
-#| "all config files below /etc/mysql/."
 msgid ""
 "MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster-server package and remove all lines starting with \"ndb\" from "
 "all config files below /etc/mysql/."
 msgstr ""
-"MySQL-5.1 už nepodporuje NDB Cluster. Použite prosím nový balík mysql-"
-"cluster a zo všetkých konfiguračných súborov v /etc/mysql/ odstráňte všetky "
-"riadky, ktoré začínajú na „ndb”."
+"MySQL-5.5 už neposkytuje podporu NDB Cluster. Použite prosím nový balík "
+"mysql-cluster-server a zo všetkých konfiguračných súborov v /etc/mysql/ "
+"odstráňte všetky riadky, ktoré začínajú na „ndb”."
diff --git a/debian/po/tr.po b/debian/po/tr.po
index d1c3295..129f4ef 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -1,32 +1,32 @@
 # Turkish translation of mysql-server.
 # This file is distributed under the same license as the mysql-server package.
 # Gürkan Aslan <gurkan@iaslan.com>, 2004
+# Atila KOÇ <akoc@artielektronik.com.tr>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-4.1\n"
+"Project-Id-Version: mysql-5.1\n"
 "Report-Msgid-Bugs-To: mysql-5.5@packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
-"PO-Revision-Date: 2004-06-05 08:53+0300\n"
-"Last-Translator: Gürkan Aslan <gurkan@iaslan.com>\n"
+"PO-Revision-Date: 2012-09-17 11:40+0200\n"
+"Last-Translator: Atila KOÇ <akoc@artielektronik.com.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=1; plural=0;\n"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.5.templates:2001
 msgid "Really proceed with downgrade?"
-msgstr ""
+msgstr "Sürüm düşürme işlemine gerçekten başlansın mı?"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.5.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr ""
+msgstr "Bu sistemde /var/lib/mysql/debian-*.flag adlı bir dosya bulunmaktadır."
 
 #. Type: boolean
 #. Description
@@ -35,6 +35,8 @@ msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
 msgstr ""
+"Böyle bir dosyanın varlığı daha yüksek sürümde bir mysql-server paketinin "
+"önceden kurulu olduğunu gösterir."
 
 #. Type: boolean
 #. Description
@@ -43,14 +45,14 @@ msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
 msgstr ""
+"Kurmakta olduğunuz sürümün var olan veritabanlarını kullanabileceğinin "
+"garantisi yoktur."
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.5.templates:3001
-#, fuzzy
-#| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
-msgstr "NIS/YP kullanıcıları için önemli not!"
+msgstr "NIS/YP kullanıcıları için önemli not"
 
 #. Type: note
 #. Description
@@ -59,6 +61,8 @@ msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
 msgstr ""
+"MySQL'in NIS/YP ile kullanılması için yerel sisteme bir mysql kullanıcı "
+"hesabının eklenmesi gereklidir."
 
 #. Type: note
 #. Description
@@ -67,12 +71,14 @@ msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
 msgstr ""
+"/var/lib/mysql dizininin sahiplik ayarlarını ve izin haklarını da gözden "
+"geçirmelisiniz."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.5.templates:4001
 msgid "Remove all MySQL databases?"
-msgstr ""
+msgstr "Tüm MySQL veritabanları kaldırılsın mı?"
 
 #. Type: boolean
 #. Description
@@ -81,6 +87,7 @@ msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
 msgstr ""
+"MySQL veritabanlarını barındıran /var/lib/mysql dizini kaldırılmak üzere"
 
 #. Type: boolean
 #. Description
@@ -90,32 +97,31 @@ msgid ""
 "version or if a different mysql-server package is already using it, the data "
 "should be kept."
 msgstr ""
+"Eğer MySQL paketini daha sonra güncel bir sürümünü kurmak üzere "
+"kaldırıyorsanız ya da veritabanlarınıza başka bir mysql-server paketi ile "
+"erişiyorsanız, veritabanlarınızı tutmalısınız."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.5.templates:5001
-#, fuzzy
-#| msgid "Should MySQL start on boot?"
 msgid "Start the MySQL server on boot?"
-msgstr "MySQL açılış sırasında başlatılsın mı?"
+msgstr "MySQL sunucusu açılış sırasında başlatılsın mı?"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.5.templates:5001
-#, fuzzy
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
 msgstr ""
-"MySQL açılış sırasında veya '/etc/init.d/mysql start' komutunu vermeniz "
-"halinde elle başlatılabilir. Eğer açılışta otomatik olarak başlatılmasını "
-"istiyorsanız burada 'evet'i seçin."
+"MySQL sunucusu açılış sırasında kendiliğinden ya da '/etc/init.d/mysql "
+"start' komutu çalıştırılarak elle başlatılabilir."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.5.templates:6001
 msgid "New password for the MySQL \"root\" user:"
-msgstr ""
+msgstr "MySQL \"root\" kullanıcısı için yeni parola:"
 
 #. Type: password
 #. Description
@@ -124,24 +130,26 @@ msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
 msgstr ""
+"Zorunlu olmasa da MySQL yönetimsel \"root\" kullanıcısı için bir parola "
+"oluşturulması kuvvetle önerilir."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.5.templates:6001
 msgid "If this field is left blank, the password will not be changed."
-msgstr ""
+msgstr "Bu alanın boş bırakılması durumunda parola değiştirilmeyecektir."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.5.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
-msgstr ""
+msgstr "MySQL \"root\" kullanıcısının parolasını yineleyin:"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
-msgstr ""
+msgstr "MySQL \"root\" kullanıcısı için parola oluşturulamadı"
 
 #. Type: error
 #. Description
@@ -151,12 +159,15 @@ msgid ""
 "user. This may have happened because the account already has a password, or "
 "because of a communication problem with the MySQL server."
 msgstr ""
+"MySQL yönetimsel kullanıcısı için parola oluşturulurken bir hata oluştu. Bu "
+"hataya ilgili hesabın zaten bir parolası olması ya da MySQL sunucusu ile "
+"yaşanan iletişim sorunları neden olmuş olabilir."
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
 msgid "You should check the account's password after the package installation."
-msgstr ""
+msgstr "Paketin kurulumundan sonra ilgili hesabın parolasını denetlemelisiniz."
 
 #. Type: error
 #. Description
@@ -165,24 +176,26 @@ msgid ""
 "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
 "information."
 msgstr ""
+"Daha fazla bilgi için lütfen /usr/share/doc/mysql-server-5.5/README.Debian "
+"dosyasını inceleyiniz."
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:9001
 msgid "Password input error"
-msgstr ""
+msgstr "Parola giriş hatası"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
+msgstr "Girdiğiniz parolalar eşleşmiyor, lütfen tekrar deneyiniz."
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:10001
 msgid "NDB Cluster seems to be in use"
-msgstr ""
+msgstr "NDB Kümesi kullanılıyor gibi görünüyor"
 
 #. Type: error
 #. Description
@@ -192,6 +205,9 @@ msgid ""
 "mysql-cluster-server package and remove all lines starting with \"ndb\" from "
 "all config files below /etc/mysql/."
 msgstr ""
+"MySQL-5.5 artık NDB Kümesi desteği vermemektedir. Lütfen yeni mysql-cluster "
+"paketine geçiniz ve /etc/mysql/ dizinindeki tüm yapılandırma dosyalarından "
+"\"ndb\" ile başlayan satırları kaldırınız."
 
 #~ msgid ""
 #~ "To use mysql you must install an equivalent user and group to the "
diff --git a/debian/rules b/debian/rules
index 38aefa8..e5de371 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,6 @@ ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
 DEBVERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
 
 ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
@@ -38,10 +37,15 @@ ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)
 # before a release, but it is long
     MAKE_TEST_TARGET:=test-bt
 endif
+ifeq ($(ARCH_OS),hurd)
+# Tests not fully working under Hurd
+# See http://bugs.mysql.com/bug.php?id=64685
+    MAKE_TEST_TARGET:=test
+endif
 
 USE_ASSEMBLER:=--enable-assembler 
 
-ifneq (,$(filter $(ARCH), amd64 i386 kfreebsd-i386))
+ifneq (,$(filter $(ARCH), amd64 i386))
     TESTSUITE_FAIL_CMD:=exit 1
 else
     TESTSUITE_FAIL_CMD:=true
@@ -64,7 +68,7 @@ ifneq (,$(findstring linux-gnu,$(DEB_HOST_GNU_TYPE)))
     USE_LINUX_NATIVE_AIO:=-DLINUX_NATIVE_AIO=ON
 endif
 
-override_dh_auto_clean:
+override_dh_auto_clean: 
 	@echo "RULES.$@"
 	dh_testdir 
 	dh_testroot
@@ -100,9 +104,10 @@ configure-stamp configure-pic-stamp:
 		$(USE_STATIC_MYSQLD) \
 		$(USE_LINUX_NATIVE_AIO) \
 		-DWITH_SSL=bundled \
+		-DWITH_ZLIB=system \
 	    -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
 	    -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
-	    -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \
+	    -DSYSTEM_TYPE="debian-linux-gnu" \
 	    -DINSTALL_LAYOUT=RPM \
 	    -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
 	    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
@@ -114,6 +119,7 @@ configure-stamp configure-pic-stamp:
 		-DWITH_EXTRA_CHARSETS=all ..'
 	touch $@
 
+
 override_dh_auto_build: build-stamp build-pic-stamp
 
 build-stamp:
@@ -146,6 +152,15 @@ auto_install-stamp:
 	@echo "RULES.$@"
 	dh_testdir
 	dh_testroot
+	dh_prep
+	# some self written manpages which hopefully
+	# gets overwritten sooner or later with upstreams
+	mkdir -p $(TMP)/usr/share/man/man1/
+	mkdir -p $(TMP)/usr/share/man/man8/
+	cp debian/additions/*.1 $(TMP)/usr/share/man/man1/
+	mkdir -p $(TMP)/etc/mysql/conf.d/
+	touch $(TMP)/etc/mysql/conf.d/.keepme
+	cp debian/additions/mysqld_safe_syslog.cnf $(TMP)/etc/mysql/conf.d/
 	# make install (trailing slash needed for innobase)
 	cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/
 	# After installing, remove rpath to make lintian happy.
@@ -156,73 +171,41 @@ auto_install-stamp:
 		| cut -d: -f 1 \
 		| xargs --no-run-if-empty chrpath -d; \
 	set -e
+	# libmysqlclient_r is now a symlink to libmysqlclient. But it is
+	# created wrong by the cmake build system and points at
+	# libmysqlclient.so instead of the corresponding versioned lib.
+	for i in `ls $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so*` ; do \
+		rlib=`basename $$i | sed -e 's/libmysqlclient\./libmysqlclient_r./'` ;\
+		ln -sf `basename $$i` $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/$$rlib ;\
+	done
 	# install libmysqld built with -FPIC
 	install -d -m 0755 -o root -g root $(TMP)/usr/lib/mysql
 	install -m 0644 -o root -g root $(BUILDDIR_PIC)/libmysqld/libmysqld.a $(TMP)/usr/lib/mysql/libmysqld_pic.a
 	# mysql_config won't report the -fPIC, so give libmysqld-pic users a way to get their flags
 	install -m 0755 -o root -g root $(BUILDDIR_PIC)/scripts/mysql_config $(TMP)/usr/bin/mysql_config_pic
-	mkdir -p $(TMP)/usr/share/doc/mysql-server-5.5
+	# mysql-client
+	install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
+	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
+	install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/
+	# mysql-server
+	mkdir -p $(TMP)/usr/share/doc/mysql-server-5.5/examples
+	mv $(TMP)/usr/share/mysql/*cnf 	    $(TMP)/usr/share/doc/mysql-server-5.5/examples/
+	rm -vf $(TMP)/usr/share/mysql/mi_test_all* \
+	       $(TMP)/usr/share/mysql/mysql-log-rotate \
+	       $(TMP)/usr/share/mysql/mysql.server \
+	       $(TMP)/usr/share/mysql/binary-configure
 	nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mysql-server-5.5/mysqld.sym.gz
-	# This seems to be the only safe place to fix permissions issues
-        # not handled by dh_fixperms.
-	mkdir -p $(TMP)/etc/mysql/conf.d/
-	touch $(TMP)/etc/mysql/conf.d/.keepme
 	install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
 	install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
 	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
-	chmod 0755 $(TMP)/usr/share/mysql-test/lib/My/SafeProcess/safe_process.pl
-	chmod 0755 $(TMP)/usr/share/mysql-test/std_data/checkDBI_DBD-mysql.pl
-	chmod 0644 $(TMP)/usr/share/mysql/*.ini
-	chmod 0644 $(TMP)/usr/share/mysql-test/[rt]/*
-	chmod 0644 $(TMP)/usr/share/mysql-test/collections/default.weekly
-	chmod 0644 $(TMP)/usr/share/mysql-test/suite/innodb/[rt]/*
-	chmod 0644 $(TMP)/usr/bin/mysqlaccess.conf
 	touch $@
 
-# Use the --fail-missing to check for stuff that we should be installing
-#       Exclusion                                       Package         Type
-#       usr/share/man/                                  various         man
-#       libmysqlclient_r.so                             libMclient-dev  links
-#       usr/share/mysql/magic                           M-server-5.5    example
-#       usr/bin/mysqlaccess.conf                        M-client-5.5    example
-#       usr/lib/mysql/plugin/daemon_example.ini         M-server-5.5    example
-#       usr/share/mysql/my-                             M-server-5.5    example
-# The following exclusions have been inherited from pre short form
-# debian/rules days.
-#        usr/share/mysql/mi_test_all
-#        usr/share/mysql/mysql-log-rotate
-#        usr/share/mysql/mysql.server
-#        usr/share/mysql/binary-configure
 override_dh_install:
-	dh_install --fail-missing                       \
-        -Xusr/share/man/                                \
-        -Xlibmysqlclient_r.so                           \
-        -Xusr/share/mysql/magic                         \
-        -Xusr/lib/mysql/plugin/daemon_example.ini       \
-        -Xusr/bin/mysqlaccess.conf                      \
-        -Xusr/share/mysql/mi_test_all                   \
-        -Xusr/share/mysql/mysql-log-rotate              \
-        -Xusr/share/mysql/mysql.server                  \
-        -Xusr/share/mysql/binary-configure              \
-        -Xusr/share/mysql/my-
-
-libmysqlclient-links-stamp: auto_install-stamp
-	@echo "RULES.$@"
-	# libmysqlclient_r is now a symlink to libmysqlclient. But it is
-	# created wrong by the cmake build system and points at
-	# libmysqlclient.so instead of the corresponding versioned lib.
-	echo usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient_r.so > debian/libmysqlclient-dev.links
-	rm -f debian/libmysqlclient18.links
-	for i in `ls $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.*`; \
-	do \
-	    source=`basename $$i`; \
-	    dest=`echo $$source | sed -e's/libmysqlclient/libmysqlclient_r/'`; \
-	    echo usr/lib/$(DEB_HOST_MULTIARCH)/$$source usr/lib/$(DEB_HOST_MULTIARCH)/$$dest >> debian/libmysqlclient18.links; \
-	done
-	touch $@
+	dh_movefiles
+	dh_install
 
-override_dh_link-arch: libmysqlclient-links-stamp
-	dh_link
+override_dh_installchangelogs:
+	dh_installchangelogs Docs/ChangeLog
 
 override_dh_installlogrotate-arch:
 	dh_installlogrotate --name mysql-server
@@ -230,9 +213,6 @@ override_dh_installlogrotate-arch:
 	  dh_apparmor -pmysql-server-5.5 --profile-name=usr.sbin.mysqld; \
 	fi
 
-override_dh_installchangelogs:
-	dh_installchangelogs Docs/ChangeLog
-
 # Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
 # started which might depend on a running database server.
 override_dh_installinit-arch:
@@ -244,10 +224,13 @@ override_dh_installcron-arch:
 override_dh_makeshlibs-arch:
 	dh_makeshlibs -plibmysqlclient18 -V'libmysqlclient18 (>= 5.5.24+dfsg-1)'
 
+override_dh_builddeb:
+	dh_builddeb -- -Zxz
+
 binary:	binary-indep binary-arch
 
 get-orig-source:
-	uscan --force-download --verbose
+	uscan --force-download --verbose --download-current-version
 
 %:
 	dh $@ --parallel
author	spamaps-guest <spamaps-guest@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1>	2012-11-16 08:09:49 +0000
committer	spamaps-guest <spamaps-guest@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1>	2012-11-16 08:09:49 +0000
commit	13f6ba21c5b062bdc080f7f88e1a37c1b928f27e (patch)
tree	1de8b2f2222ff3a99f97a75c25e3152518aa0e65
parent	bf5905b4ab3bb98faf770c9131df0de067033118 (diff)
download	mysql-5.5-13f6ba21c5b062bdc080f7f88e1a37c1b928f27e.tar.gz