[Pkg-mysql-commits] r2209 - in mysql-5.6/trunk: . debian debian/patches debian/po

Bjoern Boschman jesusch-guest at alioth.debian.org
Tue Jan 15 13:30:07 UTC 2013


Author: jesusch-guest
Date: 2013-01-15 13:30:06 +0000 (Tue, 15 Jan 2013)
New Revision: 2209

Added:
   mysql-5.6/trunk/debian/
   mysql-5.6/trunk/debian/mysql-client-5.6.README.Debian
   mysql-5.6/trunk/debian/mysql-client-5.6.dirs
   mysql-5.6/trunk/debian/mysql-client-5.6.docs
   mysql-5.6/trunk/debian/mysql-client-5.6.examples
   mysql-5.6/trunk/debian/mysql-client-5.6.install
   mysql-5.6/trunk/debian/mysql-client-5.6.links
   mysql-5.6/trunk/debian/mysql-client-5.6.lintian-overrides
   mysql-5.6/trunk/debian/mysql-client-5.6.manpages
   mysql-5.6/trunk/debian/mysql-client-core-5.6.install
   mysql-5.6/trunk/debian/mysql-client-core-5.6.manpages
   mysql-5.6/trunk/debian/mysql-server-5.6.NEWS
   mysql-5.6/trunk/debian/mysql-server-5.6.README.Debian
   mysql-5.6/trunk/debian/mysql-server-5.6.config
   mysql-5.6/trunk/debian/mysql-server-5.6.dirs
   mysql-5.6/trunk/debian/mysql-server-5.6.examples
   mysql-5.6/trunk/debian/mysql-server-5.6.install
   mysql-5.6/trunk/debian/mysql-server-5.6.lintian-overrides
   mysql-5.6/trunk/debian/mysql-server-5.6.logcheck.ignore.paranoid
   mysql-5.6/trunk/debian/mysql-server-5.6.logcheck.ignore.server
   mysql-5.6/trunk/debian/mysql-server-5.6.logcheck.ignore.workstation
   mysql-5.6/trunk/debian/mysql-server-5.6.manpages
   mysql-5.6/trunk/debian/mysql-server-5.6.mysql-server.logrotate
   mysql-5.6/trunk/debian/mysql-server-5.6.mysql.init
   mysql-5.6/trunk/debian/mysql-server-5.6.postinst
   mysql-5.6/trunk/debian/mysql-server-5.6.postrm
   mysql-5.6/trunk/debian/mysql-server-5.6.preinst
   mysql-5.6/trunk/debian/mysql-server-5.6.prerm
   mysql-5.6/trunk/debian/mysql-server-5.6.templates
   mysql-5.6/trunk/debian/mysql-server-core-5.6.dirs
   mysql-5.6/trunk/debian/mysql-server-core-5.6.install
   mysql-5.6/trunk/debian/mysql-server-core-5.6.lintian-overrides
   mysql-5.6/trunk/debian/mysql-server-core-5.6.manpages
   mysql-5.6/trunk/debian/mysql-source-5.6.install
   mysql-5.6/trunk/debian/mysql-testsuite-5.6.dirs
   mysql-5.6/trunk/debian/mysql-testsuite-5.6.install
   mysql-5.6/trunk/debian/mysql-testsuite-5.6.lintian-overrides
   mysql-5.6/trunk/debian/patches/mysql-bug.67018.patch
   mysql-5.6/trunk/debian/patches/mysql-bug.68087.patch
Removed:
   mysql-5.6/trunk/debian/mysql-client-5.5.README.Debian
   mysql-5.6/trunk/debian/mysql-client-5.5.dirs
   mysql-5.6/trunk/debian/mysql-client-5.5.docs
   mysql-5.6/trunk/debian/mysql-client-5.5.examples
   mysql-5.6/trunk/debian/mysql-client-5.5.install
   mysql-5.6/trunk/debian/mysql-client-5.5.links
   mysql-5.6/trunk/debian/mysql-client-5.5.lintian-overrides
   mysql-5.6/trunk/debian/mysql-client-5.5.manpages
   mysql-5.6/trunk/debian/mysql-client-core-5.5.install
   mysql-5.6/trunk/debian/mysql-client-core-5.5.manpages
   mysql-5.6/trunk/debian/mysql-server-5.5.NEWS
   mysql-5.6/trunk/debian/mysql-server-5.5.README.Debian
   mysql-5.6/trunk/debian/mysql-server-5.5.config
   mysql-5.6/trunk/debian/mysql-server-5.5.dirs
   mysql-5.6/trunk/debian/mysql-server-5.5.examples
   mysql-5.6/trunk/debian/mysql-server-5.5.install
   mysql-5.6/trunk/debian/mysql-server-5.5.lintian-overrides
   mysql-5.6/trunk/debian/mysql-server-5.5.logcheck.ignore.paranoid
   mysql-5.6/trunk/debian/mysql-server-5.5.logcheck.ignore.server
   mysql-5.6/trunk/debian/mysql-server-5.5.logcheck.ignore.workstation
   mysql-5.6/trunk/debian/mysql-server-5.5.manpages
   mysql-5.6/trunk/debian/mysql-server-5.5.mysql-server.logrotate
   mysql-5.6/trunk/debian/mysql-server-5.5.mysql.init
   mysql-5.6/trunk/debian/mysql-server-5.5.postinst
   mysql-5.6/trunk/debian/mysql-server-5.5.postrm
   mysql-5.6/trunk/debian/mysql-server-5.5.preinst
   mysql-5.6/trunk/debian/mysql-server-5.5.prerm
   mysql-5.6/trunk/debian/mysql-server-5.5.templates
   mysql-5.6/trunk/debian/mysql-server-core-5.5.dirs
   mysql-5.6/trunk/debian/mysql-server-core-5.5.install
   mysql-5.6/trunk/debian/mysql-server-core-5.5.lintian-overrides
   mysql-5.6/trunk/debian/mysql-server-core-5.5.manpages
   mysql-5.6/trunk/debian/mysql-source-5.5.install
   mysql-5.6/trunk/debian/mysql-testsuite-5.5.dirs
   mysql-5.6/trunk/debian/mysql-testsuite-5.5.install
   mysql-5.6/trunk/debian/mysql-testsuite-5.5.lintian-overrides
Modified:
   mysql-5.6/trunk/debian/README.Maintainer
   mysql-5.6/trunk/debian/changelog
   mysql-5.6/trunk/debian/control
   mysql-5.6/trunk/debian/copyright
   mysql-5.6/trunk/debian/libmysqlclient-dev.examples
   mysql-5.6/trunk/debian/libmysqlclient-dev.install
   mysql-5.6/trunk/debian/libmysqlclient18.install
   mysql-5.6/trunk/debian/libmysqld-dev.install
   mysql-5.6/trunk/debian/patches/series
   mysql-5.6/trunk/debian/po/POTFILES.in
   mysql-5.6/trunk/debian/po/ar.po
   mysql-5.6/trunk/debian/po/ca.po
   mysql-5.6/trunk/debian/po/cs.po
   mysql-5.6/trunk/debian/po/da.po
   mysql-5.6/trunk/debian/po/de.po
   mysql-5.6/trunk/debian/po/es.po
   mysql-5.6/trunk/debian/po/eu.po
   mysql-5.6/trunk/debian/po/fr.po
   mysql-5.6/trunk/debian/po/gl.po
   mysql-5.6/trunk/debian/po/it.po
   mysql-5.6/trunk/debian/po/ja.po
   mysql-5.6/trunk/debian/po/nb.po
   mysql-5.6/trunk/debian/po/nl.po
   mysql-5.6/trunk/debian/po/pt.po
   mysql-5.6/trunk/debian/po/pt_BR.po
   mysql-5.6/trunk/debian/po/ro.po
   mysql-5.6/trunk/debian/po/ru.po
   mysql-5.6/trunk/debian/po/sk.po
   mysql-5.6/trunk/debian/po/sv.po
   mysql-5.6/trunk/debian/po/templates.pot
   mysql-5.6/trunk/debian/po/tr.po
   mysql-5.6/trunk/debian/rules
   mysql-5.6/trunk/debian/source.lintian-overrides
   mysql-5.6/trunk/debian/watch
Log:
first commit for mysql-5.6 (still RC state)


Modified: mysql-5.6/trunk/debian/README.Maintainer
===================================================================
--- mysql-5.5/trunk/debian/README.Maintainer	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/README.Maintainer	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,5 +1,13 @@
 
 ###########################
+##	FIXME for 5.6    ##
+###########################
+
+* check mysql_upgrade
+* check remaining mysql-5.5 patches
+* indeed several other enhancements
+
+###########################
 ##	FIXME for 5.1    ##
 ###########################
 

Modified: mysql-5.6/trunk/debian/changelog
===================================================================
--- mysql-5.5/trunk/debian/changelog	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/changelog	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,5 +1,11 @@
-mysql-5.5 (5.5.25+dfsg-2) UNRELEASED; urgency=low
+mysql-5.6 (5.6.9-rc+dfsg-1) UNRELEASED; urgency=low
 
+  * new upstream 
+
+ -- Bjoern Boschman <bjoern.boschman at nfon.net>  Wed, 09 Jan 2013 11:15:51 +0100
+
+mysql-5.5 (5.5.25+dfsg-2) quantal; urgency=low
+
   [ Nicholas Bamber ]
   * Made DFSG repacking mechanism independent of local installs and improved
     the documentation
@@ -12,7 +18,7 @@
   * mysqld_safe is now running as User 'mysql' (Closes: 664639)
   * logrotate now handles all /var/log/mysql/*log files
 
- -- Nicholas Bamber <nicholas at periapt.co.uk>  Sat, 16 Jun 2012 13:47:30 +0100
+ -- Bjoern Boschman <bjoern.boschman at nfon.net>  Wed, 09 Jan 2013 11:15:29 +0100
 
 mysql-5.5 (5.5.25+dfsg-1) experimental; urgency=low
 

Modified: mysql-5.6/trunk/debian/control
===================================================================
--- mysql-5.5/trunk/debian/control	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/control	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,4 +1,4 @@
-Source: mysql-5.5
+Source: mysql-5.6
 Section: database
 Priority: optional
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
@@ -7,8 +7,8 @@
 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]
 Standards-Version: 3.9.3
 Homepage: http://dev.mysql.com/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.6/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-mysql/mysql-5.6/
 
 Package: libmysqlclient18
 Section: libs
@@ -66,7 +66,8 @@
 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.6), mysql-client-5.1 (<< 5.6), mysql-server-core-5.1 (<< 5.6),
+  mysql-server-5.5 (<< 5.6), mysql-client-5.5 (<< 5.6), mysql-server-core-5.5 (<< 5.6)
 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,11 +78,11 @@
  This package includes files needed by all versions of the client library,
  e.g. /etc/mysql/my.cnf.
 
-Package: mysql-client-core-5.5
+Package: mysql-client-core-5.6
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: mysql-client-5.5 (<< ${source:Version})
-Replaces: mysql-client-5.5 (<< ${source:Version})
+Breaks: mysql-client-5.6 (<< ${source:Version})
+Replaces: mysql-client-5.6 (<< ${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
@@ -90,9 +91,9 @@
  .
  This package includes the core client files, as used by Akonadi.
 
-Package: mysql-client-5.5
+Package: mysql-client-5.6
 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}, mysql-client-core-5.6
 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
@@ -106,7 +107,7 @@
  This package includes the client binaries and the additional tools
  innotop and mysqlreport.
 
-Package: mysql-server-core-5.5
+Package: mysql-server-core-5.6
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: mysql-server-5.1, mysql-server-5.0, mysql-server-core-5.1, mysql-client-5.1
@@ -121,16 +122,16 @@
  This package includes the server binaries but doesn't contain all the
  infrastructure needed to setup system databases.
 
-Package: mysql-server-5.5
+Package: mysql-server-5.6
 Architecture: any
 Recommends: libhtml-template-perl
 Suggests: tinyca, mailx
 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)
-Breaks: mysql-server (<< ${source:Version}), mysql-server-5.1, libmysqlclient-dev ( << 5.5.17~), mysql-client-5.1
+Depends: mysql-client-5.6 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mysql-server-core-5.6 (= ${binary:Version}), initscripts
+Breaks: mysql-server (<< ${source:Version}), mysql-server-5.1, mysql-server-5.5, libmysqlclient-dev ( << 5.6), mysql-client-5.5, 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-server-5.5,
+ mysql-client-5.1, mysql-client-5.5, libmysqlclient-dev ( << 5.6)
 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
@@ -142,10 +143,10 @@
 
 Package: mysql-server
 Architecture: all
-Depends: mysql-server-5.5, ${misc:Depends}
+Depends: mysql-server-5.6, ${misc:Depends}
 Description: MySQL database server (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mysql-server (currently mysql-server-5.5), as determined by the MySQL
+ mysql-server (currently mysql-server-5.6), as determined by the MySQL
  maintainers. Install this package if in doubt about which MySQL
  version you need. That will install the version recommended by the
  package maintainers.
@@ -157,27 +158,27 @@
 
 Package: mysql-client
 Architecture: all
-Depends: mysql-client-5.5, ${misc:Depends}
+Depends: mysql-client-5.6, ${misc:Depends}
 Description: MySQL database client (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mysql-client (currently mysql-client-5.5), as determined by the MySQL
+ mysql-client (currently mysql-client-5.6), 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 by the
  Maintainers.
 
 Package: mysql-testsuite
 Architecture: all
-Depends: mysql-testsuite-5.5, ${misc:Depends}
+Depends: mysql-testsuite-5.6, ${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-testsuite (currently mysql-testsuite-5.6), 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
+Package: mysql-testsuite-5.6
 Architecture: any
 Depends: mysql-server (= ${source:Version}), mysql-client (= ${source:Version}), ${misc:Depends},  ${shlibs:Depends}
-Description: MySQL 5.5 testsuite
+Description: MySQL 5.6 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
@@ -185,7 +186,7 @@
  .
  This package includes the MySQL testsuite.
 
-Package: mysql-source-5.5
+Package: mysql-source-5.6
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: MySQL source

Modified: mysql-5.6/trunk/debian/copyright
===================================================================
--- mysql-5.5/trunk/debian/copyright	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/copyright	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: MySQL 5.5
+Upstream-Name: MySQL 5.6
 Upstream-Contact: http://bugs.mysql.com/
-Source: http://dev.mysql.com/downloads/mysql/5.5.html
+Source: http://dev.mysql.com/downloads/mysql/5.6.html
 Comments:
  The file Docs/mysql.info is removed from the upstream source
  because it is incompatible with the Debian Free Software Guidelines.

Modified: mysql-5.6/trunk/debian/libmysqlclient-dev.examples
===================================================================
--- mysql-5.5/trunk/debian/libmysqlclient-dev.examples	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/libmysqlclient-dev.examples	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1 +1 @@
-sql/udf_example.c
+sql/udf_example.cc

Modified: mysql-5.6/trunk/debian/libmysqlclient-dev.install
===================================================================
--- mysql-5.5/trunk/debian/libmysqlclient-dev.install	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/libmysqlclient-dev.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,6 +1,6 @@
 usr/bin/mysql_config
 usr/include/mysql/*
-usr/lib/*/libmysqlclient.a
-usr/lib/*/libmysqlclient.so
-usr/lib/*/libmysqlclient_r.a
+usr/lib/libmysqlclient.a
+usr/lib/libmysqlclient.so
+usr/lib/libmysqlclient_r.a
 usr/share/aclocal/mysql.m4

Modified: mysql-5.6/trunk/debian/libmysqlclient18.install
===================================================================
--- mysql-5.5/trunk/debian/libmysqlclient18.install	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/libmysqlclient18.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1 +1,2 @@
-usr/lib/*/libmysqlclient.so.*
+usr/lib/libmysqlclient.*
+usr/lib/libmysqlclient_r.*

Modified: mysql-5.6/trunk/debian/libmysqld-dev.install
===================================================================
--- mysql-5.5/trunk/debian/libmysqld-dev.install	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/libmysqld-dev.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,2 +1,2 @@
-usr/lib/*/libmysqld.a
-usr/lib/*/libmysqlservices.a
+usr/lib/libmysqld.a
+usr/lib/libmysqlservices.a

Deleted: mysql-5.6/trunk/debian/mysql-client-5.5.README.Debian
===================================================================
--- mysql-5.5/trunk/debian/mysql-client-5.5.README.Debian	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-client-5.5.README.Debian	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,4 +0,0 @@
-FAQ:
-
-Q: My <tab> completition is gone, why?
-A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mysql/my.cnf!

Deleted: mysql-5.6/trunk/debian/mysql-client-5.5.dirs
===================================================================
--- mysql-5.5/trunk/debian/mysql-client-5.5.dirs	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-client-5.5.dirs	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,3 +0,0 @@
-usr/bin/
-usr/share/man/man1/
-usr/share/perl5/

Deleted: mysql-5.6/trunk/debian/mysql-client-5.5.docs
===================================================================
--- mysql-5.5/trunk/debian/mysql-client-5.5.docs	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-client-5.5.docs	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,2 +0,0 @@
-debian/additions/innotop/changelog.innotop
-README

Deleted: mysql-5.6/trunk/debian/mysql-client-5.5.examples
===================================================================
--- mysql-5.5/trunk/debian/mysql-client-5.5.examples	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-client-5.5.examples	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1 +0,0 @@
-debian/tmp/usr/bin/mysqlaccess.conf

Deleted: mysql-5.6/trunk/debian/mysql-client-5.5.install
===================================================================
--- mysql-5.5/trunk/debian/mysql-client-5.5.install	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-client-5.5.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -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

Deleted: mysql-5.6/trunk/debian/mysql-client-5.5.links
===================================================================
--- mysql-5.5/trunk/debian/mysql-client-5.5.links	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-client-5.5.links	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,6 +0,0 @@
-usr/bin/mysqlcheck usr/bin/mysqlrepair
-usr/bin/mysqlcheck usr/bin/mysqlanalyze
-usr/bin/mysqlcheck usr/bin/mysqloptimize
-usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlrepair.1.gz
-usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlanalyze.1.gz
-usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqloptimize.1.gz

Deleted: mysql-5.6/trunk/debian/mysql-client-5.5.lintian-overrides
===================================================================
--- mysql-5.5/trunk/debian/mysql-client-5.5.lintian-overrides	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-client-5.5.lintian-overrides	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,7 +0,0 @@
-# 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

Deleted: mysql-5.6/trunk/debian/mysql-client-5.5.manpages
===================================================================
--- mysql-5.5/trunk/debian/mysql-client-5.5.manpages	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-client-5.5.manpages	2013-01-15 13:30:06 UTC (rev 2209)
@@ -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

Copied: mysql-5.6/trunk/debian/mysql-client-5.6.README.Debian (from rev 2204, mysql-5.5/trunk/debian/mysql-client-5.5.README.Debian)
===================================================================
--- mysql-5.6/trunk/debian/mysql-client-5.6.README.Debian	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-client-5.6.README.Debian	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,4 @@
+FAQ:
+
+Q: My <tab> completition is gone, why?
+A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mysql/my.cnf!

Copied: mysql-5.6/trunk/debian/mysql-client-5.6.dirs (from rev 2204, mysql-5.5/trunk/debian/mysql-client-5.5.dirs)
===================================================================
--- mysql-5.6/trunk/debian/mysql-client-5.6.dirs	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-client-5.6.dirs	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,3 @@
+usr/bin/
+usr/share/man/man1/
+usr/share/perl5/

Copied: mysql-5.6/trunk/debian/mysql-client-5.6.docs (from rev 2204, mysql-5.5/trunk/debian/mysql-client-5.5.docs)
===================================================================
--- mysql-5.6/trunk/debian/mysql-client-5.6.docs	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-client-5.6.docs	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,2 @@
+debian/additions/innotop/changelog.innotop
+README

Copied: mysql-5.6/trunk/debian/mysql-client-5.6.examples (from rev 2204, mysql-5.5/trunk/debian/mysql-client-5.5.examples)
===================================================================
--- mysql-5.6/trunk/debian/mysql-client-5.6.examples	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-client-5.6.examples	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1 @@
+debian/tmp/usr/bin/mysqlaccess.conf

Copied: mysql-5.6/trunk/debian/mysql-client-5.6.install (from rev 2204, mysql-5.5/trunk/debian/mysql-client-5.5.install)
===================================================================
--- mysql-5.6/trunk/debian/mysql-client-5.6.install	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-client-5.6.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,18 @@
+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
+usr/bin/mysql_config_editor

Copied: mysql-5.6/trunk/debian/mysql-client-5.6.links (from rev 2204, mysql-5.5/trunk/debian/mysql-client-5.5.links)
===================================================================
--- mysql-5.6/trunk/debian/mysql-client-5.6.links	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-client-5.6.links	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,6 @@
+usr/bin/mysqlcheck usr/bin/mysqlrepair
+usr/bin/mysqlcheck usr/bin/mysqlanalyze
+usr/bin/mysqlcheck usr/bin/mysqloptimize
+usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlrepair.1.gz
+usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlanalyze.1.gz
+usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqloptimize.1.gz

Copied: mysql-5.6/trunk/debian/mysql-client-5.6.lintian-overrides (from rev 2204, mysql-5.5/trunk/debian/mysql-client-5.5.lintian-overrides)
===================================================================
--- mysql-5.6/trunk/debian/mysql-client-5.6.lintian-overrides	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-client-5.6.lintian-overrides	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,9 @@
+# Will look at man pages later 
+# 2012-03-08 periapt
+# still no update
+# 2012-01-09 jesusch-guest
+mysql-client-5.6: 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.6: 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.6: 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

Copied: mysql-5.6/trunk/debian/mysql-client-5.6.manpages (from rev 2204, mysql-5.5/trunk/debian/mysql-client-5.5.manpages)
===================================================================
--- mysql-5.6/trunk/debian/mysql-client-5.6.manpages	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-client-5.6.manpages	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,18 @@
+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

Deleted: mysql-5.6/trunk/debian/mysql-client-core-5.5.install
===================================================================
--- mysql-5.5/trunk/debian/mysql-client-core-5.5.install	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-client-core-5.5.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,2 +0,0 @@
-usr/bin/mysql
-usr/bin/mysqlcheck

Deleted: mysql-5.6/trunk/debian/mysql-client-core-5.5.manpages
===================================================================
--- mysql-5.5/trunk/debian/mysql-client-core-5.5.manpages	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-client-core-5.5.manpages	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/man/man1/mysql.1
-debian/tmp/usr/share/man/man1/mysqlcheck.1

Copied: mysql-5.6/trunk/debian/mysql-client-core-5.6.install (from rev 2204, mysql-5.5/trunk/debian/mysql-client-core-5.5.install)
===================================================================
--- mysql-5.6/trunk/debian/mysql-client-core-5.6.install	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-client-core-5.6.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,2 @@
+usr/bin/mysql
+usr/bin/mysqlcheck

Copied: mysql-5.6/trunk/debian/mysql-client-core-5.6.manpages (from rev 2204, mysql-5.5/trunk/debian/mysql-client-core-5.5.manpages)
===================================================================
--- mysql-5.6/trunk/debian/mysql-client-core-5.6.manpages	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-client-core-5.6.manpages	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/mysql.1
+debian/tmp/usr/share/man/man1/mysqlcheck.1

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.NEWS
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.NEWS	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.NEWS	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,34 +0,0 @@
-mysql-dfsg-5.1 (5.1.36-1) unstable; urgency=low
-
-  * Please read http://dev.mysql.com/doc/refman/5.1/en/upgrading-from-5-0.html
-  * Make sure to do a REPAIR TABLE on all tables that use UTF-8 and have a
-    FULLTEXT index.
-
- -- Christian Hammers <ch at debian.org>  Sat,  4 Jul 2009 02:31:21 +0200
-
-mysql-dfsg-5.0 (5.1.14beta-2) unstable; urgency=low
-
-  * The BerkeleyDB Storage Engine is no longer supported. If the options
-    have-bdb or skip-bdb are found, MySQL will not start. If you have BDB
-    tables, you should change them to use another storage engine before 
-    upgrading to 5.1.   
-
- -- Monty Taylor <mordred at inaugust.com>  Thu, 18 Jan 2007 12:28:21 -0800
-
-mysql-dfsg-5.0 (5.0.45-2) unstable; urgency=low
-
-  * Binary logging is now disabled by default. If you really need it (e.g. on
-    a replication master), remove the comment from the log_bin line in my.cnf.
-
- -- Norbert Tretkowski <norbert at tretkowski.de>  Sat, 10 Nov 2007 16:26:35 +0100
-
-mysql-dfsg-5.0 (5.0.18-9) unstable; urgency=low
-
-  * Rotation of the binary logs is now configured in /etc/mysql/my.cnf with
-    "expire-logs-days" which defaults to 20 days. The old file
-    /etc/mysql/debian-log-rotate.conf should be removed together with
-    /etc/cron.daily/mysql-server after this value has been adjusted. Note that
-    the old variable defined the number of files whereas the new one defines 
-    a time span in days.
-
- -- Christian Hammers <ch at debian.org>  Tue, 24 Jan 2006 22:18:21 +0100

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.README.Debian
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.README.Debian	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.README.Debian	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,109 +0,0 @@
-* MYSQL WON'T START OR STOP?:
-=============================
-You may never ever delete the special mysql user "debian-sys-maint". This
-user together with the credentials in /etc/mysql/debian.cnf are used by the
-init scripts to stop the server as they would require knowledge of the mysql
-root users password else.
-So in most of the times you can fix the situation by making sure that the
-debian.cnf file contains the right password, e.g. by setting a new one
-(remember to do a "flush privileges" then).
-
-* WHAT TO DO AFTER UPGRADES:
-============================
-The privilege tables are automatically updated so all there is left is read
-the changelogs on dev.mysql.com to see if any changes affect custom apps.
-
-* WHAT TO DO AFTER INSTALLATION:
-================================
-The MySQL manual describes certain steps to do at this stage in a separate
-chapter.  They are not necessary as the Debian packages does them
-automatically.
-
-The only thing that is left over for the admin is 
- - setting the passwords
- - creating new users and databases
- - read the rest of this text
-
-* DOWNGRADING TO 4.0 or 4.1:
-============================
-Unsupported. Period.
-But if you do and get problems or make interesting experiences, mail me, it
-might help others.
-Ok, if you really want, I would recommend to "mysqldump --opt" all tables,
-then purge 4.1, delete /var/lib/mysql, install 4.0 and insert the dumps.  Be
-carefully, though, with the "mysql" table, you might not simply overwrite that
-one as the password for the mysql "debian-sys-maint" user is stored in
-/etc/mysql/debian.cnf and needed by /etc/init.d/ to start mysql and check if
-it's alive. 
-
-* SOME APPLICATION CAN NO LONGER CONNECT:
-=========================================
-This application is probably linked against libmysqlclient12 or below and
-somebody has created a mysql user with new-style passwords.
-The old_passwords=1 option in /etc/mysql/my.cnf might help. If not the
-application that inserted the user has to be changed or the application that
-tries to connect updated to libmysqlclient14 or -15.
-
-* NETWORKING:
-=============
-For security reasons, the Debian package has enabled networking only on the
-loop-back device using "bind-address" in /etc/mysql/my.cnf.  Check with
-"netstat -tlnp" where it is listening. If your connection is aborted
-immediately see if "mysqld: all" or similar is in /etc/hosts.allow and read
-hosts_access(5).
-
-* WHERE IS THE DOCUMENTATION?:
-==============================
-Unfortunately due to licensing restrictions, debian currently not able
-to provide the mysql-doc package in any format.  For the most up to date
-documentation, please go to http://dev.mysql.com/doc.
-
-* PASSWORDS:
-============
-It is strongly recommended to set a password for the mysql root user (which
-  /usr/bin/mysql -u root -D mysql -e "update user set password=password('new-password') where user='root'"
-  /usr/bin/mysql -u root -e "flush privileges"
-If you already had a password set add "-p" before "-u" to the lines above.
-
-
-If you are tired to type the password in every time or want to automate your
-scripts you can store it in the file $HOME/.my.cnf. It should be chmod 0600
-(-rw------- username username .my.cnf) to ensure that nobody else can read
-it.  Every other configuration parameter can be stored there, too. You will
-find an example below and more information in the MySQL manual in
-/usr/share/doc/mysql-doc or www.mysql.com.
-
-ATTENTION: It is necessary, that a .my.cnf from root always contains a "user"
-line wherever there is a "password" line, else, the Debian maintenance
-scripts, that use /etc/mysql/debian.cnf, will use the username
-"debian-sys-maint" but the password that is in root's .my.cnf. Also note,
-that every change you make in the /root/.my.cnf will affect the mysql cron
-script, too.
-
-        # an example of $HOME/.my.cnf
-	[client]
-	user		= your-mysql-username
-	password	= enter-your-good-new-password-here
-
-* BIG_ROWS FOR EVEN MORE ROWS IN A TABLE:
-=========================================
-If you ever run out of rows in a table there is the possibility of building
-the package with "-DBIG_ROWS" which, according to a MySQL employee on
-packagers at lists.mysql.com should lead to a 64bit row index (I guess > 2^32
-rows) but also to an approx. 5% performance loss.
-
-* BerkeleyDB Storage Engine
-===========================
-Support for BerkeleyDB has been removed in 5.1, and consequently both the
-have-bdb and skip-bdb configuration options will cause the server to fail. 
-Removing the options from /etc/mysql/my.cnf will fix this problem.
-
-* FURTHER NOTES ON REPLICATION
-===============================
-If the MySQL server is acting as a replication slave, you should not
-set --tmpdir to point to a directory on a memory-based filesystem or to
-a directory that is cleared when the server host restarts. A replication
-slave needs some of its temporary files to survive a machine restart so
-that it can replicate temporary tables or LOAD DATA INFILE operations. If
-files in the temporary file directory are lost when the server restarts,
-replication fails.

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.config
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.config	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.config	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
-${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
-
-CNF=/etc/mysql/my.cnf
-
-# Beware that there are two ypwhich one of them needs the 2>/dev/null!
-if test -n "`which ypwhich 2>/dev/null`"  &&  ypwhich >/dev/null 2>&1; then
-  db_input high mysql-server-5.5/nis_warning || true
-  db_go
-fi
-
-# only ask this question on fresh installs, during "reconfiguration" and when 
-# not upgrading from an existing 5.0 installation.
-# there is also an additional check for empty root passwords in the
-# postinst script when the tools are available for us to use.
-if [ "$1" = "configure" ] && ([ -z "$2" ] && [ ! -e "/var/lib/mysql/debian-5.0.flag" ] ) || [ "$1" = "reconfigure" ]; then
-  while :; do
-    RET=""
-    db_input high mysql-server/root_password || true
-    db_go
-    db_get mysql-server/root_password
-    # if password isn't empty we ask for password verification
-    if [ -z "$RET" ]; then
-      db_fset mysql-server/root_password seen false
-      db_fset mysql-server/root_password_again seen false
-      break
-    fi
-    ROOT_PW="$RET"
-    db_input high mysql-server/root_password_again || true
-    db_go
-    db_get mysql-server/root_password_again
-    if [ "$RET" == "$ROOT_PW" ]; then
-      ROOT_PW=''
-      break
-    fi
-    db_fset mysql-server/password_mismatch seen false
-    db_input critical mysql-server/password_mismatch
-    db_set mysql-server/root_password "" 
-    db_set mysql-server/root_password_again ""
-    db_go
-  done
-fi

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.dirs
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.dirs	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.dirs	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,6 +0,0 @@
-etc/init.d
-etc/logrotate.d
-etc/mysql/conf.d
-usr/bin
-usr/share/mysql
-var/lib/mysql-upgrade

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.examples
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.examples	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.examples	2013-01-15 13:30:06 UTC (rev 2209)
@@ -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

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.install
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.install	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -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

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.lintian-overrides
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.lintian-overrides	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.lintian-overrides	2013-01-15 13:30:06 UTC (rev 2209)
@@ -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

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.logcheck.ignore.paranoid
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.logcheck.ignore.paranoid	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.logcheck.ignore.paranoid	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,9 +0,0 @@
-/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
-/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
-mysqld\[[0-9]+\]: $
-mysqld\[[0-9]+\]: Version: .* socket: '/var/run/mysqld/mysqld.sock'  port: 3306$
-mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
-mysqld_safe\[[0-9]+\]: started$
-usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
-usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.logcheck.ignore.server
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.logcheck.ignore.server	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.logcheck.ignore.server	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,32 +0,0 @@
-/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
-/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
-mysqld\[[0-9]+\]: ?$
-mysqld\[[0-9]+\]: .*InnoDB: Shutdown completed
-mysqld\[[0-9]+\]: .*InnoDB: Started;
-mysqld\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$
-mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Normal shutdown$
-mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: ready for connections\.$
-mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Shutdown complete$
-mysqld\[[0-9]+\]: /usr/sbin/mysqld: ready for connections\.$
-mysqld\[[0-9]+\]: .*/usr/sbin/mysqld: Shutdown Complete$
-mysqld\[[0-9]+\]: Version: .* socket
-mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
-mysqld_safe\[[0-9]+\]: ?$
-mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
-mysqld_safe\[[0-9]+\]: ended$
-mysqld_safe\[[0-9]+\]: http://www.mysql.com$
-mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
-mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
-mysqld_safe\[[0-9]+\]: Please report any problems with the /usr/bin/mysqlbug script!$
-mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
-mysqld_safe\[[0-9]+\]: started$
-mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$
-mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$
-mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$
-mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$
-mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$
-mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$
-usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
-usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.logcheck.ignore.workstation
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.logcheck.ignore.workstation	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.logcheck.ignore.workstation	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,32 +0,0 @@
-/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
-/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
-mysqld\[[0-9]+\]: ?$
-mysqld\[[0-9]+\]: .*InnoDB: Shutdown completed
-mysqld\[[0-9]+\]: .*InnoDB: Started;
-mysqld\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$
-mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Normal shutdown$
-mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: ready for connections\.$
-mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Shutdown complete$
-mysqld\[[0-9]+\]: /usr/sbin/mysqld: ready for connections\.$
-mysqld\[[0-9]+\]: .*/usr/sbin/mysqld: Shutdown Complete$
-mysqld\[[0-9]+\]: Version: .* socket
-mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
-mysqld_safe\[[0-9]+\]: ?$
-mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
-mysqld_safe\[[0-9]+\]: ended$
-mysqld_safe\[[0-9]+\]: http://www.mysql.com$
-mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
-mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
-mysqld_safe\[[0-9]+\]: Please report any problems with the /usr/bin/mysqlbug script!$
-mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
-mysqld_safe\[[0-9]+\]: started$
-mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$
-mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$
-mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$
-mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$
-mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$
-mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$
-usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
-usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.manpages
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.manpages	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.manpages	2013-01-15 13:30:06 UTC (rev 2209)
@@ -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

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.mysql-server.logrotate
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.mysql-server.logrotate	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.mysql-server.logrotate	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,27 +0,0 @@
-# - I put everything in one block and added sharedscripts, so that mysql gets 
-#   flush-logs'd only once.
-#   Else the binary logs would automatically increase by n times every day.
-# - The error log is obsolete, messages go to syslog now.
-/var/log/mysql.log /var/log/mysql/*log {
-	daily
-	rotate 7
-	missingok
-	create 640 mysql adm
-	compress
-	sharedscripts
-	postrotate
-		test -x /usr/bin/mysqladmin || exit 0
-		# If this fails, check debian.conf! 
-		MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
-		if [ -z "`$MYADMIN ping 2>/dev/null`" ]; then
-		  # Really no mysqld or rather a missing debian-sys-maint user?
-		  # If this occurs and is not a error please report a bug.
-		  #if ps cax | grep -q mysqld; then
-		  if killall -q -s0 -umysql mysqld; then
- 		    exit 1
-		  fi 
-		else
-		  $MYADMIN flush-logs
-		fi
-	endscript
-}

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.mysql.init
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.mysql.init	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.mysql.init	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,187 +0,0 @@
-#!/bin/bash
-#
-### BEGIN INIT INFO
-# Provides:          mysql
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Should-Start:      $network $time
-# Should-Stop:       $network $time
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start and stop the mysql database server daemon
-# Description:       Controls the main MySQL database server daemon "mysqld"
-#                    and its wrapper script "mysqld_safe".
-### END INIT INFO
-#
-set -e
-set -u
-${DEBIAN_SCRIPT_DEBUG:+ set -v -x}
-
-test -x /usr/bin/mysqld_safe || exit 0
-
-. /lib/lsb/init-functions
-
-SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
-CONF=/etc/mysql/my.cnf
-MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
-
-# priority can be overriden and "-s" adds output to stderr
-ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i"
-
-# Safeguard (relative paths, core dumps..)
-cd /
-umask 077
-
-# mysqladmin likes to read /root/.my.cnf. This is usually not what I want
-# as many admins e.g. only store a password without a username there and
-# so break my scripts.
-export HOME=/etc/mysql/
-
-## Fetch a particular option from mysql's invocation.
-#
-# Usage: void mysqld_get_param option
-mysqld_get_param() {
-	/usr/sbin/mysqld --print-defaults \
-		| tr " " "\n" \
-		| grep -- "--$1" \
-		| tail -n 1 \
-		| cut -d= -f2
-}
-
-## Do some sanity checks before even trying to start mysqld.
-sanity_checks() {
-  # check for config file
-  if [ ! -r /etc/mysql/my.cnf ]; then
-    log_warning_msg "$0: WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz"
-    echo                "WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" | $ERR_LOGGER
-  fi
-
-  # check for diskspace shortage
-  datadir=`mysqld_get_param datadir`
-  if LC_ALL=C BLOCKSIZE= df --portability $datadir/. | tail -n 1 | awk '{ exit ($4>4096) }'; then
-    log_failure_msg "$0: ERROR: The partition with $datadir is too full!"
-    echo                "ERROR: The partition with $datadir is too full!" | $ERR_LOGGER
-    exit 1
-  fi
-}
-
-## Checks if there is a server running and if so if it is accessible.
-#
-# check_alive insists on a pingable server
-# check_dead also fails if there is a lost mysqld in the process list
-#
-# Usage: boolean mysqld_status [check_alive|check_dead] [warn|nowarn]
-mysqld_status () {
-    ping_output=`$MYADMIN ping 2>&1`; ping_alive=$(( ! $? ))
-
-    ps_alive=0
-    pidfile=`mysqld_get_param pid-file`
-    if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi
-    
-    if [ "$1" = "check_alive"  -a  $ping_alive = 1 ] ||
-       [ "$1" = "check_dead"   -a  $ping_alive = 0  -a  $ps_alive = 0 ]; then
-	return 0 # EXIT_SUCCESS
-    else
-  	if [ "$2" = "warn" ]; then
-  	    echo -e "$ps_alive processes alive and '$MYADMIN ping' resulted in\n$ping_output\n" | $ERR_LOGGER -p daemon.debug
-	fi
-  	return 1 # EXIT_FAILURE
-    fi
-}
-
-#
-# main()
-#
-
-case "${1:-''}" in
-  'start')
-	sanity_checks;
-	# Start daemon
-	log_daemon_msg "Starting MySQL database server" "mysqld"
-	if mysqld_status check_alive nowarn; then
-	   log_progress_msg "already running"
-	   log_end_msg 0
-	else
-	    # Could be removed during boot
-	    test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld
-
-	    # Start MySQL! 
-  	    su - mysql -s /bin/sh -c "/usr/bin/mysqld_safe > /dev/null 2>&1 &"
-
-	    # 6s was reported in #352070 to be too few when using ndbcluster
-	    for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do
-                sleep 1
-	        if mysqld_status check_alive nowarn ; then break; fi
-		log_progress_msg "."
-	    done
-	    if mysqld_status check_alive warn; then
-                log_end_msg 0
-	        # Now start mysqlcheck or whatever the admin wants.
-	        output=$(/etc/mysql/debian-start)
-		[ -n "$output" ] && log_action_msg "$output"
-	    else
-	        log_end_msg 1
-		log_failure_msg "Please take a look at the syslog"
-	    fi
-	fi
-	;;
-
-  'stop')
-	# * As a passwordless mysqladmin (e.g. via ~/.my.cnf) must be possible
-	# at least for cron, we can rely on it here, too. (although we have 
-	# to specify it explicit as e.g. sudo environments points to the normal
-	# users home and not /root)
-	log_daemon_msg "Stopping MySQL database server" "mysqld"
-	if ! mysqld_status check_dead nowarn; then
-	  set +e
-	  shutdown_out=`$MYADMIN shutdown 2>&1`; r=$?
-	  set -e
-	  if [ "$r" -ne 0 ]; then
-	    log_end_msg 1
-	    [ "$VERBOSE" != "no" ] && log_failure_msg "Error: $shutdown_out"
-	    log_daemon_msg "Killing MySQL database server by signal" "mysqld"
-	    killall -15 mysqld
-            server_down=
-	    for i in 1 2 3 4 5 6 7 8 9 10; do
-              sleep 1
-              if mysqld_status check_dead nowarn; then server_down=1; break; fi
-            done
-          if test -z "$server_down"; then killall -9 mysqld; fi
-	  fi
-        fi
-
-        if ! mysqld_status check_dead warn; then
-	  log_end_msg 1
-	  log_failure_msg "Please stop MySQL manually and read /usr/share/doc/mysql-server-5.5/README.Debian.gz!"
-	  exit -1
-	else
-	  log_end_msg 0
-        fi
-	;;
-
-  'restart')
-	set +e; $SELF stop; set -e
-	$SELF start 
-	;;
-
-  'reload'|'force-reload')
-  	log_daemon_msg "Reloading MySQL database server" "mysqld"
-	$MYADMIN reload
-	log_end_msg 0
-	;;
-
-  'status')
-	if mysqld_status check_alive nowarn; then
-	  log_action_msg "$($MYADMIN version)"
-	else
-	  log_action_msg "MySQL is stopped."
-	  exit 3
-	fi
-  	;;
-
-  *)
-	echo "Usage: $SELF start|stop|restart|reload|force-reload|status"
-	exit 1
-	;;
-esac
-

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.postinst
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.postinst	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.postinst	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,282 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
-${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
- 
-export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
-
-# This command can be used as pipe to syslog. With "-s" it also logs to stderr.
-ERR_LOGGER="logger -p daemon.err -t mysqld_safe -i"
-
-invoke() {
-  if [ -x /usr/sbin/invoke-rc.d ]; then
-    invoke-rc.d mysql $1
-  else
-    /etc/init.d/mysql $1
-  fi
-}
-
-MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables"
-
-test_mysql_access() {
-       mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1
-}
-
-# call with $1 = "online" to connect to the server, otherwise it bootstraps
-set_mysql_rootpw() {
-       # forget we ever saw the password.  don't use reset to keep the seen status
-       db_set mysql-server/root_password ""
-       db_set mysql-server/root_password_again ""
-
-       tfile=`mktemp`
-       if [ ! -f "$tfile" ]; then
-               return 1
-       fi
-
-       # this avoids us having to call "test" or "[" on $rootpw
-       cat << EOF > $tfile
-USE mysql;
-UPDATE user SET password=PASSWORD("$rootpw") WHERE user='root';
-FLUSH PRIVILEGES;
-EOF
-       if grep -q 'PASSWORD("")' $tfile; then
-               retval=0
-       elif [ "$1" = "online" ]; then
-               mysql --no-defaults -u root -h localhost <$tfile >/dev/null
-               retval=$?
-       else
-               $MYSQL_BOOTSTRAP <$tfile
-               retval=$?
-       fi
-       rm -f $tfile
-       return $retval
-}
-
-# This is necessary because mysql_install_db removes the pid file in /var/run
-# and because changed configuration options should take effect immediately.
-# In case the server wasn't running at all it should be ok if the stop
-# script fails. I can't tell at this point because of the cleaned /var/run.
-set +e; invoke stop; set -e
-    
-case "$1" in
-  configure)
-    mysql_datadir=/usr/share/mysql
-    mysql_statedir=/var/lib/mysql
-    mysql_rundir=/var/run/mysqld
-    mysql_logdir=/var/log
-    mysql_cfgdir=/etc/mysql
-    mysql_newlogdir=/var/log/mysql
-    mysql_upgradedir=/var/lib/mysql-upgrade
-
-    # first things first, if the following symlink exists, it is a preserved
-    # copy the old data dir from a mysql upgrade that would have otherwise
-    # been replaced by an empty mysql dir.  this should restore it.
-    for dir in DATADIR LOGDIR; do
-        if [ "$dir" = "DATADIR" ]; then targetdir=$mysql_statedir; else targetdir=$mysql_newlogdir; fi
-        savelink="$mysql_upgradedir/$dir.link"
-        if [ -L "$savelink" ]; then
-            # If the targetdir was a symlink before we upgraded it is supposed
-            # to be either still be present or not existing anymore now.
-            if [ -L "$targetdir" ]; then
-                rm "$savelink"
-            elif [ ! -d "$targetdir" ]; then
-                mv "$savelink" "$targetdir"
-            else
-                # this should never even happen, but just in case...
-                mysql_tmp=`mktemp -d -t mysql-symlink-restore-XXXXXX`
-                echo "this is very strange!  see $mysql_tmp/README..." >&2
-                mv "$targetdir" "$mysql_tmp"
-                cat << EOF > "$mysql_tmp/README"
-
-if you're reading this, it's most likely because you had replaced /var/lib/mysql
-with a symlink, then upgraded to a new version of mysql, and then dpkg
-removed your symlink (see #182747 and others).  the mysql packages noticed
-that this happened, and as a workaround have restored it.  however, because
-/var/lib/mysql seems to have been re-created in the meantime, and because
-we don't want to rm -rf something we don't know as much about, we're going
-to leave this unexpected directory here.  if your database looks normal,
-and this is not a symlink to your database, you should be able to blow
-this all away.
-
-EOF
-            fi
-        fi
-	rmdir $mysql_upgradedir 2>/dev/null || true
-    done
-    
-    # Ensure the existence and right permissions for the database and
-    # log files.
-    if [ ! -d "$mysql_statedir"       -a ! -L "$mysql_statedir"       ]; then mkdir "$mysql_statedir"; fi
-    if [ ! -d "$mysql_statedir/mysql" -a ! -L "$mysql_statedir/mysql" ]; then mkdir "$mysql_statedir/mysql"; fi
-    if [ ! -d "$mysql_newlogdir"      -a ! -L "$mysql_newlogdir"      ]; then mkdir "$mysql_newlogdir"; fi
-    # When creating an ext3 jounal on an already mounted filesystem like e.g.
-    # /var/lib/mysql, you get a .journal file that is not modifyable by chown.
-    # The mysql_datadir must not be writable by the mysql user under any
-    # circumstances as it contains scripts that are executed by root.
-    set +e
-    chown -R 0:0 $mysql_datadir
-    chown -R mysql $mysql_statedir
-    chmod 700 $mysql_statedir $mysql_statedir/mysql
-    if [ ! -d "$mysql_rundir" ]; then mkdir "$mysql_rundir"; fi
-    chown -R mysql $mysql_rundir
-    chown -R mysql:adm $mysql_newlogdir;	chmod 2750 $mysql_newlogdir;
-    for i in log err; do
-      touch             $mysql_logdir/mysql.$i
-      chown mysql:adm   $mysql_logdir/mysql.$i
-      chmod 0640        $mysql_logdir/mysql.$i
-    done
-    set -e
-
-    # This is important to avoid dataloss when there is a removed
-    # mysql-server version from Woody lying around which used the same
-    # data directory and then somewhen gets purged by the admin.
-    db_set mysql-server/postrm_remove_database false || true
-
-    # To avoid downgrades.
-    touch $mysql_statedir/debian-5.5.flag
-
-    # initiate databases. Output is not allowed by debconf :-(
-    # Debian: beware of the bashisms... 
-    # Debian: can safely run on upgrades with existing databases 
-    set +e
-    bash /usr/bin/mysql_install_db --rpm 2>&1 | $ERR_LOGGER
-    if [ "$?" != "0" ]; then
-      echo "ATTENTION: An error has occured. More info is in the syslog!"
-    fi
-    set -e
-    
-    ## On every reconfiguration the maintenance user is recreated.
-    #
-    # - It is easier to regenerate the password every time but as people
-    #   use fancy rsync scripts and file alteration monitors, the existing
-    #   password is used and existing files not touched.
-    # - The mysqld statement is like that in mysql_install_db because the
-    #   server is not already running. This has some implications:
-    # 	- The amount of newlines and semicolons in the query is important!
-    #   - GRANT is not possible with --skip-grant-tables and "INSERT
-    #     (user,host..) VALUES" is not --ansi compliant
-    # - The echo is just for readability. ash's buildin has no "-e" so use /bin/echo.
-    # - The Super_priv, Show_db_priv, Create_tmp_table_priv and Lock_tables_priv
-    #   may not be present as old Woody 3.23 databases did not have it and the
-    #   admin might not already have run mysql_upgrade which adds them.
-    #   As the binlog cron scripts to need at least the Super_priv, I do first
-    #   the old query which always succeeds and then the new which may or may not.
-
-    # recreate the credentials file if not present or without mysql_upgrade stanza
-    dc=$mysql_cfgdir/debian.cnf; 
-    if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then
-        pass="`sed -n 's/^[     ]*password *= *// p' $dc | head -n 1`"
-    else
-	pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`;
-        if [ ! -d "$mysql_cfgdir" ]; then install -o 0 -g 0 -m 0755 -d $mysql_cfgdir; fi
-        cat /dev/null > $dc
-        echo "# Automatically generated for Debian scripts. DO NOT TOUCH!" >>$dc
-        echo "[client]"                                                    >>$dc
-        echo "host     = localhost"                                        >>$dc
-        echo "user     = debian-sys-maint"                                 >>$dc
-        echo "password = $pass"                                            >>$dc
-        echo "socket   = $mysql_rundir/mysqld.sock"                        >>$dc
-        echo "[mysql_upgrade]"                                             >>$dc
-        echo "host     = localhost"                                        >>$dc
-        echo "user     = debian-sys-maint"                                 >>$dc
-        echo "password = $pass"                                            >>$dc
-        echo "socket   = $mysql_rundir/mysqld.sock"                        >>$dc
-        echo "basedir  = /usr"                                             >>$dc
-    fi
-    # If this dir chmod go+w then the admin did it. But this file should not.
-    chown 0:0 $dc
-    chmod 0600 $dc
-
-    # update privilege tables
-    password_column_fix_query=`echo -e \
-        "USE mysql\n" \
-        "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`;
-    replace_query=`echo -e \
-        "USE mysql\n" \
-        "REPLACE INTO user SET " \
-        "  host='localhost', user='debian-sys-maint', password=password('$pass'), " \
-        "  Select_priv='Y', Insert_priv='Y', Update_priv='Y', Delete_priv='Y', " \
-        "  Create_priv='Y', Drop_priv='Y', Reload_priv='Y', Shutdown_priv='Y', " \
-        "  Process_priv='Y',  File_priv='Y', Grant_priv='Y', References_priv='Y', " \
-        "  Index_priv='Y', Alter_priv='Y', Super_priv='Y', Show_db_priv='Y', "\
-        "  Create_tmp_table_priv='Y', Lock_tables_priv='Y', Execute_priv='Y', "\
-        "  Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\
-        "  Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\
-        "  Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y' "`;
-    fix_privs=`echo -e \
-        "USE mysql;\n" \
-        "ALTER TABLE user ADD column Create_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
-        "ALTER TABLE user ADD column Show_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
-        "ALTER TABLE user ADD column Create_routine_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
-        "ALTER TABLE user ADD column Alter_routine_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
-        "ALTER TABLE user ADD column Create_user_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
-        "ALTER TABLE user ADD column Event_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
-        "ALTER TABLE user ADD column Trigger_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " `
-    # Engines supported by etch should be installed per default. The query sequence is supposed
-    # to be aborted if the CREATE TABLE fails due to an already existent table in which case the
-    # admin might already have chosen to remove one or more plugins. Newlines are necessary.
-    install_plugins=`echo -e \
-        "USE mysql;\n" \
-        "CREATE TABLE plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \
-        "  dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \
-        "  PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';\n" \
-        "INSERT INTO plugin VALUES ('innodb',    'ha_innodb.so');\n" \
-        "INSERT INTO plugin VALUES ('federated', 'ha_federated.so');\n" \
-        "INSERT INTO plugin VALUES ('blackhole', 'ha_blackhole.so');\n" \
-        "INSERT INTO plugin VALUES ('archive',   'ha_archive.so');" `
-
-    # Upgrade password column format before the root password gets set.
-    echo "$password_column_fix_query"                        | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
-
-    db_get mysql-server/root_password && rootpw="$RET"
-    if ! set_mysql_rootpw; then
-        password_error="yes"
-    fi
-
-    echo "$fix_privs"                                        | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
-    echo "$replace_query"                                    | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
-    set +e
-    echo "$install_plugins"                                  | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
-    set -e
-  ;;
-
-  abort-upgrade|abort-remove|abort-configure)
-  ;;
-
-  *)
-    echo "postinst called with unknown argument '$1'" 1>&2
-    exit 1
-  ;;
-esac
-
-# here we check to see if we can connect as root without a password
-# this should catch upgrades from previous versions where the root
-# password wasn't set.  if there is a password, or if the connection
-# fails for any other reason, nothing happens.
-if [ "$1" = "configure" ]; then
-       if test_mysql_access; then
-               db_input medium mysql-server/root_password || true
-               db_go
-               db_get mysql-server/root_password && rootpw="$RET"
-
-               if ! set_mysql_rootpw "online"; then
-                       password_error="yes"
-               fi
-       fi
-
-       if [ "$password_error" = "yes" ]; then
-               db_input high mysql-server/error_setting_password || true
-               db_go
-       fi
-
-fi
-
-db_stop # in case invoke failes
-
-#DEBHELPER#
-
-exit 0

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.postrm
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.postrm	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.postrm	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# It is possible that Debconf has already been removed, too.
-if [ -f /usr/share/debconf/confmodule ]; then
-  . /usr/share/debconf/confmodule
-fi
-
-if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
-${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
-
-MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
-
-# Try to stop the server in a sane way. If it does not success let the admin
-# do it himself. No database directories should be removed while the server
-# is running!
-stop_server() {
-  set +e
-  if [ -x /usr/sbin/invoke-rc.d ]; then
-    invoke-rc.d mysql stop
-  else
-    /etc/init.d/mysql stop
-  fi
-  errno=$?
-  set -e
-
-  if [ "$?" != 0 ]; then
-    echo "Trying to stop the MySQL server resulted in exitcode $?." 1>&2
-    echo "Stop it yourself and try again!" 1>&2
-    exit 1
-  fi
-}
-
-case "$1" in
-  purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    if [ -n "`$MYADMIN ping 2>/dev/null`" ]; then
-      stop_server
-      sleep 2
-    fi
-  ;;
-  *)
-    echo "postrm called with unknown argument '$1'" 1>&2
-    exit 1
-  ;;
-esac
-
-#
-# - Do NOT purge logs or data if another mysql-sever* package is installed (#307473)
-# - Remove the mysql user only after all his owned files are purged.
-#   
-if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; then
-  # we remove the mysql user only after all his owned files are purged
-  rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz}
-  rm -rf /var/log/mysql
-
-  db_input high mysql-server-5.5/postrm_remove_databases || true
-  db_go || true
-  db_get mysql-server-5.5/postrm_remove_databases || true
-  if [ "$RET" = "true" ]; then
-    # never remove the debian.cnf when the databases are still existing
-    # else we ran into big trouble on the next install!
-    rm -f /etc/mysql/debian.cnf
-    rm -rf /var/lib/mysql
-    rm -rf /var/run/mysqld
-    userdel mysql || true
-  fi
-
-  # (normally) Automatically added by dh_installinit
-  if [ "$1" = "purge" ] ; then
-        update-rc.d mysql remove >/dev/null || exit 0
-  fi
-  # (normally) End automatically added section
-fi
-
-# (normally) Automatically added by dh_installdebconf
-if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
-        . /usr/share/debconf/confmodule
-        db_purge
-fi
-# (normally) End automatically added section
-
-# no DEBHELPER here, "update-rc.d remove" fails if mysql-server-5.5 is installed
-
-exit 0

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.preinst
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.preinst	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.preinst	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,185 +0,0 @@
-#!/bin/bash
-#
-# summary of how this script can be called:
-#        * <new-preinst> install
-#        * <new-preinst> install <old-version>
-#        * <new-preinst> upgrade <old-version>
-#        * <old-preinst> abort-upgrade <new-version>
-#
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
-${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
-
-export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
-MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
-DATADIR=/var/lib/mysql
-LOGDIR=/var/log/mysql
-UPGRADEDIR=/var/lib/mysql-upgrade
-
-# Try to stop the server in a sane way. If it does not success let the admin
-# do it himself. No database directories should be removed while the server
-# is running! Another mysqld in e.g. a different chroot is fine for us.
-stop_server() {
-    if [ ! -x /etc/init.d/mysql ]; then return; fi
-
-    set +e
-    if [ -x /usr/sbin/invoke-rc.d ]; then
-      cmd="invoke-rc.d mysql stop"
-    else
-      cmd="/etc/init.d/mysql stop"
-    fi
-    $cmd
-    errno=$?
-    set -e
-   
-    # 0=ok, 100=no init script (fresh install)
-    if [ "$errno" != 0 -a "$errno" != 100 ]; then
-      echo "${cmd/ */} returned $errno" 1>&2
-      echo "There is a MySQL server running, but we failed in our attempts to stop it." 1>&2
-      echo "Stop it yourself and try again!" 1>&2
-      db_stop  	
-      exit 1
-    fi
-}
-
-################################ main() ##########################
-
-this_version=5.5
-
-# Abort if an NDB cluster is in use.
-if egrep -qi -r '^[^#]*ndb.connectstring|^[[:space:]]*\[[[:space:]]*ndb_mgmd' /etc/mysql/; then
-  db_fset mysql-server/no_upgrade_when_using_ndb seen false || true
-  db_input high mysql-server/no_upgrade_when_using_ndb || true
-  db_go
-  db_stop
-  exit 1
-fi
-
-# Abort if skip-bdb option is enabled, required for 5.0 -> 5.1 upgrades.
-#TODO
-
-# Safe the user from stupidities.
-show_downgrade_warning=0
-for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do
-  found_version=`echo $i | sed 's/.*debian-\([0-9\.]\+\).flag/\1/'`
-  if dpkg --compare-versions "$this_version" '<<' "$found_version"; then
-    show_downgrade_warning=1
-    break;
-  fi
-done
-if [ "$show_downgrade_warning" = 1 ]; then
-  db_fset mysql-server-$this_version/really_downgrade seen false || true
-  db_input medium mysql-server-$this_version/really_downgrade || true
-  db_go
-  db_get mysql-server-$this_version/really_downgrade || true
-  if [ "$RET" = "true" ]; then
-    rm -f $DATADIR/debian-*.flag
-    touch $DATADIR/debian-$this_version.flag
-  else
-    echo "Aborting downgrade from (at least) $found_version to $this_version." 1>&2
-    echo "If are sure you want to downgrade to $this_version, remove the file" 1>&2
-    echo "$DATADIR/debian-*.flag and try installing again." 1>&2
-    db_stop
-    exit 1
-  fi
-fi
-
-# to be sure
-stop_server
-
-# If we use NIS then errors should be tolerated. It's up to the
-# user to ensure that the mysql user is correctly setup.
-# Beware that there are two ypwhich one of them needs the 2>/dev/null!
-if test -n "`which ypwhich 2>/dev/null`"  &&  ypwhich >/dev/null 2>&1; then
-  set +e
-fi
-
-#
-# Now we have to ensure the following state:
-# /etc/passwd: mysql:x:100:101:MySQL Server:/nonexistent:/bin/false
-# /etc/group:  mysql:x:101:
-# 
-# Sadly there could any state be present on the system so we have to
-# modify everything carefully i.e. not doing a chown before creating
-# the user etc...
-#
-
-# creating mysql group if he isn't already there
-if ! getent group mysql >/dev/null; then
- 	# Adding system group: mysql.
-	addgroup --system mysql >/dev/null
-fi
-
-# creating mysql user if he isn't already there
-if ! getent passwd mysql >/dev/null; then
-	# Adding system user: mysql.
-	adduser \
-	  --system \
-          --disabled-login \
-	  --ingroup mysql \
-	  --no-create-home \
-	  --home /nonexistent \
-	  --gecos "MySQL Server" \
-	  --shell /bin/false \
-	  mysql  >/dev/null
-fi
-
-# end of NIS tolerance zone
-set -e
-
-# if there's a symlink, let's store where it's pointing, because otherwise
-# it's going to be lost in some situations
-for dir in DATADIR LOGDIR; do
-    checkdir=`eval echo "$"$dir`
-    if [ -L "$checkdir" ]; then
-	mkdir -p "$UPGRADEDIR"
-	cp -d "$checkdir" "$UPGRADEDIR/$dir.link"
-    fi
-done
-
-# creating mysql home directory
-if [ ! -d $DATADIR -a ! -L $DATADIR ]; then
- 	mkdir $DATADIR
-fi
-
-# checking disc space
-if LC_ALL=C BLOCKSIZE= df --portability $DATADIR/. | tail -n 1 | awk '{ exit ($4>1000) }'; then
-  echo "ERROR: There's not enough space in $DATADIR/" 1>&2
-  db_stop
-  exit 1
-fi
-
-# Since the home directory was created before putting the user into
-# the mysql group and moreover we cannot guarantee that the 
-# permissions were correctly *before* calling this script, we fix them now.
-# In case we use NIS and no mysql user is present then this script should
-# better fail now than later..
-# The "set +e" is necessary as e.g. a ".journal" of a ext3 partition is
-# not chgrp'able (#318435).
-set +e
-chown mysql:mysql $DATADIR
-find $DATADIR -follow -not -group mysql -print0 2>/dev/null \
-  | xargs -0 --no-run-if-empty chgrp mysql
-set -e
-
-# Some files below /etc/ were possibly in the mysql-server-5.0/etch package
-# before. They get overwritten by current ones to avoid unnecessary dpkg questions.
-while read md5 file; do
-  if [ "`md5sum $file 2>/dev/null`" = "$md5  $file" ]; then
-    cp /usr/share/mysql-common/internal-use-only/`echo $file | sed 's°/°_°g'` $file
-  fi
-done <<EOT
-6691f2fdc5c6d27ff0260eb79813e1bc  /etc/init.d/mysql
-b53b9552d44661361d39157c3c7c51d3  /etc/logrotate.d/mysql-server
-57f3e58f72582ca55100dc1ba0f1a8ae  /etc/mysql/debian-start
-EOT
-
-db_stop
-
-#DEBHELPER#
-
-exit 0

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.prerm
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.prerm	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.prerm	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
-${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
-
-#DEBHELPER#

Deleted: mysql-5.6/trunk/debian/mysql-server-5.5.templates
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-5.5.templates	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-5.5.templates	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,89 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# for an advice to debian-l10n-english at lists.debian.org
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: mysql-server-5.5/really_downgrade
-Type: boolean
-Default: false
-_Description: Really proceed with downgrade?
- A file named /var/lib/mysql/debian-*.flag exists on this system.
- .
- Such a file is an indication that a mysql-server package with a higher
- version has been installed previously.
- .
- There is no guarantee that the version you're currently installing
- will be able to use the current databases.
-
-Template: mysql-server-5.5/nis_warning
-Type: note
-#flag:translate!:3,5
-_Description: Important note for NIS/YP users
- Using MySQL under NIS/YP requires a mysql user account to be added on
- the local system with:
- .
-  adduser --system --group --home /var/lib/mysql mysql
- .
- You should also check the permissions and ownership of the
- /var/lib/mysql directory:
- .
-  /var/lib/mysql: drwxr-xr-x   mysql    mysql
-
-Template: mysql-server-5.5/postrm_remove_databases
-Type: boolean
-Default: false
-_Description: Remove all MySQL databases?
- The /var/lib/mysql directory which contains the MySQL databases is about
- to be removed.
- .
- 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 should be kept.
-
-Template: mysql-server-5.5/start_on_boot
-Type: boolean
-Default: true
-_Description: Start the MySQL server on boot?
- The MySQL server can be launched automatically at boot time or manually
- with the '/etc/init.d/mysql start' command.
-
-Template: mysql-server/root_password
-Type: password
-_Description: New password for the MySQL "root" user:
- While not mandatory, it is highly recommended that you set a password
- for the MySQL administrative "root" user.
- .
- If this field is left blank, the password will not be changed.
-
-Template: mysql-server/root_password_again
-Type: password
-_Description: Repeat password for the MySQL "root" user:
-
-Template: mysql-server/error_setting_password
-Type: error
-_Description: Unable to set password for the MySQL "root" user
- An error occurred while setting the password for the MySQL
- administrative user. This may have happened because the account
- already has a password, or because of a communication problem with
- the MySQL server.
- .
- You should check the account's password after the package installation.
- .
- Please read the /usr/share/doc/mysql-server-5.5/README.Debian file
- for more information.
-
-Template: mysql-server/password_mismatch
-Type: error
-_Description: Password input error
- The two passwords you entered were not the same. Please try again.
-
-Template: mysql-server/no_upgrade_when_using_ndb
-Type: error
-_Description: NDB Cluster seems to be in use
- 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/.

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.NEWS (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.NEWS)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.NEWS	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.NEWS	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,34 @@
+mysql-dfsg-5.1 (5.1.36-1) unstable; urgency=low
+
+  * Please read http://dev.mysql.com/doc/refman/5.1/en/upgrading-from-5-0.html
+  * Make sure to do a REPAIR TABLE on all tables that use UTF-8 and have a
+    FULLTEXT index.
+
+ -- Christian Hammers <ch at debian.org>  Sat,  4 Jul 2009 02:31:21 +0200
+
+mysql-dfsg-5.0 (5.1.14beta-2) unstable; urgency=low
+
+  * The BerkeleyDB Storage Engine is no longer supported. If the options
+    have-bdb or skip-bdb are found, MySQL will not start. If you have BDB
+    tables, you should change them to use another storage engine before 
+    upgrading to 5.1.   
+
+ -- Monty Taylor <mordred at inaugust.com>  Thu, 18 Jan 2007 12:28:21 -0800
+
+mysql-dfsg-5.0 (5.0.45-2) unstable; urgency=low
+
+  * Binary logging is now disabled by default. If you really need it (e.g. on
+    a replication master), remove the comment from the log_bin line in my.cnf.
+
+ -- Norbert Tretkowski <norbert at tretkowski.de>  Sat, 10 Nov 2007 16:26:35 +0100
+
+mysql-dfsg-5.0 (5.0.18-9) unstable; urgency=low
+
+  * Rotation of the binary logs is now configured in /etc/mysql/my.cnf with
+    "expire-logs-days" which defaults to 20 days. The old file
+    /etc/mysql/debian-log-rotate.conf should be removed together with
+    /etc/cron.daily/mysql-server after this value has been adjusted. Note that
+    the old variable defined the number of files whereas the new one defines 
+    a time span in days.
+
+ -- Christian Hammers <ch at debian.org>  Tue, 24 Jan 2006 22:18:21 +0100

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.README.Debian (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.README.Debian)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.README.Debian	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.README.Debian	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,109 @@
+* MYSQL WON'T START OR STOP?:
+=============================
+You may never ever delete the special mysql user "debian-sys-maint". This
+user together with the credentials in /etc/mysql/debian.cnf are used by the
+init scripts to stop the server as they would require knowledge of the mysql
+root users password else.
+So in most of the times you can fix the situation by making sure that the
+debian.cnf file contains the right password, e.g. by setting a new one
+(remember to do a "flush privileges" then).
+
+* WHAT TO DO AFTER UPGRADES:
+============================
+The privilege tables are automatically updated so all there is left is read
+the changelogs on dev.mysql.com to see if any changes affect custom apps.
+
+* WHAT TO DO AFTER INSTALLATION:
+================================
+The MySQL manual describes certain steps to do at this stage in a separate
+chapter.  They are not necessary as the Debian packages does them
+automatically.
+
+The only thing that is left over for the admin is 
+ - setting the passwords
+ - creating new users and databases
+ - read the rest of this text
+
+* DOWNGRADING TO 4.0 or 4.1:
+============================
+Unsupported. Period.
+But if you do and get problems or make interesting experiences, mail me, it
+might help others.
+Ok, if you really want, I would recommend to "mysqldump --opt" all tables,
+then purge 4.1, delete /var/lib/mysql, install 4.0 and insert the dumps.  Be
+carefully, though, with the "mysql" table, you might not simply overwrite that
+one as the password for the mysql "debian-sys-maint" user is stored in
+/etc/mysql/debian.cnf and needed by /etc/init.d/ to start mysql and check if
+it's alive. 
+
+* SOME APPLICATION CAN NO LONGER CONNECT:
+=========================================
+This application is probably linked against libmysqlclient12 or below and
+somebody has created a mysql user with new-style passwords.
+The old_passwords=1 option in /etc/mysql/my.cnf might help. If not the
+application that inserted the user has to be changed or the application that
+tries to connect updated to libmysqlclient14 or -15.
+
+* NETWORKING:
+=============
+For security reasons, the Debian package has enabled networking only on the
+loop-back device using "bind-address" in /etc/mysql/my.cnf.  Check with
+"netstat -tlnp" where it is listening. If your connection is aborted
+immediately see if "mysqld: all" or similar is in /etc/hosts.allow and read
+hosts_access(5).
+
+* WHERE IS THE DOCUMENTATION?:
+==============================
+Unfortunately due to licensing restrictions, debian currently not able
+to provide the mysql-doc package in any format.  For the most up to date
+documentation, please go to http://dev.mysql.com/doc.
+
+* PASSWORDS:
+============
+It is strongly recommended to set a password for the mysql root user (which
+  /usr/bin/mysql -u root -D mysql -e "update user set password=password('new-password') where user='root'"
+  /usr/bin/mysql -u root -e "flush privileges"
+If you already had a password set add "-p" before "-u" to the lines above.
+
+
+If you are tired to type the password in every time or want to automate your
+scripts you can store it in the file $HOME/.my.cnf. It should be chmod 0600
+(-rw------- username username .my.cnf) to ensure that nobody else can read
+it.  Every other configuration parameter can be stored there, too. You will
+find an example below and more information in the MySQL manual in
+/usr/share/doc/mysql-doc or www.mysql.com.
+
+ATTENTION: It is necessary, that a .my.cnf from root always contains a "user"
+line wherever there is a "password" line, else, the Debian maintenance
+scripts, that use /etc/mysql/debian.cnf, will use the username
+"debian-sys-maint" but the password that is in root's .my.cnf. Also note,
+that every change you make in the /root/.my.cnf will affect the mysql cron
+script, too.
+
+        # an example of $HOME/.my.cnf
+	[client]
+	user		= your-mysql-username
+	password	= enter-your-good-new-password-here
+
+* BIG_ROWS FOR EVEN MORE ROWS IN A TABLE:
+=========================================
+If you ever run out of rows in a table there is the possibility of building
+the package with "-DBIG_ROWS" which, according to a MySQL employee on
+packagers at lists.mysql.com should lead to a 64bit row index (I guess > 2^32
+rows) but also to an approx. 5% performance loss.
+
+* BerkeleyDB Storage Engine
+===========================
+Support for BerkeleyDB has been removed in 5.1, and consequently both the
+have-bdb and skip-bdb configuration options will cause the server to fail. 
+Removing the options from /etc/mysql/my.cnf will fix this problem.
+
+* FURTHER NOTES ON REPLICATION
+===============================
+If the MySQL server is acting as a replication slave, you should not
+set --tmpdir to point to a directory on a memory-based filesystem or to
+a directory that is cleared when the server host restarts. A replication
+slave needs some of its temporary files to survive a machine restart so
+that it can replicate temporary tables or LOAD DATA INFILE operations. If
+files in the temporary file directory are lost when the server restarts,
+replication fails.

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.config (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.config)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.config	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.config	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
+${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
+
+CNF=/etc/mysql/my.cnf
+
+# Beware that there are two ypwhich one of them needs the 2>/dev/null!
+if test -n "`which ypwhich 2>/dev/null`"  &&  ypwhich >/dev/null 2>&1; then
+  db_input high mysql-server-5.6/nis_warning || true
+  db_go
+fi
+
+# only ask this question on fresh installs, during "reconfiguration" and when 
+# not upgrading from an existing 5.0 installation.
+# there is also an additional check for empty root passwords in the
+# postinst script when the tools are available for us to use.
+if [ "$1" = "configure" ] && ([ -z "$2" ] && [ ! -e "/var/lib/mysql/debian-5.0.flag" ] ) || [ "$1" = "reconfigure" ]; then
+  while :; do
+    RET=""
+    db_input high mysql-server/root_password || true
+    db_go
+    db_get mysql-server/root_password
+    # if password isn't empty we ask for password verification
+    if [ -z "$RET" ]; then
+      db_fset mysql-server/root_password seen false
+      db_fset mysql-server/root_password_again seen false
+      break
+    fi
+    ROOT_PW="$RET"
+    db_input high mysql-server/root_password_again || true
+    db_go
+    db_get mysql-server/root_password_again
+    if [ "$RET" == "$ROOT_PW" ]; then
+      ROOT_PW=''
+      break
+    fi
+    db_fset mysql-server/password_mismatch seen false
+    db_input critical mysql-server/password_mismatch
+    db_set mysql-server/root_password "" 
+    db_set mysql-server/root_password_again ""
+    db_go
+  done
+fi

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.dirs (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.dirs)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.dirs	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.dirs	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,6 @@
+etc/init.d
+etc/logrotate.d
+etc/mysql/conf.d
+usr/bin
+usr/share/mysql
+var/lib/mysql-upgrade

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.examples (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.examples)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.examples	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.examples	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/mysql/*cnf
+debian/tmp/usr/share/mysql/magic
+debian/tmp/usr/lib/mysql/plugin/daemon_example.ini

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.install (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.install)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.install	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,31 @@
+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.6/
+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

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.lintian-overrides (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.lintian-overrides)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.lintian-overrides	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.lintian-overrides	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,3 @@
+# These long lines reproduce actual output and to reformat them
+# would damage the integrity of the man page.
+mysql-server-5.6: 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

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.logcheck.ignore.paranoid (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.logcheck.ignore.paranoid)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.logcheck.ignore.paranoid	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.logcheck.ignore.paranoid	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,9 @@
+/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
+/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
+mysqld\[[0-9]+\]: $
+mysqld\[[0-9]+\]: Version: .* socket: '/var/run/mysqld/mysqld.sock'  port: 3306$
+mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
+mysqld_safe\[[0-9]+\]: started$
+usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
+usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.logcheck.ignore.server (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.logcheck.ignore.server)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.logcheck.ignore.server	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.logcheck.ignore.server	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,32 @@
+/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
+/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
+/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
+mysqld\[[0-9]+\]: ?$
+mysqld\[[0-9]+\]: .*InnoDB: Shutdown completed
+mysqld\[[0-9]+\]: .*InnoDB: Started;
+mysqld\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$
+mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Normal shutdown$
+mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: ready for connections\.$
+mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Shutdown complete$
+mysqld\[[0-9]+\]: /usr/sbin/mysqld: ready for connections\.$
+mysqld\[[0-9]+\]: .*/usr/sbin/mysqld: Shutdown Complete$
+mysqld\[[0-9]+\]: Version: .* socket
+mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
+mysqld_safe\[[0-9]+\]: ?$
+mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
+mysqld_safe\[[0-9]+\]: ended$
+mysqld_safe\[[0-9]+\]: http://www.mysql.com$
+mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
+mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
+mysqld_safe\[[0-9]+\]: Please report any problems with the /usr/bin/mysqlbug script!$
+mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
+mysqld_safe\[[0-9]+\]: started$
+mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$
+mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$
+mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$
+mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$
+mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$
+mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$
+usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
+usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.logcheck.ignore.workstation (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.logcheck.ignore.workstation)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.logcheck.ignore.workstation	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.logcheck.ignore.workstation	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,32 @@
+/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
+/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
+/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
+mysqld\[[0-9]+\]: ?$
+mysqld\[[0-9]+\]: .*InnoDB: Shutdown completed
+mysqld\[[0-9]+\]: .*InnoDB: Started;
+mysqld\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$
+mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Normal shutdown$
+mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: ready for connections\.$
+mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Shutdown complete$
+mysqld\[[0-9]+\]: /usr/sbin/mysqld: ready for connections\.$
+mysqld\[[0-9]+\]: .*/usr/sbin/mysqld: Shutdown Complete$
+mysqld\[[0-9]+\]: Version: .* socket
+mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
+mysqld_safe\[[0-9]+\]: ?$
+mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
+mysqld_safe\[[0-9]+\]: ended$
+mysqld_safe\[[0-9]+\]: http://www.mysql.com$
+mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
+mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
+mysqld_safe\[[0-9]+\]: Please report any problems with the /usr/bin/mysqlbug script!$
+mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
+mysqld_safe\[[0-9]+\]: started$
+mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$
+mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$
+mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$
+mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$
+mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$
+mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$
+usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
+usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.manpages (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.manpages)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.manpages	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.manpages	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,20 @@
+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

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.mysql-server.logrotate (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.mysql-server.logrotate)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.mysql-server.logrotate	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.mysql-server.logrotate	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,27 @@
+# - I put everything in one block and added sharedscripts, so that mysql gets 
+#   flush-logs'd only once.
+#   Else the binary logs would automatically increase by n times every day.
+# - The error log is obsolete, messages go to syslog now.
+/var/log/mysql.log /var/log/mysql/*log {
+	daily
+	rotate 7
+	missingok
+	create 640 mysql adm
+	compress
+	sharedscripts
+	postrotate
+		test -x /usr/bin/mysqladmin || exit 0
+		# If this fails, check debian.conf! 
+		MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
+		if [ -z "`$MYADMIN ping 2>/dev/null`" ]; then
+		  # Really no mysqld or rather a missing debian-sys-maint user?
+		  # If this occurs and is not a error please report a bug.
+		  #if ps cax | grep -q mysqld; then
+		  if killall -q -s0 -umysql mysqld; then
+ 		    exit 1
+		  fi 
+		else
+		  $MYADMIN flush-logs
+		fi
+	endscript
+}

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.mysql.init (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.mysql.init)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.mysql.init	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.mysql.init	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,187 @@
+#!/bin/bash
+#
+### BEGIN INIT INFO
+# Provides:          mysql
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Should-Start:      $network $time
+# Should-Stop:       $network $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start and stop the mysql database server daemon
+# Description:       Controls the main MySQL database server daemon "mysqld"
+#                    and its wrapper script "mysqld_safe".
+### END INIT INFO
+#
+set -e
+set -u
+${DEBIAN_SCRIPT_DEBUG:+ set -v -x}
+
+test -x /usr/bin/mysqld_safe || exit 0
+
+. /lib/lsb/init-functions
+
+SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
+CONF=/etc/mysql/my.cnf
+MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
+
+# priority can be overriden and "-s" adds output to stderr
+ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i"
+
+# Safeguard (relative paths, core dumps..)
+cd /
+umask 077
+
+# mysqladmin likes to read /root/.my.cnf. This is usually not what I want
+# as many admins e.g. only store a password without a username there and
+# so break my scripts.
+export HOME=/etc/mysql/
+
+## Fetch a particular option from mysql's invocation.
+#
+# Usage: void mysqld_get_param option
+mysqld_get_param() {
+	/usr/sbin/mysqld --print-defaults \
+		| tr " " "\n" \
+		| grep -- "--$1" \
+		| tail -n 1 \
+		| cut -d= -f2
+}
+
+## Do some sanity checks before even trying to start mysqld.
+sanity_checks() {
+  # check for config file
+  if [ ! -r /etc/mysql/my.cnf ]; then
+    log_warning_msg "$0: WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz"
+    echo                "WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" | $ERR_LOGGER
+  fi
+
+  # check for diskspace shortage
+  datadir=`mysqld_get_param datadir`
+  if LC_ALL=C BLOCKSIZE= df --portability $datadir/. | tail -n 1 | awk '{ exit ($4>4096) }'; then
+    log_failure_msg "$0: ERROR: The partition with $datadir is too full!"
+    echo                "ERROR: The partition with $datadir is too full!" | $ERR_LOGGER
+    exit 1
+  fi
+}
+
+## Checks if there is a server running and if so if it is accessible.
+#
+# check_alive insists on a pingable server
+# check_dead also fails if there is a lost mysqld in the process list
+#
+# Usage: boolean mysqld_status [check_alive|check_dead] [warn|nowarn]
+mysqld_status () {
+    ping_output=`$MYADMIN ping 2>&1`; ping_alive=$(( ! $? ))
+
+    ps_alive=0
+    pidfile=`mysqld_get_param pid-file`
+    if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi
+    
+    if [ "$1" = "check_alive"  -a  $ping_alive = 1 ] ||
+       [ "$1" = "check_dead"   -a  $ping_alive = 0  -a  $ps_alive = 0 ]; then
+	return 0 # EXIT_SUCCESS
+    else
+  	if [ "$2" = "warn" ]; then
+  	    echo -e "$ps_alive processes alive and '$MYADMIN ping' resulted in\n$ping_output\n" | $ERR_LOGGER -p daemon.debug
+	fi
+  	return 1 # EXIT_FAILURE
+    fi
+}
+
+#
+# main()
+#
+
+case "${1:-''}" in
+  'start')
+	sanity_checks;
+	# Start daemon
+	log_daemon_msg "Starting MySQL database server" "mysqld"
+	if mysqld_status check_alive nowarn; then
+	   log_progress_msg "already running"
+	   log_end_msg 0
+	else
+	    # Could be removed during boot
+	    test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld
+
+	    # Start MySQL! 
+  	    su - mysql -s /bin/sh -c "/usr/bin/mysqld_safe > /dev/null 2>&1 &"
+
+	    # 6s was reported in #352070 to be too few when using ndbcluster
+	    for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do
+                sleep 1
+	        if mysqld_status check_alive nowarn ; then break; fi
+		log_progress_msg "."
+	    done
+	    if mysqld_status check_alive warn; then
+                log_end_msg 0
+	        # Now start mysqlcheck or whatever the admin wants.
+	        output=$(/etc/mysql/debian-start)
+		[ -n "$output" ] && log_action_msg "$output"
+	    else
+	        log_end_msg 1
+		log_failure_msg "Please take a look at the syslog"
+	    fi
+	fi
+	;;
+
+  'stop')
+	# * As a passwordless mysqladmin (e.g. via ~/.my.cnf) must be possible
+	# at least for cron, we can rely on it here, too. (although we have 
+	# to specify it explicit as e.g. sudo environments points to the normal
+	# users home and not /root)
+	log_daemon_msg "Stopping MySQL database server" "mysqld"
+	if ! mysqld_status check_dead nowarn; then
+	  set +e
+	  shutdown_out=`$MYADMIN shutdown 2>&1`; r=$?
+	  set -e
+	  if [ "$r" -ne 0 ]; then
+	    log_end_msg 1
+	    [ "$VERBOSE" != "no" ] && log_failure_msg "Error: $shutdown_out"
+	    log_daemon_msg "Killing MySQL database server by signal" "mysqld"
+	    killall -15 mysqld
+            server_down=
+	    for i in 1 2 3 4 5 6 7 8 9 10; do
+              sleep 1
+              if mysqld_status check_dead nowarn; then server_down=1; break; fi
+            done
+          if test -z "$server_down"; then killall -9 mysqld; fi
+	  fi
+        fi
+
+        if ! mysqld_status check_dead warn; then
+	  log_end_msg 1
+	  log_failure_msg "Please stop MySQL manually and read /usr/share/doc/mysql-server-5.6/README.Debian.gz!"
+	  exit -1
+	else
+	  log_end_msg 0
+        fi
+	;;
+
+  'restart')
+	set +e; $SELF stop; set -e
+	$SELF start 
+	;;
+
+  'reload'|'force-reload')
+  	log_daemon_msg "Reloading MySQL database server" "mysqld"
+	$MYADMIN reload
+	log_end_msg 0
+	;;
+
+  'status')
+	if mysqld_status check_alive nowarn; then
+	  log_action_msg "$($MYADMIN version)"
+	else
+	  log_action_msg "MySQL is stopped."
+	  exit 3
+	fi
+  	;;
+
+  *)
+	echo "Usage: $SELF start|stop|restart|reload|force-reload|status"
+	exit 1
+	;;
+esac
+

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.postinst (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.postinst)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.postinst	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.postinst	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,282 @@
+#!/bin/bash
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
+${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
+ 
+export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
+
+# This command can be used as pipe to syslog. With "-s" it also logs to stderr.
+ERR_LOGGER="logger -p daemon.err -t mysqld_safe -i"
+
+invoke() {
+  if [ -x /usr/sbin/invoke-rc.d ]; then
+    invoke-rc.d mysql $1
+  else
+    /etc/init.d/mysql $1
+  fi
+}
+
+MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables"
+
+test_mysql_access() {
+       mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1
+}
+
+# call with $1 = "online" to connect to the server, otherwise it bootstraps
+set_mysql_rootpw() {
+       # forget we ever saw the password.  don't use reset to keep the seen status
+       db_set mysql-server/root_password ""
+       db_set mysql-server/root_password_again ""
+
+       tfile=`mktemp`
+       if [ ! -f "$tfile" ]; then
+               return 1
+       fi
+
+       # this avoids us having to call "test" or "[" on $rootpw
+       cat << EOF > $tfile
+USE mysql;
+UPDATE user SET password=PASSWORD("$rootpw") WHERE user='root';
+FLUSH PRIVILEGES;
+EOF
+       if grep -q 'PASSWORD("")' $tfile; then
+               retval=0
+       elif [ "$1" = "online" ]; then
+               mysql --no-defaults -u root -h localhost <$tfile >/dev/null
+               retval=$?
+       else
+               $MYSQL_BOOTSTRAP <$tfile
+               retval=$?
+       fi
+       rm -f $tfile
+       return $retval
+}
+
+# This is necessary because mysql_install_db removes the pid file in /var/run
+# and because changed configuration options should take effect immediately.
+# In case the server wasn't running at all it should be ok if the stop
+# script fails. I can't tell at this point because of the cleaned /var/run.
+set +e; invoke stop; set -e
+    
+case "$1" in
+  configure)
+    mysql_datadir=/usr/share/mysql
+    mysql_statedir=/var/lib/mysql
+    mysql_rundir=/var/run/mysqld
+    mysql_logdir=/var/log
+    mysql_cfgdir=/etc/mysql
+    mysql_newlogdir=/var/log/mysql
+    mysql_upgradedir=/var/lib/mysql-upgrade
+
+    # first things first, if the following symlink exists, it is a preserved
+    # copy the old data dir from a mysql upgrade that would have otherwise
+    # been replaced by an empty mysql dir.  this should restore it.
+    for dir in DATADIR LOGDIR; do
+        if [ "$dir" = "DATADIR" ]; then targetdir=$mysql_statedir; else targetdir=$mysql_newlogdir; fi
+        savelink="$mysql_upgradedir/$dir.link"
+        if [ -L "$savelink" ]; then
+            # If the targetdir was a symlink before we upgraded it is supposed
+            # to be either still be present or not existing anymore now.
+            if [ -L "$targetdir" ]; then
+                rm "$savelink"
+            elif [ ! -d "$targetdir" ]; then
+                mv "$savelink" "$targetdir"
+            else
+                # this should never even happen, but just in case...
+                mysql_tmp=`mktemp -d -t mysql-symlink-restore-XXXXXX`
+                echo "this is very strange!  see $mysql_tmp/README..." >&2
+                mv "$targetdir" "$mysql_tmp"
+                cat << EOF > "$mysql_tmp/README"
+
+if you're reading this, it's most likely because you had replaced /var/lib/mysql
+with a symlink, then upgraded to a new version of mysql, and then dpkg
+removed your symlink (see #182747 and others).  the mysql packages noticed
+that this happened, and as a workaround have restored it.  however, because
+/var/lib/mysql seems to have been re-created in the meantime, and because
+we don't want to rm -rf something we don't know as much about, we're going
+to leave this unexpected directory here.  if your database looks normal,
+and this is not a symlink to your database, you should be able to blow
+this all away.
+
+EOF
+            fi
+        fi
+	rmdir $mysql_upgradedir 2>/dev/null || true
+    done
+    
+    # Ensure the existence and right permissions for the database and
+    # log files.
+    if [ ! -d "$mysql_statedir"       -a ! -L "$mysql_statedir"       ]; then mkdir "$mysql_statedir"; fi
+    if [ ! -d "$mysql_statedir/mysql" -a ! -L "$mysql_statedir/mysql" ]; then mkdir "$mysql_statedir/mysql"; fi
+    if [ ! -d "$mysql_newlogdir"      -a ! -L "$mysql_newlogdir"      ]; then mkdir "$mysql_newlogdir"; fi
+    # When creating an ext3 jounal on an already mounted filesystem like e.g.
+    # /var/lib/mysql, you get a .journal file that is not modifyable by chown.
+    # The mysql_datadir must not be writable by the mysql user under any
+    # circumstances as it contains scripts that are executed by root.
+    set +e
+    chown -R 0:0 $mysql_datadir
+    chown -R mysql $mysql_statedir
+    chmod 700 $mysql_statedir $mysql_statedir/mysql
+    if [ ! -d "$mysql_rundir" ]; then mkdir "$mysql_rundir"; fi
+    chown -R mysql $mysql_rundir
+    chown -R mysql:adm $mysql_newlogdir;	chmod 2750 $mysql_newlogdir;
+    for i in log err; do
+      touch             $mysql_logdir/mysql.$i
+      chown mysql:adm   $mysql_logdir/mysql.$i
+      chmod 0640        $mysql_logdir/mysql.$i
+    done
+    set -e
+
+    # This is important to avoid dataloss when there is a removed
+    # mysql-server version from Woody lying around which used the same
+    # data directory and then somewhen gets purged by the admin.
+    db_set mysql-server/postrm_remove_database false || true
+
+    # To avoid downgrades.
+    touch $mysql_statedir/debian-5.6.flag
+
+    # initiate databases. Output is not allowed by debconf :-(
+    # Debian: beware of the bashisms... 
+    # Debian: can safely run on upgrades with existing databases 
+    set +e
+    bash /usr/bin/mysql_install_db --rpm 2>&1 | $ERR_LOGGER
+    if [ "$?" != "0" ]; then
+      echo "ATTENTION: An error has occured. More info is in the syslog!"
+    fi
+    set -e
+    
+    ## On every reconfiguration the maintenance user is recreated.
+    #
+    # - It is easier to regenerate the password every time but as people
+    #   use fancy rsync scripts and file alteration monitors, the existing
+    #   password is used and existing files not touched.
+    # - The mysqld statement is like that in mysql_install_db because the
+    #   server is not already running. This has some implications:
+    # 	- The amount of newlines and semicolons in the query is important!
+    #   - GRANT is not possible with --skip-grant-tables and "INSERT
+    #     (user,host..) VALUES" is not --ansi compliant
+    # - The echo is just for readability. ash's buildin has no "-e" so use /bin/echo.
+    # - The Super_priv, Show_db_priv, Create_tmp_table_priv and Lock_tables_priv
+    #   may not be present as old Woody 3.23 databases did not have it and the
+    #   admin might not already have run mysql_upgrade which adds them.
+    #   As the binlog cron scripts to need at least the Super_priv, I do first
+    #   the old query which always succeeds and then the new which may or may not.
+
+    # recreate the credentials file if not present or without mysql_upgrade stanza
+    dc=$mysql_cfgdir/debian.cnf; 
+    if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then
+        pass="`sed -n 's/^[     ]*password *= *// p' $dc | head -n 1`"
+    else
+	pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`;
+        if [ ! -d "$mysql_cfgdir" ]; then install -o 0 -g 0 -m 0755 -d $mysql_cfgdir; fi
+        cat /dev/null > $dc
+        echo "# Automatically generated for Debian scripts. DO NOT TOUCH!" >>$dc
+        echo "[client]"                                                    >>$dc
+        echo "host     = localhost"                                        >>$dc
+        echo "user     = debian-sys-maint"                                 >>$dc
+        echo "password = $pass"                                            >>$dc
+        echo "socket   = $mysql_rundir/mysqld.sock"                        >>$dc
+        echo "[mysql_upgrade]"                                             >>$dc
+        echo "host     = localhost"                                        >>$dc
+        echo "user     = debian-sys-maint"                                 >>$dc
+        echo "password = $pass"                                            >>$dc
+        echo "socket   = $mysql_rundir/mysqld.sock"                        >>$dc
+        echo "basedir  = /usr"                                             >>$dc
+    fi
+    # If this dir chmod go+w then the admin did it. But this file should not.
+    chown 0:0 $dc
+    chmod 0600 $dc
+
+    # update privilege tables
+    password_column_fix_query=`echo -e \
+        "USE mysql\n" \
+        "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`;
+    replace_query=`echo -e \
+        "USE mysql\n" \
+        "REPLACE INTO user SET " \
+        "  host='localhost', user='debian-sys-maint', password=password('$pass'), " \
+        "  Select_priv='Y', Insert_priv='Y', Update_priv='Y', Delete_priv='Y', " \
+        "  Create_priv='Y', Drop_priv='Y', Reload_priv='Y', Shutdown_priv='Y', " \
+        "  Process_priv='Y',  File_priv='Y', Grant_priv='Y', References_priv='Y', " \
+        "  Index_priv='Y', Alter_priv='Y', Super_priv='Y', Show_db_priv='Y', "\
+        "  Create_tmp_table_priv='Y', Lock_tables_priv='Y', Execute_priv='Y', "\
+        "  Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\
+        "  Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\
+        "  Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y' "`;
+    fix_privs=`echo -e \
+        "USE mysql;\n" \
+        "ALTER TABLE user ADD column Create_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
+        "ALTER TABLE user ADD column Show_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
+        "ALTER TABLE user ADD column Create_routine_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
+        "ALTER TABLE user ADD column Alter_routine_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
+        "ALTER TABLE user ADD column Create_user_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
+        "ALTER TABLE user ADD column Event_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
+        "ALTER TABLE user ADD column Trigger_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " `
+    # Engines supported by etch should be installed per default. The query sequence is supposed
+    # to be aborted if the CREATE TABLE fails due to an already existent table in which case the
+    # admin might already have chosen to remove one or more plugins. Newlines are necessary.
+    install_plugins=`echo -e \
+        "USE mysql;\n" \
+        "CREATE TABLE plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \
+        "  dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \
+        "  PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';\n" \
+        "INSERT INTO plugin VALUES ('innodb',    'ha_innodb.so');\n" \
+        "INSERT INTO plugin VALUES ('federated', 'ha_federated.so');\n" \
+        "INSERT INTO plugin VALUES ('blackhole', 'ha_blackhole.so');\n" \
+        "INSERT INTO plugin VALUES ('archive',   'ha_archive.so');" `
+
+    # Upgrade password column format before the root password gets set.
+    echo "$password_column_fix_query"                        | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
+
+    db_get mysql-server/root_password && rootpw="$RET"
+    if ! set_mysql_rootpw; then
+        password_error="yes"
+    fi
+
+    echo "$fix_privs"                                        | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
+    echo "$replace_query"                                    | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
+    set +e
+    echo "$install_plugins"                                  | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
+    set -e
+  ;;
+
+  abort-upgrade|abort-remove|abort-configure)
+  ;;
+
+  *)
+    echo "postinst called with unknown argument '$1'" 1>&2
+    exit 1
+  ;;
+esac
+
+# here we check to see if we can connect as root without a password
+# this should catch upgrades from previous versions where the root
+# password wasn't set.  if there is a password, or if the connection
+# fails for any other reason, nothing happens.
+if [ "$1" = "configure" ]; then
+       if test_mysql_access; then
+               db_input medium mysql-server/root_password || true
+               db_go
+               db_get mysql-server/root_password && rootpw="$RET"
+
+               if ! set_mysql_rootpw "online"; then
+                       password_error="yes"
+               fi
+       fi
+
+       if [ "$password_error" = "yes" ]; then
+               db_input high mysql-server/error_setting_password || true
+               db_go
+       fi
+
+fi
+
+db_stop # in case invoke failes
+
+#DEBHELPER#
+
+exit 0

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.postrm (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.postrm)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.postrm	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.postrm	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,85 @@
+#!/bin/bash
+
+set -e
+
+# It is possible that Debconf has already been removed, too.
+if [ -f /usr/share/debconf/confmodule ]; then
+  . /usr/share/debconf/confmodule
+fi
+
+if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
+${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
+
+MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
+
+# Try to stop the server in a sane way. If it does not success let the admin
+# do it himself. No database directories should be removed while the server
+# is running!
+stop_server() {
+  set +e
+  if [ -x /usr/sbin/invoke-rc.d ]; then
+    invoke-rc.d mysql stop
+  else
+    /etc/init.d/mysql stop
+  fi
+  errno=$?
+  set -e
+
+  if [ "$?" != 0 ]; then
+    echo "Trying to stop the MySQL server resulted in exitcode $?." 1>&2
+    echo "Stop it yourself and try again!" 1>&2
+    exit 1
+  fi
+}
+
+case "$1" in
+  purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    if [ -n "`$MYADMIN ping 2>/dev/null`" ]; then
+      stop_server
+      sleep 2
+    fi
+  ;;
+  *)
+    echo "postrm called with unknown argument '$1'" 1>&2
+    exit 1
+  ;;
+esac
+
+#
+# - Do NOT purge logs or data if another mysql-sever* package is installed (#307473)
+# - Remove the mysql user only after all his owned files are purged.
+#   
+if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; then
+  # we remove the mysql user only after all his owned files are purged
+  rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz}
+  rm -rf /var/log/mysql
+
+  db_input high mysql-server-5.6/postrm_remove_databases || true
+  db_go || true
+  db_get mysql-server-5.6/postrm_remove_databases || true
+  if [ "$RET" = "true" ]; then
+    # never remove the debian.cnf when the databases are still existing
+    # else we ran into big trouble on the next install!
+    rm -f /etc/mysql/debian.cnf
+    rm -rf /var/lib/mysql
+    rm -rf /var/run/mysqld
+    userdel mysql || true
+  fi
+
+  # (normally) Automatically added by dh_installinit
+  if [ "$1" = "purge" ] ; then
+        update-rc.d mysql remove >/dev/null || exit 0
+  fi
+  # (normally) End automatically added section
+fi
+
+# (normally) Automatically added by dh_installdebconf
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
+        . /usr/share/debconf/confmodule
+        db_purge
+fi
+# (normally) End automatically added section
+
+# no DEBHELPER here, "update-rc.d remove" fails if mysql-server-5.6 is installed
+
+exit 0

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.preinst (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.preinst)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.preinst	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.preinst	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,185 @@
+#!/bin/bash
+#
+# summary of how this script can be called:
+#        * <new-preinst> install
+#        * <new-preinst> install <old-version>
+#        * <new-preinst> upgrade <old-version>
+#        * <old-preinst> abort-upgrade <new-version>
+#
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
+${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
+
+export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
+MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
+DATADIR=/var/lib/mysql
+LOGDIR=/var/log/mysql
+UPGRADEDIR=/var/lib/mysql-upgrade
+
+# Try to stop the server in a sane way. If it does not success let the admin
+# do it himself. No database directories should be removed while the server
+# is running! Another mysqld in e.g. a different chroot is fine for us.
+stop_server() {
+    if [ ! -x /etc/init.d/mysql ]; then return; fi
+
+    set +e
+    if [ -x /usr/sbin/invoke-rc.d ]; then
+      cmd="invoke-rc.d mysql stop"
+    else
+      cmd="/etc/init.d/mysql stop"
+    fi
+    $cmd
+    errno=$?
+    set -e
+   
+    # 0=ok, 100=no init script (fresh install)
+    if [ "$errno" != 0 -a "$errno" != 100 ]; then
+      echo "${cmd/ */} returned $errno" 1>&2
+      echo "There is a MySQL server running, but we failed in our attempts to stop it." 1>&2
+      echo "Stop it yourself and try again!" 1>&2
+      db_stop  	
+      exit 1
+    fi
+}
+
+################################ main() ##########################
+
+this_version=5.6
+
+# Abort if an NDB cluster is in use.
+if egrep -qi -r '^[^#]*ndb.connectstring|^[[:space:]]*\[[[:space:]]*ndb_mgmd' /etc/mysql/; then
+  db_fset mysql-server/no_upgrade_when_using_ndb seen false || true
+  db_input high mysql-server/no_upgrade_when_using_ndb || true
+  db_go
+  db_stop
+  exit 1
+fi
+
+# Abort if skip-bdb option is enabled, required for 5.0 -> 5.1 upgrades.
+#TODO
+
+# Safe the user from stupidities.
+show_downgrade_warning=0
+for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do
+  found_version=`echo $i | sed 's/.*debian-\([0-9\.]\+\).flag/\1/'`
+  if dpkg --compare-versions "$this_version" '<<' "$found_version"; then
+    show_downgrade_warning=1
+    break;
+  fi
+done
+if [ "$show_downgrade_warning" = 1 ]; then
+  db_fset mysql-server-$this_version/really_downgrade seen false || true
+  db_input medium mysql-server-$this_version/really_downgrade || true
+  db_go
+  db_get mysql-server-$this_version/really_downgrade || true
+  if [ "$RET" = "true" ]; then
+    rm -f $DATADIR/debian-*.flag
+    touch $DATADIR/debian-$this_version.flag
+  else
+    echo "Aborting downgrade from (at least) $found_version to $this_version." 1>&2
+    echo "If are sure you want to downgrade to $this_version, remove the file" 1>&2
+    echo "$DATADIR/debian-*.flag and try installing again." 1>&2
+    db_stop
+    exit 1
+  fi
+fi
+
+# to be sure
+stop_server
+
+# If we use NIS then errors should be tolerated. It's up to the
+# user to ensure that the mysql user is correctly setup.
+# Beware that there are two ypwhich one of them needs the 2>/dev/null!
+if test -n "`which ypwhich 2>/dev/null`"  &&  ypwhich >/dev/null 2>&1; then
+  set +e
+fi
+
+#
+# Now we have to ensure the following state:
+# /etc/passwd: mysql:x:100:101:MySQL Server:/nonexistent:/bin/false
+# /etc/group:  mysql:x:101:
+# 
+# Sadly there could any state be present on the system so we have to
+# modify everything carefully i.e. not doing a chown before creating
+# the user etc...
+#
+
+# creating mysql group if he isn't already there
+if ! getent group mysql >/dev/null; then
+ 	# Adding system group: mysql.
+	addgroup --system mysql >/dev/null
+fi
+
+# creating mysql user if he isn't already there
+if ! getent passwd mysql >/dev/null; then
+	# Adding system user: mysql.
+	adduser \
+	  --system \
+          --disabled-login \
+	  --ingroup mysql \
+	  --no-create-home \
+	  --home /nonexistent \
+	  --gecos "MySQL Server" \
+	  --shell /bin/false \
+	  mysql  >/dev/null
+fi
+
+# end of NIS tolerance zone
+set -e
+
+# if there's a symlink, let's store where it's pointing, because otherwise
+# it's going to be lost in some situations
+for dir in DATADIR LOGDIR; do
+    checkdir=`eval echo "$"$dir`
+    if [ -L "$checkdir" ]; then
+	mkdir -p "$UPGRADEDIR"
+	cp -d "$checkdir" "$UPGRADEDIR/$dir.link"
+    fi
+done
+
+# creating mysql home directory
+if [ ! -d $DATADIR -a ! -L $DATADIR ]; then
+ 	mkdir $DATADIR
+fi
+
+# checking disc space
+if LC_ALL=C BLOCKSIZE= df --portability $DATADIR/. | tail -n 1 | awk '{ exit ($4>1000) }'; then
+  echo "ERROR: There's not enough space in $DATADIR/" 1>&2
+  db_stop
+  exit 1
+fi
+
+# Since the home directory was created before putting the user into
+# the mysql group and moreover we cannot guarantee that the 
+# permissions were correctly *before* calling this script, we fix them now.
+# In case we use NIS and no mysql user is present then this script should
+# better fail now than later..
+# The "set +e" is necessary as e.g. a ".journal" of a ext3 partition is
+# not chgrp'able (#318435).
+set +e
+chown mysql:mysql $DATADIR
+find $DATADIR -follow -not -group mysql -print0 2>/dev/null \
+  | xargs -0 --no-run-if-empty chgrp mysql
+set -e
+
+# Some files below /etc/ were possibly in the mysql-server-5.0/etch package
+# before. They get overwritten by current ones to avoid unnecessary dpkg questions.
+while read md5 file; do
+  if [ "`md5sum $file 2>/dev/null`" = "$md5  $file" ]; then
+    cp /usr/share/mysql-common/internal-use-only/`echo $file | sed 's°/°_°g'` $file
+  fi
+done <<EOT
+6691f2fdc5c6d27ff0260eb79813e1bc  /etc/init.d/mysql
+b53b9552d44661361d39157c3c7c51d3  /etc/logrotate.d/mysql-server
+57f3e58f72582ca55100dc1ba0f1a8ae  /etc/mysql/debian-start
+EOT
+
+db_stop
+
+#DEBHELPER#
+
+exit 0

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.prerm (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.prerm)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.prerm	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.prerm	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
+${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
+
+#DEBHELPER#

Copied: mysql-5.6/trunk/debian/mysql-server-5.6.templates (from rev 2204, mysql-5.5/trunk/debian/mysql-server-5.5.templates)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.templates	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.templates	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,89 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# for an advice to debian-l10n-english at lists.debian.org
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: mysql-server-5.6/really_downgrade
+Type: boolean
+Default: false
+_Description: Really proceed with downgrade?
+ A file named /var/lib/mysql/debian-*.flag exists on this system.
+ .
+ Such a file is an indication that a mysql-server package with a higher
+ version has been installed previously.
+ .
+ There is no guarantee that the version you're currently installing
+ will be able to use the current databases.
+
+Template: mysql-server-5.6/nis_warning
+Type: note
+#flag:translate!:3,5
+_Description: Important note for NIS/YP users
+ Using MySQL under NIS/YP requires a mysql user account to be added on
+ the local system with:
+ .
+  adduser --system --group --home /var/lib/mysql mysql
+ .
+ You should also check the permissions and ownership of the
+ /var/lib/mysql directory:
+ .
+  /var/lib/mysql: drwxr-xr-x   mysql    mysql
+
+Template: mysql-server-5.6/postrm_remove_databases
+Type: boolean
+Default: false
+_Description: Remove all MySQL databases?
+ The /var/lib/mysql directory which contains the MySQL databases is about
+ to be removed.
+ .
+ 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 should be kept.
+
+Template: mysql-server-5.6/start_on_boot
+Type: boolean
+Default: true
+_Description: Start the MySQL server on boot?
+ The MySQL server can be launched automatically at boot time or manually
+ with the '/etc/init.d/mysql start' command.
+
+Template: mysql-server/root_password
+Type: password
+_Description: New password for the MySQL "root" user:
+ While not mandatory, it is highly recommended that you set a password
+ for the MySQL administrative "root" user.
+ .
+ If this field is left blank, the password will not be changed.
+
+Template: mysql-server/root_password_again
+Type: password
+_Description: Repeat password for the MySQL "root" user:
+
+Template: mysql-server/error_setting_password
+Type: error
+_Description: Unable to set password for the MySQL "root" user
+ An error occurred while setting the password for the MySQL
+ administrative user. This may have happened because the account
+ already has a password, or because of a communication problem with
+ the MySQL server.
+ .
+ You should check the account's password after the package installation.
+ .
+ Please read the /usr/share/doc/mysql-server-5.6/README.Debian file
+ for more information.
+
+Template: mysql-server/password_mismatch
+Type: error
+_Description: Password input error
+ The two passwords you entered were not the same. Please try again.
+
+Template: mysql-server/no_upgrade_when_using_ndb
+Type: error
+_Description: NDB Cluster seems to be in use
+ MySQL-5.6 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/.

Deleted: mysql-5.6/trunk/debian/mysql-server-core-5.5.dirs
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-core-5.5.dirs	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-core-5.5.dirs	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,2 +0,0 @@
-usr/sbin
-usr/share/man/man8

Deleted: mysql-5.6/trunk/debian/mysql-server-core-5.5.install
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-core-5.5.install	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-core-5.5.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,56 +0,0 @@
-usr/bin/my_print_defaults
-usr/bin/mysql_install_db
-usr/bin/mysql_upgrade
-usr/sbin/mysqld
-usr/share/mysql/charsets
-usr/share/mysql/czech
-usr/share/mysql/danish
-usr/share/mysql/dutch
-usr/share/mysql/english
-usr/share/mysql/estonian
-usr/share/mysql/french
-usr/share/mysql/fill_help_tables.sql
-usr/share/mysql/mysql_system_tables.sql
-usr/share/mysql/mysql_system_tables_data.sql
-usr/share/mysql/german
-usr/share/mysql/greek
-usr/share/mysql/hungarian
-usr/share/mysql/italian
-usr/share/mysql/japanese
-usr/share/mysql/korean
-usr/share/mysql/norwegian
-usr/share/mysql/norwegian-ny
-usr/share/mysql/polish
-usr/share/mysql/portuguese
-usr/share/mysql/romanian
-usr/share/mysql/russian
-usr/share/mysql/serbian
-usr/share/mysql/slovak
-usr/share/mysql/spanish
-usr/share/mysql/swedish
-usr/share/mysql/ukrainian
-usr/sbin/mysqld
-usr/share/mysql/charsets
-usr/share/mysql/czech
-usr/share/mysql/danish
-usr/share/mysql/dutch
-usr/share/mysql/english
-usr/share/mysql/estonian
-usr/share/mysql/french
-usr/share/mysql/german
-usr/share/mysql/greek
-usr/share/mysql/hungarian
-usr/share/mysql/italian
-usr/share/mysql/japanese
-usr/share/mysql/korean
-usr/share/mysql/norwegian
-usr/share/mysql/norwegian-ny
-usr/share/mysql/polish
-usr/share/mysql/portuguese
-usr/share/mysql/romanian
-usr/share/mysql/russian
-usr/share/mysql/serbian
-usr/share/mysql/slovak
-usr/share/mysql/spanish
-usr/share/mysql/swedish
-usr/share/mysql/ukrainian

Deleted: mysql-5.6/trunk/debian/mysql-server-core-5.5.lintian-overrides
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-core-5.5.lintian-overrides	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-core-5.5.lintian-overrides	2013-01-15 13:30:06 UTC (rev 2209)
@@ -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

Deleted: mysql-5.6/trunk/debian/mysql-server-core-5.5.manpages
===================================================================
--- mysql-5.5/trunk/debian/mysql-server-core-5.5.manpages	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-server-core-5.5.manpages	2013-01-15 13:30:06 UTC (rev 2209)
@@ -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

Copied: mysql-5.6/trunk/debian/mysql-server-core-5.6.dirs (from rev 2204, mysql-5.5/trunk/debian/mysql-server-core-5.5.dirs)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-core-5.6.dirs	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-core-5.6.dirs	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,2 @@
+usr/sbin
+usr/share/man/man8

Copied: mysql-5.6/trunk/debian/mysql-server-core-5.6.install (from rev 2204, mysql-5.5/trunk/debian/mysql-server-core-5.5.install)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-core-5.6.install	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-core-5.6.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,60 @@
+usr/bin/my_print_defaults
+usr/bin/mysql_install_db
+usr/bin/mysql_upgrade
+usr/sbin/mysqld
+usr/share/mysql/charsets
+usr/share/mysql/czech
+usr/share/mysql/danish
+usr/share/mysql/dutch
+usr/share/mysql/english
+usr/share/mysql/estonian
+usr/share/mysql/french
+usr/share/mysql/fill_help_tables.sql
+usr/share/mysql/mysql_system_tables.sql
+usr/share/mysql/mysql_system_tables_data.sql
+usr/share/mysql/mysql_security_commands.sql
+usr/share/mysql/innodb_memcached_config.sql
+usr/share/mysql/german
+usr/share/mysql/greek
+usr/share/mysql/hungarian
+usr/share/mysql/italian
+usr/share/mysql/japanese
+usr/share/mysql/korean
+usr/share/mysql/norwegian
+usr/share/mysql/norwegian-ny
+usr/share/mysql/polish
+usr/share/mysql/portuguese
+usr/share/mysql/romanian
+usr/share/mysql/russian
+usr/share/mysql/serbian
+usr/share/mysql/slovak
+usr/share/mysql/spanish
+usr/share/mysql/swedish
+usr/share/mysql/ukrainian
+usr/sbin/mysqld
+usr/share/mysql/charsets
+usr/share/mysql/czech
+usr/share/mysql/danish
+usr/share/mysql/dutch
+usr/share/mysql/english
+usr/share/mysql/estonian
+usr/share/mysql/french
+usr/share/mysql/german
+usr/share/mysql/greek
+usr/share/mysql/hungarian
+usr/share/mysql/italian
+usr/share/mysql/japanese
+usr/share/mysql/korean
+usr/share/mysql/norwegian
+usr/share/mysql/norwegian-ny
+usr/share/mysql/polish
+usr/share/mysql/portuguese
+usr/share/mysql/romanian
+usr/share/mysql/russian
+usr/share/mysql/serbian
+usr/share/mysql/slovak
+usr/share/mysql/spanish
+usr/share/mysql/swedish
+usr/share/mysql/ukrainian
+usr/share/mysql/bulgarian
+usr/share/mysql/dictionary.txt

Copied: mysql-5.6/trunk/debian/mysql-server-core-5.6.lintian-overrides (from rev 2204, mysql-5.5/trunk/debian/mysql-server-core-5.5.lintian-overrides)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-core-5.6.lintian-overrides	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-core-5.6.lintian-overrides	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,2 @@
+# These are random occurrences of a pseudo word in a binary.
+mysql-server-core-5.6: spelling-error-in-binary usr/sbin/mysqld yuR your

Copied: mysql-5.6/trunk/debian/mysql-server-core-5.6.manpages (from rev 2204, mysql-5.5/trunk/debian/mysql-server-core-5.5.manpages)
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-core-5.6.manpages	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-server-core-5.6.manpages	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,4 @@
+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

Deleted: mysql-5.6/trunk/debian/mysql-source-5.5.install
===================================================================
--- mysql-5.5/trunk/debian/mysql-source-5.5.install	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-source-5.5.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1 +0,0 @@
-debian/mysql-source*.tar.gz usr/src/mysql/

Copied: mysql-5.6/trunk/debian/mysql-source-5.6.install (from rev 2204, mysql-5.5/trunk/debian/mysql-source-5.5.install)
===================================================================
--- mysql-5.6/trunk/debian/mysql-source-5.6.install	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-source-5.6.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1 @@
+debian/mysql-source*.tar.gz usr/src/mysql/

Deleted: mysql-5.6/trunk/debian/mysql-testsuite-5.5.dirs
===================================================================
--- mysql-5.5/trunk/debian/mysql-testsuite-5.5.dirs	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-testsuite-5.5.dirs	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1 +0,0 @@
-/usr/lib/mysql-testsuite

Deleted: mysql-5.6/trunk/debian/mysql-testsuite-5.5.install
===================================================================
--- mysql-5.5/trunk/debian/mysql-testsuite-5.5.install	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-testsuite-5.5.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,4 +0,0 @@
-usr/share/mysql-test/* usr/lib/mysql-testsuite/
-usr/bin/mysql_client_test_embedded
-usr/bin/mysql_embedded
-usr/bin/mysqltest_embedded

Deleted: mysql-5.6/trunk/debian/mysql-testsuite-5.5.lintian-overrides
===================================================================
--- mysql-5.5/trunk/debian/mysql-testsuite-5.5.lintian-overrides	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/mysql-testsuite-5.5.lintian-overrides	2013-01-15 13:30:06 UTC (rev 2209)
@@ -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

Copied: mysql-5.6/trunk/debian/mysql-testsuite-5.6.dirs (from rev 2204, mysql-5.5/trunk/debian/mysql-testsuite-5.5.dirs)
===================================================================
--- mysql-5.6/trunk/debian/mysql-testsuite-5.6.dirs	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-testsuite-5.6.dirs	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1 @@
+/usr/lib/mysql-testsuite

Copied: mysql-5.6/trunk/debian/mysql-testsuite-5.6.install (from rev 2204, mysql-5.5/trunk/debian/mysql-testsuite-5.5.install)
===================================================================
--- mysql-5.6/trunk/debian/mysql-testsuite-5.6.install	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-testsuite-5.6.install	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,4 @@
+usr/share/mysql-test/* usr/lib/mysql-testsuite/
+usr/bin/mysql_client_test_embedded
+usr/bin/mysql_embedded
+usr/bin/mysqltest_embedded

Copied: mysql-5.6/trunk/debian/mysql-testsuite-5.6.lintian-overrides (from rev 2204, mysql-5.5/trunk/debian/mysql-testsuite-5.5.lintian-overrides)
===================================================================
--- mysql-5.6/trunk/debian/mysql-testsuite-5.6.lintian-overrides	                        (rev 0)
+++ mysql-5.6/trunk/debian/mysql-testsuite-5.6.lintian-overrides	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,4 @@
+# These are random occurrences of a pseudo word in a binary.
+mysql-testsuite-5.6: spelling-error-in-binary usr/bin/mysql_client_test_embedded yuR your
+mysql-testsuite-5.6: spelling-error-in-binary usr/bin/mysql_embedded yuR your
+mysql-testsuite-5.6: spelling-error-in-binary usr/bin/mysqltest_embedded yuR your

Added: mysql-5.6/trunk/debian/patches/mysql-bug.67018.patch
===================================================================
--- mysql-5.6/trunk/debian/patches/mysql-bug.67018.patch	                        (rev 0)
+++ mysql-5.6/trunk/debian/patches/mysql-bug.67018.patch	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,13 @@
+Index: trunk/sql/mysqld.cc
+===================================================================
+--- trunk.orig/sql/mysqld.cc	2013-01-09 11:59:43.902887077 +0100
++++ trunk/sql/mysqld.cc	2013-01-09 12:00:31.518888125 +0100
+@@ -6262,7 +6262,7 @@
+             The connection was refused by TCP wrappers.
+             There are no details (by client IP) available to update the host_cache.
+           */
+-          statistic_increment(connection_tcpwrap_errors, &LOCK_status);
++          statistic_increment(connection_errors_tcpwrap, &LOCK_status);
+           continue;
+         }
+       }

Added: mysql-5.6/trunk/debian/patches/mysql-bug.68087.patch
===================================================================
--- mysql-5.6/trunk/debian/patches/mysql-bug.68087.patch	                        (rev 0)
+++ mysql-5.6/trunk/debian/patches/mysql-bug.68087.patch	2013-01-15 13:30:06 UTC (rev 2209)
@@ -0,0 +1,40 @@
+Description: Upstream changes introduced in version 5.6.9-rc+dfsg-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ mysql-5.6 (5.6.9-rc+dfsg-1) UNRELEASED; urgency=low
+ .
+   * new upstream
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Bjoern Boschman <bjoern.boschman at nfon.net>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- mysql-5.6-5.6.9-rc+dfsg.orig/cmake/readline.cmake
++++ mysql-5.6-5.6.9-rc+dfsg/cmake/readline.cmake
+@@ -192,9 +192,9 @@ MACRO (MYSQL_CHECK_READLINE)
+     IF(WITH_LIBEDIT) 
+      MYSQL_USE_BUNDLED_LIBEDIT()
+     ELSE()
+-      FIND_SYSTEM_LIBEDIT(edit)
+-      IF(NOT_LIBEDIT_FOUND)
+-        MESSAGE(FATAL_ERROR "Cannot find system libedit libraries.Use WITH_LIBEDIT") 
++      FIND_SYSTEM_LIBEDIT(readline)
++      IF(NOT_LIBREADLINE_FOUND)
++        MESSAGE(FATAL_ERROR "Cannot find system libreadline libraries.Use WITH_LIBREADLINE") 
+       ENDIF()
+     ENDIF()
+   ENDIF(NOT WIN32)

Modified: mysql-5.6/trunk/debian/patches/series
===================================================================
--- mysql-5.5/trunk/debian/patches/series	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/patches/series	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,14 +1,16 @@
 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
-regex_plus.patch
-kfreebsd_fails.patch
-versioned_symbols.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
+#regex_plus.patch
+#kfreebsd_fails.patch
+#versioned_symbols.patch
+mysql-bug.67018.patch
+mysql-bug.68087.patch

Modified: mysql-5.6/trunk/debian/po/POTFILES.in
===================================================================
--- mysql-5.5/trunk/debian/po/POTFILES.in	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/POTFILES.in	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1 +1 @@
-[type: gettext/rfc822deb] mysql-server-5.5.templates
+[type: gettext/rfc822deb] mysql-server-5.6.templates

Modified: mysql-5.6/trunk/debian/po/ar.po
===================================================================
--- mysql-5.5/trunk/debian/po/ar.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/ar.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: templates\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2007-05-01 13:04+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat at yahoo.com>\n"
@@ -27,19 +27,19 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "هل فعلاً تريد التثبيط؟"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "هناك ملف مسمى /var/lib/mysql/debian-*.flag موجود على هذا النظام."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mysql-server package with a higher "
@@ -52,7 +52,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -62,13 +62,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "ملاحظة هامة لمستخدمي NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -76,7 +76,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -88,13 +88,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "إزالة جميع قواعد بيانات MySQL؟"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -102,7 +102,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -113,13 +113,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "تشغيل خادم MySQL عند الإقلاع؟"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -129,13 +129,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMySQL:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -145,7 +145,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.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."
@@ -153,7 +153,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MySQL \"root\" user:"
@@ -161,13 +161,13 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "تعذر تعيين كلمة مرور للمستخدم \"root\" الخاص بـMySQL."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -179,7 +179,7 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -188,41 +188,41 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
+#| "Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
-"الرجاء قراءة الملف /usr/share/doc/mysql-server-5.5/README.Debian للمزيد من "
+"الرجاء قراءة الملف /usr/share/doc/mysql-server-5.6/README.Debian للمزيد من "
 "المعلومات."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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 ""

Modified: mysql-5.6/trunk/debian/po/ca.po
===================================================================
--- mysql-5.5/trunk/debian/po/ca.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/ca.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2004-01-31 19:20GMT\n"
 "Last-Translator: Aleix Badia i Bosch <abadia at ica.es>\n"
@@ -17,19 +17,19 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -39,7 +39,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -49,7 +49,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -57,7 +57,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -67,7 +67,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -77,13 +77,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -93,7 +93,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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,7 +105,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 #, fuzzy
 #| msgid "Should MySQL start on boot?"
 msgid "Start the MySQL server on boot?"
@@ -113,7 +113,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 #, fuzzy
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
@@ -124,13 +124,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -140,25 +140,25 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -170,7 +170,7 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Hauríeu de comprovar la contrasenya del compte després de la instaŀlació "
@@ -178,13 +178,13 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
 "Llegiu el fitxer /usr/share/doc/mysql-server-5.1/README.Debian per a obtenir "
@@ -192,28 +192,28 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 "Les dos contrasenyes que heu introduït no són la mateixa. Proveu-ho de nou."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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 ""

Modified: mysql-5.6/trunk/debian/po/cs.po
===================================================================
--- mysql-5.5/trunk/debian/po/cs.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/cs.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -13,8 +13,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-5.5\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Project-Id-Version: mysql-dfsg-5.6\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2007-05-01 13:01+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
@@ -26,19 +26,19 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Opravdu pokračovat v degradaci?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "V systému existuje soubor /var/lib/mysql/debian-*.flag."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mysql-server package with a higher "
@@ -50,7 +50,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -60,13 +60,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Důležitá poznámka pro uživatele NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -74,7 +74,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -87,13 +87,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Odstranit všechny MySQL databáze?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -102,7 +102,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -114,13 +114,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Spustit MySQL server při startu systému?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -130,13 +130,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nové heslo MySQL uživatele \"root\":"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -146,7 +146,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.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."
@@ -154,7 +154,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MySQL \"root\" user:"
@@ -162,13 +162,13 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Nelze nastavit heslo MySQL uživatele \"root\""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -180,7 +180,7 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -189,40 +189,40 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
+#| "Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
-"Více informací naleznete v /usr/share/doc/mysql-server-5.5/README.Debian."
+"Více informací naleznete v /usr/share/doc/mysql-server-5.6/README.Debian."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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 ""
@@ -241,14 +241,14 @@
 #~ "Recent versions of MySQL can no longer use the old ISAM table format and "
 #~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by "
 #~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". "
-#~ "The installation of mysql-server-5.5 will now abort. In case your old "
+#~ "The installation of mysql-server-5.6 will now abort. In case your old "
 #~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert "
 #~ "those tables."
 #~ msgstr ""
 #~ "Poslední verze MySQL již nemohou používat starý formát tabulek ISAM a "
 #~ "před aktualizací je nutné převést tyto tabulky např. do formátu MyISAM "
 #~ "pomocí \"mysql_convert_table_format\" nebo \"ALTER TABLE x ENGINE=MyISAM"
-#~ "\". Instalace mysql-server-5.5 se nyní přeruší. V případě, že se mezitím "
+#~ "\". Instalace mysql-server-5.6 se nyní přeruší. V případě, že se mezitím "
 #~ "odinstaloval původní mysql-server-4.1, jednoduše jej znovu nainstalujte a "
 #~ "tabulky převeďte."
 

Modified: mysql-5.6/trunk/debian/po/da.po
===================================================================
--- mysql-5.5/trunk/debian/po/da.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/da.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-5.1\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2010-10-07 05:26+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
@@ -19,19 +19,19 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Ønsker du virkelig at fortsætte nedgraderingen?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.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."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -41,7 +41,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -51,13 +51,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Vigtig oplysning til NIS/YP-brugere"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -67,7 +67,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -76,13 +76,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Fjern alle MySQL-databaser?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -92,7 +92,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -104,13 +104,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Start MySQL-serveren under systemopstart?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -120,13 +120,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Ny adgangskode for MySQL's »rootbruger«:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -136,25 +136,25 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.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.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Gentag adgangskode for MySQL's »root-bruger«:"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -167,19 +167,19 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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.5.templates:8001
+#: ../mysql-server-5.6.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 "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
 "Læs venligst filen /usr/share/doc/mysql-server-5.1/README.Debian for "
@@ -187,33 +187,33 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr "Inddatafejl for adgangskode"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.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."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.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.5.templates:10001
+#: ../mysql-server-5.6.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-5.6 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 ""

Modified: mysql-5.6/trunk/debian/po/de.po
===================================================================
--- mysql-5.5/trunk/debian/po/de.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/de.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,4 +1,4 @@
-# translation of mysql-dfsg-5.5_5.5.37-1_de.po to Deutsch
+# translation of mysql-dfsg-5.6_5.6.8-1_de.po to Deutsch
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -14,8 +14,8 @@
 # Thomas Mueller <thomas.mueller at tmit.eu>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg 5.5.23-2\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Project-Id-Version: mysql-dfsg 5.6.23-2\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2012-06-03 10:33+0200\n"
 "Last-Translator: Thomas Mueller <thomas.mueller at tmit.eu>\n"
@@ -29,13 +29,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Möchten Sie wirklich eine ältere Version einspielen?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 "Auf diesem System existiert eine Datei mit dem Namen /var/lib/mysql/debian-*."
@@ -43,7 +43,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -53,7 +53,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -63,13 +63,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Wichtige Anmerkung für NIS/YP-Benutzer!"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -79,7 +79,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -89,13 +89,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Alle MySQL-Datenbanken entfernen?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -105,7 +105,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -117,13 +117,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Soll der MySQL-Server automatisch beim Booten starten?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -133,13 +133,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Neues Passwort für den MySQL »root«-Benutzer:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -149,25 +149,25 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Wenn dieses Feld freigelassen wird, wird das Passwort nicht geändert."
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Wiederholen Sie das Passwort für den MySQL-»root«-Benutzer:"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Konnte für den MySQL-»root«-Benutzer kein Passwort setzen"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -180,7 +180,7 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Sie sollten das Passwort des administrativen Benutzers nach der "
@@ -188,23 +188,23 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
-"Für weitere Informationen lesen Sie /usr/share/doc/mysql-server-5.5/README."
+"Für weitere Informationen lesen Sie /usr/share/doc/mysql-server-5.6/README."
 "Debian."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr "Passwort-Eingabefehler"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 "Die beiden von Ihnen eingegebenen Passwörter sind nicht identisch. Bitte "
@@ -212,19 +212,19 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "NDB-Cluster scheint gerade benutzt zu werden"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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.5 bietet keine NDB-Clusterunterstützung mehr. Bitte migrieren Sie "
+"MySQL-5.6 bietet keine NDB-Clusterunterstützung mehr. Bitte migrieren Sie "
 "Ihr System zum neuen »mysql-cluster-server«-Paket und entfernen Sie alle Zeilen, "
 "die mit »ndb« beginnen aus allen Konfigurationsdateien im Verzeichnis /etc/"
 "mysql/."

Modified: mysql-5.6/trunk/debian/po/es.po
===================================================================
--- mysql-5.5/trunk/debian/po/es.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/es.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,6 +1,6 @@
-# mysql-5.5 translation to spanish
+# mysql-5.6 translation to spanish
 # Copyright (C) 2005-2012 Software in the Public Interest, SPI Inc.
-# This file is distributed under the same license as the mysql-5.5 package.
+# This file is distributed under the same license as the mysql-5.6 package.
 #
 # Changes:
 # - Initial translation
@@ -39,8 +39,8 @@
 # traducción de Debian al español (<debian-l10n-spanish at lists.debian.org>)
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-5.5\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Project-Id-Version: mysql-5.6\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2012-06-17 09:49-0500\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs at debian.org>\n"
@@ -54,20 +54,20 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "¿Desea realmente continuar con la desactualización?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 "Existe un fichero con el nombre /var/lib/mysql/debian-*.flag en este sistema."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -77,7 +77,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -87,13 +87,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante para los usuarios de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -103,7 +103,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -113,13 +113,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "¿Desea eliminar todas las bases de datos MySQL?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -129,7 +129,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -141,13 +141,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "¿Desea que el servidor MySQL se ejecute al iniciar el sistema?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -157,13 +157,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nueva contraseña para el usuario «root» de MySQL:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -173,25 +173,25 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "No se modificará la contraseña si deja el espacio en blanco."
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Nueva contraseña para el usuario «root» de MySQL:"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "No se pudo fijar la contraseña para el usuario «root» de MySQL"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -204,7 +204,7 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Debería comprobar la contraseña de la cuenta después de la instalación del "
@@ -212,41 +212,41 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
-"Consulte /usr/share/doc/mysql-server-5.5/README.Debian para más información."
+"Consulte /usr/share/doc/mysql-server-5.6/README.Debian para más información."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr "Se ha producido un error al introducir la contraseña"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 "Las dos contraseñas que ha introducido son distintas. Intente de nuevo."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "NDB Cluster parece estar en uso"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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.5 ya no brinda soporte para NDB Cluster. Migre al nuevo paquete "
+"MySQL-5.6 ya no brinda soporte para NDB Cluster. Migre al nuevo paquete "
 "mysql-cluster-server y elimine todas las líneas que empiecen con \"ndb\" "
 "de todos los ficheros de configuración bajo /etc/mysql/."
 
@@ -264,7 +264,7 @@
 #~ "Recent versions of MySQL can no longer use the old ISAM table format and "
 #~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by "
 #~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". "
-#~ "The installation of mysql-server-5.5 will now abort. In case your old "
+#~ "The installation of mysql-server-5.6 will now abort. In case your old "
 #~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert "
 #~ "those tables."
 #~ msgstr ""
@@ -272,7 +272,7 @@
 #~ "tabla ISAM. Antes de realizar la actualización es necesario convertir sus "
 #~ "tablas a por ejemplo, MyISAM, usando «mysql_convert_table_format» o "
 #~ "«ALTER TABLE x ENGINE=MyISAM». Se va a interrumpir ahora la instalación "
-#~ "de mysql-server-5.5. Si aún así su mysql-server-4.1 se elimina aún así, "
+#~ "de mysql-server-5.6. Si aún así su mysql-server-4.1 se elimina aún así, "
 #~ "puede reinstalarlo para convertir ese tipo de tablas."
 
 #~ msgid ""

Modified: mysql-5.6/trunk/debian/po/eu.po
===================================================================
--- mysql-5.5/trunk/debian/po/eu.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/eu.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2009-07-29 11:59+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
@@ -20,19 +20,19 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Benetan bertsio zaharragora itzuli nahi duzu?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "Sisteman badago /var/lib/mysql/debian-*.flag izeneko fitxategi bat."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mysql-server package with a higher "
@@ -46,7 +46,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -56,13 +56,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "NIS/YP erabiltzaileentzat ohar garrantzitsua"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -70,7 +70,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -84,13 +84,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Ezabatu MySQL datubase guztiak?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -98,7 +98,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -110,13 +110,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Abioan MySQL zerbitzaria abiarazi?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -126,13 +126,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "MySQL \"root\" erabiltzailearen pasahitz berria:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -142,7 +142,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.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."
@@ -150,19 +150,19 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Errepikatu MySQL \"root\" erabiltzailearen pasahitza:"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Ezin da MySQL \"root\" erabiltzailearen pasahitza ezarri"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -174,57 +174,57 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Kontuaren pasahitza egiaztatu beharko zenuke paketea instalatu aurretik."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
+#| "Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
-"Mesedez irakurri /usr/share/doc/mysql-server-5.5/README.Debian fitxategia "
+"Mesedez irakurri /usr/share/doc/mysql-server-5.6/README.Debian fitxategia "
 "xehetasun gehiagorako."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr "Pasahitz sarrera errorea"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Idatzi dituzun bi pasahitzak ez dira berdina. Mesedez saiatu berriz."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "Dirudienez NDB Cluster-a erabilia dago"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 #, fuzzy
 #| msgid ""
-#| "MySQL-5.5 has orphaned NDB Cluster support. Please migrate to the new "
+#| "MySQL-5.6 has orphaned 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-5.6 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.5-ek NDB cluster euskarri umezurtz bat behar du. Mesedez migratu "
+"MySQL-5.6-ek NDB cluster euskarri umezurtz bat behar du. Mesedez migratu "
 "mysql-cluster pakete berrira eta /etc/mysql/ azpiko konfigurazio fitxategi "
 "guztietan \"ndb\"-ez hasten diren lerro guztiak ezabatu."
 

Modified: mysql-5.6/trunk/debian/po/fr.po
===================================================================
--- mysql-5.5/trunk/debian/po/fr.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/fr.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2012-05-22 08:30+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
@@ -22,19 +22,19 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Faut-il vraiment revenir à la version précédente ?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "Un fichier /var/lib/mysql/debian-*.flag est présent sur ce système."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -44,7 +44,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -52,13 +52,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Note importante pour les utilisateurs NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -68,7 +68,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -78,13 +78,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Faut-il supprimer toutes les bases de données MySQL ?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -94,7 +94,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 +105,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Faut-il lancer MySQL au démarrage ?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.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 +121,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nouveau mot de passe du superutilisateur de MySQL :"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -137,26 +137,26 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Si ce champ est laissé vide, le mot de passe ne sera pas changé."
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Confirmation du mot de passe du superutilisateur de MySQL :"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr ""
 "Impossible de changer le mot de passe de l'utilisateur « root » de MySQL"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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,7 +168,7 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Vous devriez vérifier le mot de passe de ce compte après l'installation du "
@@ -176,23 +176,23 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
-"Veuillez consulter le fichier /usr/share/doc/mysql-server-5.5/README.Debian "
+"Veuillez consulter le fichier /usr/share/doc/mysql-server-5.6/README.Debian "
 "pour plus d'informations."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr "Erreur de saisie du mot de passe"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 "Le mot de passe et sa confirmation ne sont pas identiques. Veuillez "
@@ -200,19 +200,19 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "Abandon de la gestion de NDB"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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 ""
-"La version 5.5 de MySQL ne gère plus les grappes NDB. Vous devriez utiliser "
+"La version 5.6 de MySQL ne gère plus les grappes NDB. Vous devriez utiliser "
 "le paquet mysql-cluster-server et supprimer toutes les lignes commençant par "
 "« ndb » des fichiers de configuration situés dans /etc/mysql."
 

Modified: mysql-5.6/trunk/debian/po/gl.po
===================================================================
--- mysql-5.5/trunk/debian/po/gl.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/gl.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,11 +1,11 @@
-# Galician translation of mysql-dfsg-5.5's debconf templates
-# This file is distributed under the same license as the mysql-dfsg-5.5 package.
+# Galician translation of mysql-dfsg-5.6's debconf templates
+# This file is distributed under the same license as the mysql-dfsg-5.6 package.
 # Jacobo Tarrio <jtarrio at debian.org>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-5.5\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Project-Id-Version: mysql-dfsg-5.6\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2007-04-20 09:44+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
@@ -17,19 +17,19 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "¿Quere pasar a unha versión anterior?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "Neste sistema hai un ficheiro chamado /var/lib/mysql/debian-*.flag."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mysql-server package with a higher "
@@ -43,7 +43,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -53,13 +53,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante para os usuarios de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -67,7 +67,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -81,13 +81,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "¿Eliminar tódalas bases de datos de MySQL?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -97,7 +97,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -109,13 +109,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "¿Iniciar o servidor MySQL co ordenador?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -125,13 +125,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Novo contrasinal para o usuario \"root\" de MySQL:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -141,7 +141,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.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."
@@ -149,7 +149,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MySQL \"root\" user:"
@@ -157,13 +157,13 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Non se puido establecer o contrasinal do usuario \"root\" de MySQL"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -175,7 +175,7 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -184,41 +184,41 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
+#| "Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
-"Consulte o ficheiro /usr/share/doc/mysql-server-5.5/README.Debian para máis "
+"Consulte o ficheiro /usr/share/doc/mysql-server-5.6/README.Debian para máis "
 "información."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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 ""

Modified: mysql-5.6/trunk/debian/po/it.po
===================================================================
--- mysql-5.5/trunk/debian/po/it.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/it.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,12 +1,12 @@
-# Italian (it) translation of debconf templates for mysql-dfsg-5.5
+# Italian (it) translation of debconf templates for mysql-dfsg-5.6
 # Copyright (C) 2009 Software in the Public Interest
-# This file is distributed under the same license as the mysql-dfsg-5.5 package.
+# This file is distributed under the same license as the mysql-dfsg-5.6 package.
 # Luca Monducci <luca.mo at tiscali.it>, 2006 - 2009.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-5.5 5.5.37 italian debconf templates\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Project-Id-Version: mysql-dfsg-5.6 5.6.8 italian debconf templates\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2009-08-08 11:03+0200\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
@@ -18,20 +18,20 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Procedere realmente con l'abbassamento di versione?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 "Su questo sistema esiste un file con nome /var/lib/mysql/debian-*.flag."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -41,7 +41,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -51,13 +51,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante per gli utenti NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -67,7 +67,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -77,13 +77,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Eliminare tutti i database MySQL?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -93,7 +93,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 +105,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Lanciare il server MySQL all'avvio?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.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 +121,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nuova password per l'utente «root» di MySQL:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -137,25 +137,25 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Se questo campo è lasciato vuoto, la password non viene cambiata."
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Ripetere la password per l'utente «root» di MySQL:"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Impossibile impostare la password per l'utente «root» di MySQL"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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,56 +168,56 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Al termine dell'installazione si deve verificare la password dell'account."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
+#| "Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
 "Per maggiori informazioni si consulti il file /usr/share/doc/mysql-"
-"server-5.5/README.Debian."
+"server-5.6/README.Debian."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr "Errore di inserimento della password"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Le due password inserite sono diverse. Riprovare."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "È in uso un cluster NDB"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 #, fuzzy
 #| msgid ""
-#| "MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the "
+#| "MySQL-5.6 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-5.6 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.5 non fornisce più il supporto per i cluster NDB. Si dovrebbe "
+"MySQL-5.6 non fornisce più il supporto per i cluster NDB. Si dovrebbe "
 "migrare al nuovo pacchetto mysql-cluster e rimuovere tutte le righe che "
 "iniziano per \"ndb\" da tutti i file di configurazione sotto /etc/mysql/."

Modified: mysql-5.6/trunk/debian/po/ja.po
===================================================================
--- mysql-5.5/trunk/debian/po/ja.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/ja.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -14,8 +14,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-5.5 5.5.37-1\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Project-Id-Version: mysql-dfsg-5.6 5.6.8-1\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2009-09-01 08:25+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
@@ -27,13 +27,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "本当にダウングレードを実行しますか?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 "このシステムには  /var/lib/mysql/debian-*.flag という名前のファイルが存在して"
@@ -41,7 +41,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -51,7 +51,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -61,13 +61,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "NIS/YP ユーザへの重要な注意"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -77,7 +77,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -85,13 +85,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "すべての MySQL データベースを削除しますか?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -101,7 +101,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -113,13 +113,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "MySQL をシステム起動時に開始しますか?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -129,13 +129,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "MySQL の \"root\" ユーザに対する新しいパスワード:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -145,25 +145,25 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "この値を空のままにしておいた場合は、パスワードは変更されません。"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "MySQL の \"root\" ユーザに対する新しいパスワード:"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "MySQL の \"root\" ユーザのパスワードを設定できません"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -175,55 +175,55 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "パッケージのインストール後、アカウントのパスワードを確認する必要があります。"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
+#| "Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
-"詳細は /usr/share/doc/mysql-server-5.5/README.Debian を参照してください。"
+"詳細は /usr/share/doc/mysql-server-5.6/README.Debian を参照してください。"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr "パスワード入力エラー"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "入力された二つのパスワードが一致しません。再入力してください。"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "NDB クラスタが利用されているようです"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 #, fuzzy
 #| msgid ""
-#| "MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the "
+#| "MySQL-5.6 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-5.6 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.5 では NDB クラスタのサポートを提供しなくなっています。新たな mysql-"
+"MySQL-5.6 では NDB クラスタのサポートを提供しなくなっています。新たな mysql-"
 "cluster パッケージに移行して、/etc/mysql 以下の設定ファイルすべてから「ndb」"
 "で始まる行を削除してください。"

Modified: mysql-5.6/trunk/debian/po/nb.po
===================================================================
--- mysql-5.5/trunk/debian/po/nb.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/nb.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql_nb\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2007-02-18 12:13+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst at powertech.no>\n"
@@ -19,7 +19,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 #, fuzzy
 #| msgid "Do you really want to downgrade?"
 msgid "Really proceed with downgrade?"
@@ -27,13 +27,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 #, fuzzy
 #| msgid ""
 #| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
@@ -49,7 +49,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -57,7 +57,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -65,7 +65,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -73,7 +73,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -81,13 +81,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -95,7 +95,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 #, fuzzy
 #| msgid ""
 #| "The script is about to remove the data directory /var/lib/mysql. If it is "
@@ -112,7 +112,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 #, fuzzy
 #| msgid "Should MySQL start on boot?"
 msgid "Start the MySQL server on boot?"
@@ -120,7 +120,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 #, fuzzy
 #| msgid ""
 #| "The MySQL can start automatically on boot time or only if you manually "
@@ -134,7 +134,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MySQL \"root\" user:"
@@ -142,7 +142,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -156,13 +156,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MySQL \"root\" user:"
@@ -170,7 +170,7 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MySQL \"root\" user"
@@ -178,7 +178,7 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid ""
 #| "It seems an error occurred while setting the password for the MySQL "
@@ -196,41 +196,41 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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 ""
@@ -246,7 +246,7 @@
 #~| "The way passwords were stored was not very secure. This has been "
 #~| "improved with the drawback that clients (e.g. PHP) from hosts running "
 #~| "Debian 3.1 Sarge will not be able to connect to account which are new or "
-#~| "whose password have been changed. See /usr/share/doc/mysql-server-5.5/"
+#~| "whose password have been changed. See /usr/share/doc/mysql-server-5.6/"
 #~| "README.Debian."
 #~ msgid ""
 #~ "In old versions of MySQL clients on Debian, passwords were not stored "
@@ -257,7 +257,7 @@
 #~ "Passord ble tidligere lagret på en lite sikker måte. Dette er nå "
 #~ "forbedret, med den ulempen at klienter (f.eks. PHP) fra verter som kjører "
 #~ "Debian 3.1 Sarge ikke vil kunne koble til en konto som er ny eller har "
-#~ "fått endret passordet. Se /usr/share/doc/mysql-server-5.5/README.Debian."
+#~ "fått endret passordet. Se /usr/share/doc/mysql-server-5.6/README.Debian."
 
 #~ msgid ""
 #~ "To use mysql you must install an equivalent user and group to the "

Modified: mysql-5.6/trunk/debian/po/nl.po
===================================================================
--- mysql-5.5/trunk/debian/po/nl.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/nl.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,4 +1,4 @@
-# Dutch mysql-dfsg-5.5 po-debconf translation,
+# Dutch mysql-dfsg-5.6 po-debconf translation,
 # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
 #
 # Vincent Zweije <zweije at xs4all.nl>, 2006.
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-5.5 5.5.23-2\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Project-Id-Version: mysql-5.6 5.6.6-1\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2012-05-23 10:26+0200\n"
 "Last-Translator: Jeroen Schot <schot at a-eskwadraat.nl>\n"
@@ -19,20 +19,20 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Wilt u echt een oude versie herstellen?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 "Er bestaat een bestand genaamd /var/lib/mysql/debian-*.flag op dit systeem."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -42,7 +42,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -52,13 +52,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Belangrijke opmerking voor gebruikers van NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -68,7 +68,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -78,13 +78,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Wilt u alle MySQL-databases verwijderen?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -94,7 +94,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -106,13 +106,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Moet MySQL starten als de computer start?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -122,13 +122,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nieuw wachtwoord voor de MySQL \"root\"-gebruiker:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -138,26 +138,26 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 "Als dit veld leeg wordt gelaten, zal het wachtwoord niet worden veranderd."
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Herhaal het wachtwoord voor de MySQL \"root\"-gebruiker:"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Kan het wachtwoord voor de MySQL \"root\"-gebruiker niet instellen"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -170,7 +170,7 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "U zou het wachtwoord van het account moeten controleren nadat het pakket is "
@@ -178,23 +178,23 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
-"Leest u het bestand /usr/share/doc/mysql-server-5.5/README.Debian voor meer "
+"Leest u het bestand /usr/share/doc/mysql-server-5.6/README.Debian voor meer "
 "informatie."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr "Fout bij invoer wachtwoord"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 "De twee wachtwoorden die u hebt ingevoerd zijn niet gelijk. Probeert u het "
@@ -202,18 +202,18 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "De NDB-cluster lijkt in gebruik te zijn"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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.5 biedt niet langer ondersteuning voor NDB Cluster. Migreer naar het "
+"MySQL-5.6 biedt niet langer ondersteuning voor NDB Cluster. Migreer naar het "
 "nieuwe pakket mysql-cluster en verwijder alle regels die beginnen met \"ndb"
 "\" van alle configuratiebestanden onder /etc/mysql/."

Modified: mysql-5.6/trunk/debian/po/pt.po
===================================================================
--- mysql-5.5/trunk/debian/po/pt.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/pt.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,12 +1,12 @@
-# Portuguese translation for mysql-dfsg-5.5's debconf messages
+# Portuguese translation for mysql-dfsg-5.6's debconf messages
 # Copyright (C) 2006 Miguel Figueiredo <elmig at debianpt.org>
-# This file is distributed under the same license as the mysql-dfsg-5.5 package.
+# This file is distributed under the same license as the mysql-dfsg-5.6 package.
 # Miguel Figueiredo <elmig at debianpt.org>, 2012
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-5.5\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Project-Id-Version: mysql-dfsg-5.6\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2012-05-28 22:40+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
@@ -18,20 +18,20 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Deseja mesmo fazer downgrade?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 "Existe, neste sistema, um ficheiro chamado /var/lib/mysql/debian-*.flag."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -41,7 +41,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -51,13 +51,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante para utilizadores de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -67,7 +67,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -76,13 +76,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Remover todas as bases de dados MySQL?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -92,7 +92,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -104,13 +104,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Iniciar o servidor MySQL no arranque?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -120,13 +120,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nova palavra-passe para o utilizador \"root\" do MySQL:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -136,27 +136,27 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 "Se este campo for deixado em branco, a palavra-passe não irá ser alterada."
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Repita a palavra-passe para o utilizador \"root\" de MySQL:"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr ""
 "Não foi possível definir a palavra-passe para o utilizador \"root\" do MySQL"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -169,30 +169,30 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Você deve verificar a palavra-passe da conta após a instalação do pacote."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
 "Para mais informações, por favor leia o ficheiro /usr/share/doc/mysql-"
-"server-5.5/README.Debian."
+"server-5.6/README.Debian."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr "Erro de entrada da palavra-passe"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 "As duas palavras-passe que introduziu não são as mesmas. Por favor tente "
@@ -200,19 +200,19 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "NDB Cluster parece estar a ser utilizado"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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.5 já não disponibiliza suporte para NDB Cluster. Por favor migre "
+"MySQL-5.6 já não disponibiliza suporte para NDB Cluster. Por favor migre "
 "para o novo pacote mysql-cluster-server e remova todas as linhas que comecem "
 "por \"ndb\" em todos os ficheiros de configuração em /etc/mysql/."
 
@@ -230,14 +230,14 @@
 #~ "Recent versions of MySQL can no longer use the old ISAM table format and "
 #~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by "
 #~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". "
-#~ "The installation of mysql-server-5.5 will now abort. In case your old "
+#~ "The installation of mysql-server-5.6 will now abort. In case your old "
 #~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert "
 #~ "those tables."
 #~ msgstr ""
 #~ "As versões recentes de MySQL já não podem utilizar o antigo formato de "
 #~ "tabelas ISAM e é por isso necessário converter as suas tabelas pra e.g. "
 #~ "MyISAM antes da actualização, utilizando \"mysql_convert_table_format\" "
-#~ "ou \"ALTER TABLE x ENGINE=MyISAM\". A instalação de mysql-server-5.5 irá "
+#~ "ou \"ALTER TABLE x ENGINE=MyISAM\". A instalação de mysql-server-5.6 irá "
 #~ "agora ser cancelada. Se o seu antigo mysql-server-4.1 for removido apenas "
 #~ "reinstale para converter essas tabelas."
 

Modified: mysql-5.6/trunk/debian/po/pt_BR.po
===================================================================
--- mysql-5.5/trunk/debian/po/pt_BR.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/pt_BR.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -7,8 +7,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-5.5\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Project-Id-Version: mysql-dfsg-5.6\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2007-04-21 15:59-0300\n"
 "Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
@@ -21,19 +21,19 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Realmente proceder com o rebaixamento de versão?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "Um arquivo de nome /var/lib/mysql/debian-*.flag existe no sistema."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mysql-server package with a higher "
@@ -47,7 +47,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -57,13 +57,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Aviso importante para usuários NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -71,7 +71,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -84,13 +84,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Remover todas as bases de dados do MySQL?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -100,7 +100,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -112,13 +112,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Iniciar o servidor MySQL junto a inicialização da máquina?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -128,13 +128,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nova senha para o usuário \"root\" do MySQL:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -144,7 +144,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.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."
@@ -152,7 +152,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MySQL \"root\" user:"
@@ -160,13 +160,13 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Impossível definir senha para o usuário \"root\" do MySQL"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -179,7 +179,7 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -188,41 +188,41 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
+#| "Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
-"Por favor, leia o arquivo /usr/share/doc/mysql-server-5.5/README.Debian para "
+"Por favor, leia o arquivo /usr/share/doc/mysql-server-5.6/README.Debian para "
 "maiores informações."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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 ""

Modified: mysql-5.6/trunk/debian/po/ro.po
===================================================================
--- mysql-5.5/trunk/debian/po/ro.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/ro.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: po-debconf://mysql-dfsg\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2006-12-20 21:27+0200\n"
 "Last-Translator: stan ioan-eugen <stan.ieugen at gmail.com>\n"
@@ -19,7 +19,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 #, fuzzy
 #| msgid "Do you really want to downgrade?"
 msgid "Really proceed with downgrade?"
@@ -27,13 +27,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 #, fuzzy
 #| msgid ""
 #| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
@@ -50,7 +50,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -58,7 +58,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -66,7 +66,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -74,7 +74,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -82,13 +82,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -96,7 +96,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 #, fuzzy
 #| msgid ""
 #| "The script is about to remove the data directory /var/lib/mysql. If it is "
@@ -113,7 +113,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 #, fuzzy
 #| msgid "Should MySQL start on boot?"
 msgid "Start the MySQL server on boot?"
@@ -121,7 +121,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 #, fuzzy
 #| msgid ""
 #| "The MySQL can start automatically on boot time or only if you manually "
@@ -135,7 +135,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MySQL \"root\" user:"
@@ -143,7 +143,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -157,13 +157,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MySQL \"root\" user:"
@@ -171,7 +171,7 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MySQL \"root\" user"
@@ -179,7 +179,7 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 #, fuzzy
 #| msgid ""
 #| "It seems an error occurred while setting the password for the MySQL "
@@ -197,41 +197,41 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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 ""
@@ -243,7 +243,7 @@
 #~ "Recent versions of MySQL can no longer use the old ISAM table format and "
 #~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by "
 #~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". "
-#~ "The installation of mysql-server-5.5 will now abort. In case your old "
+#~ "The installation of mysql-server-5.6 will now abort. In case your old "
 #~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert "
 #~ "those tables."
 #~ msgstr ""
@@ -251,7 +251,7 @@
 #~ "şieste necesar să convertiţi tabelele dumneavoastră de ex. la formatul "
 #~ "MyISAM înainte de a face actualizarea folosind comanda "
 #~ "„mysql_convert_table_format” sau „ALTER TABLE x ENGINE=MyISAM”. "
-#~ "Instalarea mysql-server-5.5 va eşua. În caz că ştergeţiversiunea "
+#~ "Instalarea mysql-server-5.6 va eşua. În caz că ştergeţiversiunea "
 #~ "anterioară mysql-server-4.1 va trebui reinstalată pentru a converti "
 #~ "tabelele."
 
@@ -266,7 +266,7 @@
 #~| "The way passwords were stored was not very secure. This has been "
 #~| "improved with the drawback that clients (e.g. PHP) from hosts running "
 #~| "Debian 3.1 Sarge will not be able to connect to account which are new or "
-#~| "whose password have been changed. See /usr/share/doc/mysql-server-5.5/"
+#~| "whose password have been changed. See /usr/share/doc/mysql-server-5.6/"
 #~| "README.Debian."
 #~ msgid ""
 #~ "In old versions of MySQL clients on Debian, passwords were not stored "
@@ -278,7 +278,7 @@
 #~ "fost îmbunătăţitcu dezajantajul că clienţii (de ex. PHP) de pe staţii ce "
 #~ "rulează sistemul Debian 3.1 Sargenu se vor putea conecta la conturi noi "
 #~ "sau ale căror parole au fost schimbate. Citiţi /usr/share/doc/mysql-"
-#~ "server-5.5/README.Debian."
+#~ "server-5.6/README.Debian."
 
 #~ msgid ""
 #~ "To use mysql you must install an equivalent user and group to the "

Modified: mysql-5.6/trunk/debian/po/ru.po
===================================================================
--- mysql-5.5/trunk/debian/po/ru.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/ru.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -16,8 +16,8 @@
 # Yuri Kozlov <yuray at komyakino.ru>, 2009, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-5.5 5.5.23-2\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Project-Id-Version: mysql-dfsg-5.6 5.6.8-1\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2012-05-23 21:14+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
@@ -32,19 +32,19 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Действительно установить более старую версию?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "В системе найден файл /var/lib/mysql/debian-*.flag."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -54,7 +54,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -64,13 +64,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Важное замечание для пользователей NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -80,7 +80,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -88,13 +88,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Удалить все базы данных MySQL?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -103,7 +103,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -115,13 +115,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Запускать MySQL при загрузке системы?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -131,13 +131,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Новый пароль для MySQL пользователя «root»:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -147,25 +147,25 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Если оставить поле пустым, то пароль изменён не будет."
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Повторите ввод пароля для MySQL пользователя «root»:"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Невозможно задать пароль MySQL пользователю «root»"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -177,44 +177,44 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr "Проверьте пароль учётной записи после установки пакета."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
-msgstr "Подробности см. в файле /usr/share/doc/mysql-server-5.5/README.Debian."
+msgstr "Подробности см. в файле /usr/share/doc/mysql-server-5.6/README.Debian."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr "Ошибка ввода пароля"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Два введённых пароля не одинаковы. Повторите ввод."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "NDB Cluster уже используется"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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.5 больше не поддерживает NDB Cluster. Переходите на новый пакет "
+"MySQL-5.6 больше не поддерживает NDB Cluster. Переходите на новый пакет "
 "mysql-cluster-server и удалите все строки, начинающиеся с «ndb», из всех "
 "файлов настройки в каталоге /etc/mysql/."

Modified: mysql-5.6/trunk/debian/po/sk.po
===================================================================
--- mysql-5.5/trunk/debian/po/sk.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/sk.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-5.1 5.1.49-3\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2011-01-04 12:55+0100\n"
 "Last-Translator: Slavko <linux at slavino.sk>\n"
@@ -20,19 +20,19 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Naozaj pokračovať v znížení verzie?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "Súbor s menom /var/lib/mysql/debian-*.flag už v systéme existuje."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -42,7 +42,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -52,13 +52,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Dôležitá poznámka pre používateľov NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -68,7 +68,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -77,13 +77,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Odstrániť všetky databázy MySQL?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -92,7 +92,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -103,13 +103,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Spúšťať MySQL server pri štarte systému?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -119,13 +119,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nové heslo MySQL používateľa „root”:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -135,25 +135,25 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Ak toto pole ponecháte prázdne, heslo nebude zmenené."
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Zopakujte heslo MySQL používateľa „root“:"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Nemožno nastaviť heslo MySQL používateľa „root“"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -165,19 +165,19 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr "Po inštalácii balíka by ste mali skontrolovať heslo účtu."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
 "Ďalšie podrobností nájdete v súbore /usr/share/doc/mysql-server-5.1/README."
@@ -185,32 +185,32 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr "Chyba pri zadávaní hesla"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Heslá, ktoré ste zadali sa nezhodujú. Skúste prosím znova."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "Vyzerá to, že používate NDB Cluster"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.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-5.6 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 ""

Modified: mysql-5.6/trunk/debian/po/sv.po
===================================================================
--- mysql-5.5/trunk/debian/po/sv.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/sv.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,13 +1,13 @@
-# Translation of mysql-5.5 debconf template to Swedish
+# Translation of mysql-5.6 debconf template to Swedish
 # Copyright (C) 2009, 2012 Martin Bagge <brother at bsnet.se>
-# This file is distributed under the same license as the mysql-5.5 package.
+# This file is distributed under the same license as the mysql-5.6 package.
 # 
 # Andreas Henriksson <andreas at fatal.se>, 2007
 # Martin Bagge <brother at bsnet.se>, 2009, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-5.5 5.0.21-3\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Project-Id-Version: mysql-dfsg-5.6 5.0.21-3\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: 2012-05-30 00:29+0100\n"
 "Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
@@ -21,19 +21,19 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Vill du verkligen genomföra nedgraderingen?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "En fil med namnet /var/lib/mysql/debian-*.flag hittades i systemet."
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -43,7 +43,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -53,13 +53,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Viktig information för NIS/YP-användare"
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -69,7 +69,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -79,13 +79,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Ta bort alla MySQL-databaser?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -94,7 +94,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -106,13 +106,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Ska MySQL startas vid systemets uppstart?"
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -122,13 +122,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nytt lösenord för MySQLs \"root\"-användare:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -138,25 +138,25 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Om detta fält lämnas tom kommer lösenordet inte att ändras."
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Repetera lösenordet för MySQLs \"root\"-användare:"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Kunde inte sätta lösenord för MySQLs \"root\"-användare"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -169,46 +169,46 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr "Du bör kontrollera kontots lösenord efter installationen av paketet."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
-"Läs filen /usr/share/doc/mysql-server-5.5/README.Debian för mer information."
+"Läs filen /usr/share/doc/mysql-server-5.6/README.Debian för mer information."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr "Fel vid inmatning av lösenord"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "De två lösenorden du angav stämde inte överrens. Prova igen."
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "NDB-kluster används inte"
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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 ""
-"Stödet för NDB-kluster har tagits bort i MySQL-5.5. Migrera till det nya "
+"Stödet för NDB-kluster har tagits bort i MySQL-5.6. Migrera till det nya "
 "paketet mysql-cluster-server  och ta bort alla rader som inleds med \"ndb\" "
 "från alla inställlningsfiler i /etc/mysql/."
 

Modified: mysql-5.6/trunk/debian/po/templates.pot
===================================================================
--- mysql-5.5/trunk/debian/po/templates.pot	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/templates.pot	2013-01-15 13:30:06 UTC (rev 2209)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
@@ -19,19 +19,19 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -39,7 +39,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -47,13 +47,13 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -61,7 +61,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -69,13 +69,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -83,7 +83,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -92,13 +92,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -106,13 +106,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -120,25 +120,25 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -147,41 +147,41 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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 ""

Modified: mysql-5.6/trunk/debian/po/tr.po
===================================================================
--- mysql-5.5/trunk/debian/po/tr.po	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/po/tr.po	2013-01-15 13:30:06 UTC (rev 2209)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
-"Report-Msgid-Bugs-To: mysql-5.5 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: mysql-5.6 at 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 at iaslan.com>\n"
@@ -18,19 +18,19 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -38,7 +38,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:2001
+#: ../mysql-server-5.6.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -46,7 +46,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -54,7 +54,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -62,7 +62,7 @@
 
 #. Type: note
 #. Description
-#: ../mysql-server-5.5.templates:3001
+#: ../mysql-server-5.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -70,13 +70,13 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
@@ -84,7 +84,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:4001
+#: ../mysql-server-5.6.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 "
@@ -93,7 +93,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 #, fuzzy
 #| msgid "Should MySQL start on boot?"
 msgid "Start the MySQL server on boot?"
@@ -101,7 +101,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mysql-server-5.5.templates:5001
+#: ../mysql-server-5.6.templates:5001
 #, fuzzy
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
@@ -113,13 +113,13 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -127,25 +127,25 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:6001
+#: ../mysql-server-5.6.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.5.templates:7001
+#: ../mysql-server-5.6.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.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 "
@@ -154,41 +154,41 @@
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:8001
+#: ../mysql-server-5.6.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
+"Please read the /usr/share/doc/mysql-server-5.6/README.Debian file for more "
 "information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:9001
+#: ../mysql-server-5.6.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mysql-server-5.5.templates:10001
+#: ../mysql-server-5.6.templates:10001
 msgid ""
-"MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
+"MySQL-5.6 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 ""

Modified: mysql-5.6/trunk/debian/rules
===================================================================
--- mysql-5.5/trunk/debian/rules	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/rules	2013-01-15 13:30:06 UTC (rev 2209)
@@ -3,7 +3,7 @@
 export DH_VERBOSE=1
 export DEB_BUILD_HARDENING=1
 
-PACKAGE:=mysql-5.5
+PACKAGE:=mysql-5.6
 
 TMP:=$(CURDIR)/debian/tmp/
 
@@ -28,11 +28,11 @@
 DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-EXPORTED_SOURCE_TARBALL := debian/mysql-source-5.5.tar.gz
+EXPORTED_SOURCE_TARBALL := debian/mysql-source-5.6.tar.gz
 
 DISTRIBUTION := $(shell lsb_release -i -s)
 
-MAKE_TEST_TARGET:=test-force
+MAKE_TEST_TARGET:=test
 ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)
 # make test-bt is the testsuite run by the MySQL build team 
 # before a release, but it is long
@@ -88,7 +88,7 @@
 	    	CC=$${MYSQL_BUILD_CC:-gcc} \
 		CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -DBIG_JOINS=1 ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \
 	    	CXX=$${MYSQL_BUILD_CXX:-g++} \
-	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \
+	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fpermissive -fno-rtti ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \
 	    cmake -DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_VERBOSE_MAKEFILE=ON \
 		$(FORCE_FPIC) \
@@ -120,7 +120,7 @@
 	@echo "RULES.$@"
 	[ -f $(EXPORTED_SOURCE_TARBALL) ] || tar -zcf $(EXPORTED_SOURCE_TARBALL) \
 	--exclude=debian . \
-	--transform="s,^\./,mysql-5.5/,"
+	--transform="s,^\./,mysql-5.6/,"
 	cd $(builddir) && $(MAKE)
 	touch $@
 
@@ -161,8 +161,8 @@
 	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
-	nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mysql-server-5.5/mysqld.sym.gz
+	mkdir -p $(TMP)/usr/share/doc/mysql-server-5.6
+	nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mysql-server-5.6/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/
@@ -172,7 +172,7 @@
 	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/*.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]/*
@@ -183,10 +183,10 @@
 #       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
+#       usr/share/mysql/magic                           M-server-5.6    example
+#       usr/bin/mysqlaccess.conf                        M-client-5.6    example
+#       usr/lib/mysql/plugin/daemon_example.ini         M-server-5.6    example
+#       usr/share/mysql/my-                             M-server-5.6    example
 # The following exclusions have been inherited from pre short form
 # debian/rules days.
 #        usr/share/mysql/mi_test_all
@@ -196,8 +196,10 @@
 override_dh_install:
 	dh_install --fail-missing                       \
         -Xusr/share/man/                                \
+        -Xusr/share/info/mysql.info                     \
         -Xlibmysqlclient_r.so                           \
         -Xusr/share/mysql/magic                         \
+	-Xusr/share/mysql/solaris/postinstall-solaris	\
         -Xusr/lib/mysql/plugin/daemon_example.ini       \
         -Xusr/bin/mysqlaccess.conf                      \
         -Xusr/share/mysql/mi_test_all                   \
@@ -227,7 +229,7 @@
 override_dh_installlogrotate-arch:
 	dh_installlogrotate --name mysql-server
 	if [ "$(DISTRIBUTION)" = "Ubuntu" ]; then \
-	  dh_apparmor -pmysql-server-5.5 --profile-name=usr.sbin.mysqld; \
+	  dh_apparmor -pmysql-server-5.6 --profile-name=usr.sbin.mysqld; \
 	fi
 
 override_dh_installchangelogs:
@@ -242,7 +244,7 @@
 	dh_installcron --name mysql-server
 
 override_dh_makeshlibs-arch:
-	dh_makeshlibs -plibmysqlclient18 -V'libmysqlclient18 (>= 5.5.24+dfsg-1)'
+	dh_makeshlibs -plibmysqlclient18 -V'libmysqlclient18 (>= 5.6.8-rc+dfsg-1)'
 
 binary:	binary-indep binary-arch
 

Modified: mysql-5.6/trunk/debian/source.lintian-overrides
===================================================================
--- mysql-5.5/trunk/debian/source.lintian-overrides	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/source.lintian-overrides	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,7 +1,7 @@
-# The mysql-server-5.5.postrm script handles 
+# The mysql-server-5.6.postrm script handles 
 # what debhelper normally would.
 # This is apparently related to #526464.
-maintainer-script-lacks-debhelper-token debian/mysql-server-5.5.postrm
+maintainer-script-lacks-debhelper-token debian/mysql-server-5.6.postrm
 # Probably best to keep the debhelper version low in
 # case someone needs to backport
 package-needs-versioned-debhelper-build-depends 9

Modified: mysql-5.6/trunk/debian/watch
===================================================================
--- mysql-5.5/trunk/debian/watch	2012-11-29 09:59:20 UTC (rev 2204)
+++ mysql-5.6/trunk/debian/watch	2013-01-15 13:30:06 UTC (rev 2209)
@@ -1,8 +1,5 @@
 # See debian/README.source for more information about the DFSG repacking here.
 version=3
 opts=dversionmangle=s/\+dfsg\d*$// \
-    http://mysql.linux.cz/Downloads/MySQL-5.5/mysql-([\d\.]+).tar.gz \
+    http://mirror.cogentco.com/pub/mysql/MySQL-5.6/mysql-([\d\.]+-rc).tar.gz \
     debian sh debian/repack.sh
-opts=dversionmangle=s/\+dfsg\d*$// \
-    http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/mysql-([\d\.]+).tar.gz \
-    debian sh debian/repack.sh




More information about the Pkg-mysql-commits mailing list