set version to 10.1.0

73 files changed, 670 insertions, 664 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 882cc4d9a54..849da49d82a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -457,8 +457,8 @@ CONFIGURE_FILE(
 
 IF(DEB)
   CONFIGURE_FILE(
-    ${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.0.files.in
-    ${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.0.files)
+    ${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.1.files.in
+    ${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.1.files)
 ENDIF(DEB)
 
 # Handle the "INFO_*" files.
diff --git a/VERSION b/VERSION
index 0141f2b7e10..2894e9342e2 100644
--- a/VERSION
+++ b/VERSION
@@ -3,6 +3,6 @@
 # MYSQL_VERSION_MAJOR.MYSQL_VERSION_MINOR.MYSQL_VERSION_PATCH-MYSQL_VERSION_EXTRA
 #
 MYSQL_VERSION_MAJOR=10
-MYSQL_VERSION_MINOR=0
-MYSQL_VERSION_PATCH=11
+MYSQL_VERSION_MINOR=1
+MYSQL_VERSION_PATCH=0
 MYSQL_VERSION_EXTRA=
diff --git a/debian/changelog b/debian/changelog
index b22466b6277..4d0d74b12c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mariadb-10.1 (10.1.0) unstable; urgency=low
+
+  * Initial release.
+
+ -- Sergei Golubchik <serg@askmonty.org>  Fri, 23 May 2014 09:44:38 -0200
+
 mariadb-10.0 (10.0.0) unstable; urgency=low
 
   * Initial release.
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index e01350a14eb..bbee264ffc3 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -1,4 +1,4 @@
-Source: mariadb-10.0
+Source: mariadb-10.1
 Section: misc
 Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
@@ -7,7 +7,7 @@ Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
 Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev
 Standards-Version: 3.8.3
 Homepage: http://mariadb.org/
-Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
+Vcs-Browser: https://github.com/MariaDB/server/tree/10.1/
 Vcs-Bzr: bzr://lp:maria
 
 Package: libmariadbclient18
@@ -96,7 +96,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
  This package includes files needed by all versions of the client library
  (e.g. /etc/mysql/conf.d/mariadb.cnf).
 
-Package: mariadb-client-core-10.0
+Package: mariadb-client-core-10.1
 Architecture: any
 Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5
@@ -120,11 +120,11 @@ Description: MariaDB database core client binaries
  .
  This package includes the core client files, as used by Akonadi.
 
-Package: mariadb-client-10.0
+Package: mariadb-client-10.1
 Architecture: any
 Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202),
     mariadb-common, libmariadbclient18 (>= ${source:Version}),
-    mariadb-client-core-10.0 (>= ${source:Version}), ${perl:Depends},
+    mariadb-client-core-10.1 (>= ${source:Version}), ${perl:Depends},
     ${shlibs:Depends}, ${misc:Depends}
 Suggests: libterm-readkey-perl
 Provides: virtual-mysql-client, mysql-client,
@@ -145,7 +145,7 @@ Description: MariaDB database client binaries
  This package includes the client binaries and the additional tools
  innotop and mysqlreport.
 
-Package: mariadb-server-core-10.0
+Package: mariadb-server-core-10.1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
 Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
@@ -169,10 +169,10 @@ Description: MariaDB database core server files
  .
  This package includes the core server files, as used by Akonadi.
 
-Package: mariadb-test-10.0
+Package: mariadb-test-10.1
 Section: database
 Architecture: any
-Depends: mariadb-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version})
+Depends: mariadb-server-10.1 (= ${source:Version}), mariadb-client-10.1 (= ${source:Version})
 Conflicts: mariadb-test (<< ${source:Version}),
     mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
     mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
@@ -187,12 +187,12 @@ Description: MariaDB database regression test suite
  .
  This package includes the regression test suite.
 
-Package: mariadb-server-10.0
+Package: mariadb-server-10.1
 Architecture: any
 Suggests: tinyca, mailx, mariadb-test
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version})
+Depends: mariadb-client-10.1 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.1 (>= ${binary:Version})
 Provides: mariadb-server, mysql-server, virtual-mysql-server
 Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
@@ -214,10 +214,10 @@ Description: MariaDB database server binaries
 Package: mariadb-server
 Section: database
 Architecture: all
-Depends: mariadb-server-10.0 (= ${source:Version}), ${misc:Depends}
+Depends: mariadb-server-10.1 (= ${source:Version}), ${misc:Depends}
 Description: MariaDB database server (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-server (currently mariadb-server-10.0), as determined by the MariaDB
+ mariadb-server (currently mariadb-server-10.1), as determined by the MariaDB
  maintainers. Install this package if in doubt about which MariaDB
  version you need. That will install the version recommended by the
  package maintainers.
@@ -230,36 +230,36 @@ Description: MariaDB database server (metapackage depending on the latest versio
 Package: mariadb-client
 Section: database
 Architecture: all
-Depends: mariadb-client-10.0 (= ${source:Version}), ${misc:Depends}
+Depends: mariadb-client-10.1 (= ${source:Version}), ${misc:Depends}
 Description: MariaDB database client (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-client (currently mariadb-client-10.0), as determined by the MariaDB
+ mariadb-client (currently mariadb-client-10.1), as determined by the MariaDB
  maintainers.  Install this package if in doubt about which MariaDB version
  you want, as this is the one we consider to be in the best shape.
 
 Package: mariadb-test
 Section: database
 Architecture: all
-Depends: mariadb-test-10.0 (= ${source:Version})
+Depends: mariadb-test-10.1 (= ${source:Version})
 Description: MariaDB database regression test suite (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-test (currently mariadb-test-10.0), as determined by the MariaDB
+ mariadb-test (currently mariadb-test-10.1), as determined by the MariaDB
  maintainers.
 
-Package: mariadb-connect-engine-10.0
+Package: mariadb-connect-engine-10.1
 Section: database
 Architecture: any
-Depends: mariadb-server-10.0, unixODBC, libxml2
-Build-depends: mariadb-server-10.0, unixODBC-dev, libxml2-dev
+Depends: mariadb-server-10.1, unixODBC, libxml2
+Build-Depends: mariadb-server-10.1, unixODBC-dev, libxml2-dev
 Description: Connect storage engine for MariaDB
  Connect engine supports a number of file formats (dbf, xml, txt, bin, etc),
  connections to ODBC tables and remote MySQL tables, as well as a number of
  other interesting features.
 
-Package: mariadb-oqgraph-engine-10.0
+Package: mariadb-oqgraph-engine-10.1
 Section: database
 Architecture: any
-Depends: mariadb-server-10.0, libjudydebian1
+Depends: mariadb-server-10.1, libjudydebian1
 Description: Oqgraph storage engine for MariaDB
  The OQGRAPH engine is a computation engine plugin for handling hierarchies
  (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL.
diff --git a/debian/dist/Debian/mariadb-server-10.0.README.Debian b/debian/dist/Debian/mariadb-server-10.1.README.Debian
index f398f2fa236..f398f2fa236 100644
--- a/debian/dist/Debian/mariadb-server-10.0.README.Debian
+++ b/debian/dist/Debian/mariadb-server-10.1.README.Debian
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.dirs b/debian/dist/Debian/mariadb-server-10.1.dirs
index 320299b17ca..64b49db4af9 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.dirs
+++ b/debian/dist/Debian/mariadb-server-10.1.dirs
@@ -5,6 +5,6 @@ usr/bin
 usr/sbin
 usr/share/man/man8
 usr/share/mysql
-usr/share/doc/mariadb-server-10.0
+usr/share/doc/mariadb-server-10.1
 var/run/mysqld
 var/lib/mysql-upgrade
diff --git a/debian/dist/Debian/mariadb-server-10.0.files.in b/debian/dist/Debian/mariadb-server-10.1.files.in
index c56816fb3ba..6848de09619 100644
--- a/debian/dist/Debian/mariadb-server-10.0.files.in
+++ b/debian/dist/Debian/mariadb-server-10.1.files.in
@@ -42,10 +42,10 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
-usr/share/doc/mariadb-server-10.0/mysqld.sym.gz
-usr/share/doc/mariadb-server-10.0/INFO_SRC
-usr/share/doc/mariadb-server-10.0/INFO_BIN
-usr/share/lintian/overrides/mariadb-server-10.0
+usr/share/doc/mariadb-server-10.1/mysqld.sym.gz
+usr/share/doc/mariadb-server-10.1/INFO_SRC
+usr/share/doc/mariadb-server-10.1/INFO_BIN
+usr/share/lintian/overrides/mariadb-server-10.1
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/myisamchk.1
 usr/share/man/man1/myisam_ftdump.1
diff --git a/debian/dist/Debian/mariadb-server-10.0.postinst b/debian/dist/Debian/mariadb-server-10.1.postinst
index 9f79b61fd05..88de8a5126a 100644
--- a/debian/dist/Debian/mariadb-server-10.0.postinst
+++ b/debian/dist/Debian/mariadb-server-10.1.postinst
@@ -135,7 +135,7 @@ EOF
     db_set mysql-server/postrm_remove_database false || true
 
     # To avoid downgrades.
-    touch $mysql_statedir/debian-10.0.flag
+    touch $mysql_statedir/debian-10.1.flag
 
     # initiate databases. Output is not allowed by debconf :-(
     # This will fail if we are upgrading an existing database; in this case
diff --git a/debian/dist/Debian/mariadb-server-10.0.postrm b/debian/dist/Debian/mariadb-server-10.1.postrm
index 469b1627aff..469b1627aff 100644
--- a/debian/dist/Debian/mariadb-server-10.0.postrm
+++ b/debian/dist/Debian/mariadb-server-10.1.postrm
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules
index bed252ed895..3072d5d76a8 100755
--- a/debian/dist/Debian/rules
+++ b/debian/dist/Debian/rules
@@ -3,7 +3,7 @@
 export DH_VERBOSE=1
 export DEB_BUILD_HARDENING=1
 
-PACKAGE=mariadb-10.0
+PACKAGE=mariadb-10.1
 
 include /usr/share/dpatch/dpatch.make
 
@@ -163,22 +163,22 @@ install: build
 
 	# mariadb-server
 	install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe
-	mkdir -p $(TMP)/usr/share/doc/mariadb-server-10.0/examples
+	mkdir -p $(TMP)/usr/share/doc/mariadb-server-10.1/examples
 	# We have a sane my.cnf, cruft not needed (remove my-*.cnf and config-*.cnf)
-	#  $(TMP)/usr/share/mysql/*cnf      $(TMP)/usr/share/doc/mariadb-server-10.0/examples/
+	#  $(TMP)/usr/share/mysql/*cnf      $(TMP)/usr/share/doc/mariadb-server-10.1/examples/
 	rm -vf $(TMP)/usr/share/mysql/my-*.cnf \
 	       $(TMP)/usr/share/mysql/config-*.cnf \
 	       $(TMP)/usr/share/mysql/mi_test_all* \
 	       $(TMP)/usr/share/mysql/mysql-log-rotate \
 	       $(TMP)/usr/share/mysql/mysql.server \
 	       $(TMP)/usr/share/mysql/binary-configure
-	nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-server-10.0/mysqld.sym.gz
+	nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-server-10.1/mysqld.sym.gz
 	install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
 	install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
 	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
 
-	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_SRC
-	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_BIN
+	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-10.1/INFO_SRC
+	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.1/INFO_BIN
 
 	# mariadb-test
 	mv $(TMP)/usr/mysql-test	$(TMP)/usr/share/mysql
@@ -186,14 +186,14 @@ install: build
 	# lintian overrides
 	mkdir -p $(TMP)/usr/share/lintian/overrides/
 	cp debian/mysql-common.lintian-overrides      $(TMP)/usr/share/lintian/overrides/mysql-common
-	cp debian/mariadb-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-10.0
-	cp debian/mariadb-client-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-10.0
+	cp debian/mariadb-server-10.1.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-10.1
+	cp debian/mariadb-client-10.1.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-10.1
 
-	# For 5.0 -> 10.0 transition
+	# For 5.0 -> 10.1 transition
 	d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
 	mkdir -p $$d; \
-	cp debian/mariadb-server-10.0.mysql.init $$d/_etc_init.d_mysql; \
-	cp debian/mariadb-server-10.0.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
+	cp debian/mariadb-server-10.1.mysql.init $$d/_etc_init.d_mysql; \
+	cp debian/mariadb-server-10.1.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
 	cp debian/additions/debian-start $$d/_etc_mysql_debian-start;
 
 	autorm=debian/autorm-file;                                      \
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index b663c6e9cc9..ffcd1e5dca6 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -1,4 +1,4 @@
-Source: mariadb-10.0
+Source: mariadb-10.1
 Section: misc
 Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
@@ -7,7 +7,7 @@ Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
 Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev
 Standards-Version: 3.8.2
 Homepage: http://mariadb.org/
-Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
+Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.1/files
 Vcs-Bzr: bzr://lp:maria
 
 Package: libmariadbclient18
@@ -96,7 +96,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
  This package includes files needed by all versions of the client library
  (e.g. /etc/mysql/conf.d/mariadb.cnf).
 
-Package: mariadb-client-core-10.0
+Package: mariadb-client-core-10.1
 Architecture: any
 Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5
@@ -120,11 +120,11 @@ Description: MariaDB database core client binaries
  .
  This package includes the core client files, as used by Akonadi.
 
-Package: mariadb-client-10.0
+Package: mariadb-client-10.1
 Architecture: any
 Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202),
     mariadb-common, libmariadbclient18 (>= ${source:Version}),
-    mariadb-client-core-10.0 (>= ${source:Version}), ${perl:Depends},
+    mariadb-client-core-10.1 (>= ${source:Version}), ${perl:Depends},
     ${shlibs:Depends}, ${misc:Depends}
 Suggests: libterm-readkey-perl
 Provides: virtual-mysql-client, mysql-client,
@@ -145,7 +145,7 @@ Description: MariaDB database client binaries
  This package includes the client binaries and the additional tools
  innotop and mysqlreport.
 
-Package: mariadb-server-core-10.0
+Package: mariadb-server-core-10.1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
 Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
@@ -163,10 +163,10 @@ Description: MariaDB database core server files
  .
  This package includes the core server files, as used by Akonadi.
 
-Package: mariadb-test-10.0
+Package: mariadb-test-10.1
 Section: database
 Architecture: any
-Depends: mariadb-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version})
+Depends: mariadb-server-10.1 (= ${source:Version}), mariadb-client-10.1 (= ${source:Version})
 Suggests: patch
 Conflicts: mariadb-test (<< ${source:Version}),
     mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
@@ -181,12 +181,12 @@ Description: MariaDB database regression test suite
  .
  This package includes the regression test suite.
 
-Package: mariadb-server-10.0
+Package: mariadb-server-10.1
 Architecture: any
 Suggests: tinyca, mailx, mariadb-test
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version})
+Depends: mariadb-client-10.1 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.1 (>= ${binary:Version})
 Provides: mariadb-server, mysql-server, virtual-mysql-server
 Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
@@ -208,10 +208,10 @@ Description: MariaDB database server binaries
 Package: mariadb-server
 Section: database
 Architecture: all
-Depends: mariadb-server-10.0 (= ${source:Version}), ${misc:Depends}
+Depends: mariadb-server-10.1 (= ${source:Version}), ${misc:Depends}
 Description: MariaDB database server (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-server (currently mariadb-server-10.0), as determined by the MariaDB
+ mariadb-server (currently mariadb-server-10.1), as determined by the MariaDB
  maintainers. Install this package if in doubt about which MariaDB
  version you need. That will install the version recommended by the
  package maintainers.
@@ -224,36 +224,36 @@ Description: MariaDB database server (metapackage depending on the latest versio
 Package: mariadb-client
 Section: database
 Architecture: all
-Depends: mariadb-client-10.0 (= ${source:Version}), ${misc:Depends}
+Depends: mariadb-client-10.1 (= ${source:Version}), ${misc:Depends}
 Description: MariaDB database client (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-client (currently mariadb-client-10.0), as determined by the MariaDB
+ mariadb-client (currently mariadb-client-10.1), as determined by the MariaDB
  maintainers.  Install this package if in doubt about which MariaDB version
  you want, as this is the one we consider to be in the best shape.
 
 Package: mariadb-test
 Section: database
 Architecture: all
-Depends: mariadb-test-10.0 (= ${source:Version})
+Depends: mariadb-test-10.1 (= ${source:Version})
 Description: MariaDB database regression test suite (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-test (currently mariadb-test-10.0), as determined by the MariaDB
+ mariadb-test (currently mariadb-test-10.1), as determined by the MariaDB
  maintainers.
 
-Package: mariadb-connect-engine-10.0
+Package: mariadb-connect-engine-10.1
 Section: database
 Architecture: any
-Depends: mariadb-server-10.0, unixODBC, libxml2
-Build-depends: mariadb-server-10.0, unixODBC-dev, libxml2-dev
+Depends: mariadb-server-10.1, unixODBC, libxml2
+Build-Depends: mariadb-server-10.1, unixODBC-dev, libxml2-dev
 Description: Connect storage engine for MariaDB
  Connect engine supports a number of file formats (dbf, xml, txt, bin, etc),
  connections to ODBC tables and remote MySQL tables, as well as a number of
  other interesting features.
 
-Package: mariadb-oqgraph-engine-10.0
+Package: mariadb-oqgraph-engine-10.1
 Section: database
 Architecture: any
-Depends: mariadb-server-10.0, libjudydebian1
+Depends: mariadb-server-10.1, libjudydebian1
 Description: Oqgraph storage engine for MariaDB
  The OQGRAPH engine is a computation engine plugin for handling hierarchies
  (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL.
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.README.Debian b/debian/dist/Ubuntu/mariadb-server-10.1.README.Debian
index 741243f1ec3..741243f1ec3 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.README.Debian
+++ b/debian/dist/Ubuntu/mariadb-server-10.1.README.Debian
diff --git a/debian/dist/Debian/mariadb-server-10.0.dirs b/debian/dist/Ubuntu/mariadb-server-10.1.dirs
index 320299b17ca..64b49db4af9 100644
--- a/debian/dist/Debian/mariadb-server-10.0.dirs
+++ b/debian/dist/Ubuntu/mariadb-server-10.1.dirs
@@ -5,6 +5,6 @@ usr/bin
 usr/sbin
 usr/share/man/man8
 usr/share/mysql
-usr/share/doc/mariadb-server-10.0
+usr/share/doc/mariadb-server-10.1
 var/run/mysqld
 var/lib/mysql-upgrade
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files.in b/debian/dist/Ubuntu/mariadb-server-10.1.files.in
index f489b29081e..5ded0622302 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.files.in
+++ b/debian/dist/Ubuntu/mariadb-server-10.1.files.in
@@ -14,7 +14,7 @@ usr/lib/mysql/plugin/sql_errlog.so
 usr/lib/mysql/plugin/server_audit.so
 usr/lib/libhsclient.so.*
 etc/apparmor.d/usr.sbin.mysqld
-usr/share/apport/package-hooks/source_mariadb-10.0.py
+usr/share/apport/package-hooks/source_mariadb-10.1.py
 etc/mysql/debian-start
 etc/mysql/conf.d/mysqld_safe_syslog.cnf
 usr/bin/msql2mysql
@@ -44,10 +44,10 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
-usr/share/doc/mariadb-server-10.0/mysqld.sym.gz
-usr/share/doc/mariadb-server-10.0/INFO_SRC
-usr/share/doc/mariadb-server-10.0/INFO_BIN
-usr/share/lintian/overrides/mariadb-server-10.0
+usr/share/doc/mariadb-server-10.1/mysqld.sym.gz
+usr/share/doc/mariadb-server-10.1/INFO_SRC
+usr/share/doc/mariadb-server-10.1/INFO_BIN
+usr/share/lintian/overrides/mariadb-server-10.1
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/myisamchk.1
 usr/share/man/man1/myisam_ftdump.1
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.postinst b/debian/dist/Ubuntu/mariadb-server-10.1.postinst
index 6e81fdba7ce..73e125b9651 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.postinst
+++ b/debian/dist/Ubuntu/mariadb-server-10.1.postinst
@@ -136,7 +136,7 @@ EOF
     db_set mysql-server/postrm_remove_database false || true
 
     # To avoid downgrades.
-    touch $mysql_statedir/debian-10.0.flag
+    touch $mysql_statedir/debian-10.1.flag
 
     # initiate databases. Output is not allowed by debconf :-(
     # This will fail if we are upgrading an existing database; in this case
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.postrm b/debian/dist/Ubuntu/mariadb-server-10.1.postrm
index 7cee5150ef9..7cee5150ef9 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.postrm
+++ b/debian/dist/Ubuntu/mariadb-server-10.1.postrm
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.py b/debian/dist/Ubuntu/mariadb-server-10.1.py
index b0537b4bd6b..fe5029d056c 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.py
+++ b/debian/dist/Ubuntu/mariadb-server-10.1.py
@@ -1,4 +1,4 @@
-'''apport package hook for mariadb-10.0
+'''apport package hook for mariadb-10.1
 
 (c) 2009 Canonical Ltd.
 Author: Mathias Gug <mathias.gug@canonical.com>
@@ -20,7 +20,7 @@ def _add_my_conf_files(report, filename):
             continue
 
 def add_info(report):
-    attach_conffiles(report, 'mariadb-server-10.0', conffiles=None)
+    attach_conffiles(report, 'mariadb-server-10.1', conffiles=None)
     key = 'Logs' + path_to_key('/var/log/daemon.log')
     report[key] = ""
     for line in read_file('/var/log/daemon.log').split('\n'):
diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules
index 2dc570a182c..95fec9d4bd3 100755
--- a/debian/dist/Ubuntu/rules
+++ b/debian/dist/Ubuntu/rules
@@ -3,7 +3,7 @@
 export DH_VERBOSE=1
 export DEB_BUILD_HARDENING=1
 
-PACKAGE=mariadb-10.0
+PACKAGE=mariadb-10.1
 
 include /usr/share/dpatch/dpatch.make
 
@@ -163,22 +163,22 @@ install: build
 
 	# mariadb-server
 	install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe
-	mkdir -p $(TMP)/usr/share/doc/mariadb-server-10.0/examples
+	mkdir -p $(TMP)/usr/share/doc/mariadb-server-10.1/examples
 	# We have a sane my.cnf, cruft not needed (remove my-*.cnf and config-*.cnf)
-	#  $(TMP)/usr/share/mysql/*cnf      $(TMP)/usr/share/doc/mariadb-server-10.0/examples/
+	#  $(TMP)/usr/share/mysql/*cnf      $(TMP)/usr/share/doc/mariadb-server-10.1/examples/
 	rm -vf $(TMP)/usr/share/mysql/my-*.cnf \
 	       $(TMP)/usr/share/mysql/config-*.cnf \
 	       $(TMP)/usr/share/mysql/mi_test_all* \
 	       $(TMP)/usr/share/mysql/mysql-log-rotate \
 	       $(TMP)/usr/share/mysql/mysql.server \
 	       $(TMP)/usr/share/mysql/binary-configure
-	nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-server-10.0/mysqld.sym.gz
+	nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-server-10.1/mysqld.sym.gz
 	install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
 	install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
 	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
 
-	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_SRC
-	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_BIN
+	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-10.1/INFO_SRC
+	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.1/INFO_BIN
 
 	# mariadb-test
 	mv $(TMP)/usr/mysql-test	$(TMP)/usr/share/mysql
@@ -186,20 +186,20 @@ install: build
 	# lintian overrides
 	mkdir -p $(TMP)/usr/share/lintian/overrides/
 	cp debian/mysql-common.lintian-overrides      $(TMP)/usr/share/lintian/overrides/mysql-common
-	cp debian/mariadb-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-10.0
-	cp debian/mariadb-client-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-10.0
+	cp debian/mariadb-server-10.1.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-10.1
+	cp debian/mariadb-client-10.1.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-10.1
 
-	# For 5.0 -> 10.0 transition
+	# For 5.0 -> 10.1 transition
 	d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
 	mkdir -p $$d; \
-	cp debian/mariadb-server-10.0.mysql.init $$d/_etc_init.d_mysql; \
-	cp debian/mariadb-server-10.0.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
+	cp debian/mariadb-server-10.1.mysql.init $$d/_etc_init.d_mysql; \
+	cp debian/mariadb-server-10.1.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
 	cp debian/additions/debian-start $$d/_etc_mysql_debian-start;
 
 	# install AppArmor profile
 	install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
 	# install Apport hook
-	install -D -m 644 debian/mariadb-server-10.0.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.0.py
+	install -D -m 644 debian/mariadb-server-10.1.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.1.py
 
 	autorm=debian/autorm-file;                                      \
 	rm -f $$autorm;                                                 \
diff --git a/debian/mariadb-client-10.0.README.Debian b/debian/mariadb-client-10.1.README.Debian
index b245638f9c9..b245638f9c9 100644
--- a/debian/mariadb-client-10.0.README.Debian
+++ b/debian/mariadb-client-10.1.README.Debian
diff --git a/debian/mariadb-client-10.0.dirs b/debian/mariadb-client-10.1.dirs
index ceda5922c5d..ceda5922c5d 100644
--- a/debian/mariadb-client-10.0.dirs
+++ b/debian/mariadb-client-10.1.dirs
diff --git a/debian/mariadb-client-10.0.docs b/debian/mariadb-client-10.1.docs
index 21446855f51..21446855f51 100644
--- a/debian/mariadb-client-10.0.docs
+++ b/debian/mariadb-client-10.1.docs
diff --git a/debian/mariadb-client-10.0.files b/debian/mariadb-client-10.1.files
index ac68079718e..58e94f2d67c 100644
--- a/debian/mariadb-client-10.0.files
+++ b/debian/mariadb-client-10.1.files
@@ -12,7 +12,7 @@ usr/bin/mysqlreport
 usr/bin/mysqlshow
 usr/bin/mysqlslap
 usr/bin/mysql_waitpid
-usr/share/lintian/overrides/mariadb-client-10.0
+usr/share/lintian/overrides/mariadb-client-10.1
 usr/share/man/man1/innotop.1
 usr/share/man/man1/mysqlaccess.1
 usr/share/man/man1/mysqladmin.1
diff --git a/debian/mariadb-client-10.0.links b/debian/mariadb-client-10.1.links
index 247369fa218..247369fa218 100644
--- a/debian/mariadb-client-10.0.links
+++ b/debian/mariadb-client-10.1.links
diff --git a/debian/mariadb-client-10.0.lintian-overrides b/debian/mariadb-client-10.1.lintian-overrides
index d4dc1a70b1e..d4dc1a70b1e 100644
--- a/debian/mariadb-client-10.0.lintian-overrides
+++ b/debian/mariadb-client-10.1.lintian-overrides
diff --git a/debian/mariadb-client-10.0.menu b/debian/mariadb-client-10.1.menu
index 1378555c423..1378555c423 100644
--- a/debian/mariadb-client-10.0.menu
+++ b/debian/mariadb-client-10.1.menu
diff --git a/debian/mariadb-client-core-10.0.files b/debian/mariadb-client-core-10.1.files
index a2781309439..a2781309439 100644
--- a/debian/mariadb-client-core-10.0.files
+++ b/debian/mariadb-client-core-10.1.files
diff --git a/debian/mariadb-connect-engine-10.0.files b/debian/mariadb-connect-engine-10.1.files
index 0b042607c36..0b042607c36 100644
--- a/debian/mariadb-connect-engine-10.0.files
+++ b/debian/mariadb-connect-engine-10.1.files
diff --git a/debian/mariadb-oqgraph-engine-10.0.files b/debian/mariadb-oqgraph-engine-10.1.files
index f67b0cd9d13..f67b0cd9d13 100644
--- a/debian/mariadb-oqgraph-engine-10.0.files
+++ b/debian/mariadb-oqgraph-engine-10.1.files
diff --git a/debian/mariadb-server-10.0.lintian-overrides b/debian/mariadb-server-10.0.lintian-overrides
deleted file mode 100644
index ea67ed9de2b..00000000000
--- a/debian/mariadb-server-10.0.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-mariadb-server-10.0: command-with-path-in-maintainer-script postinst
-mariadb-server-10.0: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}'
-mariadb-server-10.0: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}'
-mariadb-server-10.0: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql
-mariadb-server-10.0: statically-linked-binary ./usr/sbin/mysqld
diff --git a/debian/mariadb-server-10.0.NEWS b/debian/mariadb-server-10.1.NEWS
index a3042dc2918..a3042dc2918 100644
--- a/debian/mariadb-server-10.0.NEWS
+++ b/debian/mariadb-server-10.1.NEWS
diff --git a/debian/mariadb-server-10.0.config b/debian/mariadb-server-10.1.config
index 162017caf71..162017caf71 100644
--- a/debian/mariadb-server-10.0.config
+++ b/debian/mariadb-server-10.1.config
diff --git a/debian/mariadb-server-10.1.lintian-overrides b/debian/mariadb-server-10.1.lintian-overrides
new file mode 100644
index 00000000000..6bbda696be4
--- /dev/null
+++ b/debian/mariadb-server-10.1.lintian-overrides
@@ -0,0 +1,5 @@
+mariadb-server-10.1: command-with-path-in-maintainer-script postinst
+mariadb-server-10.1: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}'
+mariadb-server-10.1: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}'
+mariadb-server-10.1: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql
+mariadb-server-10.1: statically-linked-binary ./usr/sbin/mysqld
diff --git a/debian/mariadb-server-10.0.logcheck.ignore.paranoid b/debian/mariadb-server-10.1.logcheck.ignore.paranoid
index 00cc5c3e29d..00cc5c3e29d 100644
--- a/debian/mariadb-server-10.0.logcheck.ignore.paranoid
+++ b/debian/mariadb-server-10.1.logcheck.ignore.paranoid
diff --git a/debian/mariadb-server-10.0.logcheck.ignore.server b/debian/mariadb-server-10.1.logcheck.ignore.server
index 37f25cb01ea..37f25cb01ea 100644
--- a/debian/mariadb-server-10.0.logcheck.ignore.server
+++ b/debian/mariadb-server-10.1.logcheck.ignore.server
diff --git a/debian/mariadb-server-10.0.logcheck.ignore.workstation b/debian/mariadb-server-10.1.logcheck.ignore.workstation
index 37f25cb01ea..37f25cb01ea 100644
--- a/debian/mariadb-server-10.0.logcheck.ignore.workstation
+++ b/debian/mariadb-server-10.1.logcheck.ignore.workstation
diff --git a/debian/mariadb-server-10.0.mysql-server.logrotate b/debian/mariadb-server-10.1.mysql-server.logrotate
index 0f0de516b13..0f0de516b13 100644
--- a/debian/mariadb-server-10.0.mysql-server.logrotate
+++ b/debian/mariadb-server-10.1.mysql-server.logrotate
diff --git a/debian/mariadb-server-10.0.mysql.init b/debian/mariadb-server-10.1.mysql.init
index 46911aa57a1..7854007afc6 100644
--- a/debian/mariadb-server-10.0.mysql.init
+++ b/debian/mariadb-server-10.1.mysql.init
@@ -152,7 +152,7 @@ case "${1:-''}" in
 
         if ! mysqld_status check_dead warn; then
 	  log_end_msg 1
-	  log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.0/README.Debian.gz!"
+	  log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.1/README.Debian.gz!"
 	  exit -1
 	else
 	  log_end_msg 0
diff --git a/debian/mariadb-server-10.0.preinst b/debian/mariadb-server-10.1.preinst
index 7ad46c6ee52..49651c41195 100644
--- a/debian/mariadb-server-10.0.preinst
+++ b/debian/mariadb-server-10.1.preinst
@@ -46,7 +46,7 @@ stop_server() {
 
 ################################ main() ##########################
 
-this_version=10.0
+this_version=10.1
 
 # Abort if an NDB cluster is in use.
 if egrep -qi -r '^[^#]*ndb.connectstring|^[[:space:]]*\[[[:space:]]*ndb_mgmd' /etc/mysql/; then
diff --git a/debian/mariadb-server-10.0.prerm b/debian/mariadb-server-10.1.prerm
index 03e9ea37420..03e9ea37420 100644
--- a/debian/mariadb-server-10.0.prerm
+++ b/debian/mariadb-server-10.1.prerm
diff --git a/debian/mariadb-server-10.0.templates b/debian/mariadb-server-10.1.templates
index 13943da534a..fd83d2af293 100644
--- a/debian/mariadb-server-10.0.templates
+++ b/debian/mariadb-server-10.1.templates
@@ -7,7 +7,7 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: mariadb-server-10.0/really_downgrade
+Template: mariadb-server-10.1/really_downgrade
 Type: boolean
 Default: false
 _Description: Really proceed with downgrade?
@@ -73,7 +73,7 @@ _Description: Unable to set password for the MariaDB "root" user
  .
  You should check the account's password after the package installation.
  .
- Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file
+ Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file
  for more information.
 
 Template: mysql-server/password_mismatch
diff --git a/debian/mariadb-server-core-10.0.files b/debian/mariadb-server-core-10.1.files
index 5c60ca5ec67..5c60ca5ec67 100644
--- a/debian/mariadb-server-core-10.0.files
+++ b/debian/mariadb-server-core-10.1.files
diff --git a/debian/mariadb-test-10.0.dirs b/debian/mariadb-test-10.1.dirs
index f45bf43f7e9..f45bf43f7e9 100644
--- a/debian/mariadb-test-10.0.dirs
+++ b/debian/mariadb-test-10.1.dirs
diff --git a/debian/mariadb-test-10.0.files b/debian/mariadb-test-10.1.files
index a1c0d5af54e..a1c0d5af54e 100644
--- a/debian/mariadb-test-10.0.files
+++ b/debian/mariadb-test-10.1.files
diff --git a/debian/mariadb-test-10.0.links b/debian/mariadb-test-10.1.links
index 082680fe5ed..082680fe5ed 100644
--- a/debian/mariadb-test-10.0.links
+++ b/debian/mariadb-test-10.1.links
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index 40b6d906195..029c650fe7a 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] mariadb-server-10.0.templates
+[type: gettext/rfc822deb] mariadb-server-10.1.templates
diff --git a/debian/po/ar.po b/debian/po/ar.po
index 1507fcc92ab..737522212b8 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: templates\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2007-05-01 13:04+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
@@ -27,19 +27,19 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "هل فعلاً تريد التثبيط؟"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "هناك ملف مسمى /var/lib/mysql/debian-*.flag موجود على هذا النظام."
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mariadb-server package with a higher "
@@ -52,7 +52,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "ملاحظة هامة لمستخدمي NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -88,13 +88,13 @@ msgstr "عليك أيضاً أن تقوم بالتأكد من صلاحيات م�
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "إزالة جميع قواعد بيانات MariaDB؟"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -102,7 +102,7 @@ msgstr "الدليل /var/lib/mysql الذي يحتوي قواعد بيانات
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -113,13 +113,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "تشغيل خادم MariaDB عند الإقلاع؟"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -129,13 +129,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -145,7 +145,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.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 @@ msgstr "إن ترك الحقل فارغاً، فلن يتم تغيير كلمة
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 #, fuzzy
 #| msgid "New password for the MariaDB \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -161,13 +161,13 @@ msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص ب
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "تعذر تعيين كلمة مرور للمستخدم \"root\" الخاص بـMariaDB."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -179,7 +179,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -188,39 +188,39 @@ msgstr "يجب عليك التحقق من كلمة مرور الحساب عقب
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
-"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.0/README.Debian للمزيد من "
+"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.1/README.Debian للمزيد من "
 "المعلومات."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 7ca3129f3c5..bbff00407cc 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2004-01-31 19:20GMT\n"
 "Last-Translator: Aleix Badia i Bosch <abadia@ica.es>\n"
@@ -17,19 +17,19 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid ""
 "Such a file is an indication that a mariadb-server package with a higher "
 "version has been installed previously."
@@ -37,7 +37,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -45,7 +45,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -53,7 +53,7 @@ msgstr "Nota important pels usuaris de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -61,7 +61,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -69,13 +69,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -83,7 +83,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -92,7 +92,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 #, fuzzy
 #| msgid "Should MySQL start on boot?"
 msgid "Start the MariaDB server on boot?"
@@ -100,7 +100,7 @@ msgstr "Voleu que el MariaDB s'inici� a l'arrencada ?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 #, fuzzy
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
@@ -112,13 +112,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -126,25 +126,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -153,39 +153,39 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
@@ -222,13 +222,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.1.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "El MySQL nom�s s'instal�la en cas de tenir un nom d'ordinador central que "
 #~ "no sigui num�ric  i que es pugui resoldre a trav�s del fitxer /etc/hosts. "
 #~ "Ex. si l'ordre \"hostname\" retorna \"myhostname\", llavors hi ha d'haver "
-#~ "una l�nia com la seg�ent \"10.0.0.1 myhostname\"."
+#~ "una l�nia com la seg�ent \"10.1.0.1 myhostname\"."
 
 #, fuzzy
 #~ msgid ""
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 453bf5fb7fa..7f80d45e33b 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2007-05-01 13:01+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
@@ -26,19 +26,19 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Opravdu pokračovat v degradaci?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mariadb-server package with a higher "
@@ -51,7 +51,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Důležitá poznámka pro uživatele NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -75,7 +75,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -88,13 +88,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Odstranit všechny MariaDB databáze?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -104,7 +104,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -116,13 +116,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "Spustit MariaDB server při startu systému?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -132,13 +132,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nové heslo MariaDB uživatele \"root\":"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -148,7 +148,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.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."
@@ -156,7 +156,7 @@ msgstr "Ponecháte-li pole prázdné, heslo se nezmění."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -164,13 +164,13 @@ msgstr "Nové heslo MariaDB uživatele \"root\":"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Nelze nastavit heslo MariaDB uživatele \"root\""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -182,7 +182,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -191,38 +191,38 @@ msgstr "Po instalaci balíku byste měli heslo ověřit."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
-"Více informací naleznete v /usr/share/doc/mariadb-server-10.0/README.Debian."
+"Více informací naleznete v /usr/share/doc/mariadb-server-10.1/README.Debian."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
@@ -313,13 +313,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.1.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "MySQL se nainstaluje pouze v případě, že používáte nenumerické jméno "
 #~ "počítače, které se dá přeložit přes soubor /etc/hosts. Např. když příkaz "
 #~ "\"hostname\" vrátí \"diamond\", tak v /etc/hosts musí existovat obdobný "
-#~ "řádek jako \"10.0.0.1 diamond\"."
+#~ "řádek jako \"10.1.0.1 diamond\"."
 
 #~ msgid ""
 #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account "
diff --git a/debian/po/da.po b/debian/po/da.po
index e6836118840..8c592992182 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2007-05-30 22:41+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
@@ -27,20 +27,20 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "�nsker du virkelig at forts�tte nedgraderingen?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mariadb-server package with a higher "
@@ -54,7 +54,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Vigtig oplysning til NIS/YP-brugere"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -78,7 +78,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -91,13 +91,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Fjern alle MariaDB-databaser?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -107,7 +107,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -119,13 +119,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "Start MariaDB-serveren under systemopstart?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -135,13 +135,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -151,7 +151,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.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."
@@ -159,7 +159,7 @@ msgstr "Hvis du lader dette felt st� tomt, vil adgangskoden ikke blive �ndret."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -167,13 +167,13 @@ msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Kunne ikke s�tte adgangskoden for MariaDB's \"root\"-bruger"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -186,45 +186,45 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
-"Se filen /usr/share/doc/mariadb-server-10.0/README.Debian for yderligere "
+"Se filen /usr/share/doc/mariadb-server-10.1/README.Debian for yderligere "
 "oplysninger."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
@@ -339,12 +339,12 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.1.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "MySQL vil kun blive installeret, hvis du har et ikke-numerisk v�rtsnavn, "
 #~ "som kan sl�s op i filen /ets/hosts. Hvis f.eks. kommandoen \"hostname\" "
-#~ "svarer med \"mitvaertsnavn\", skal du have en linje a'la \"10.0.0.1 "
+#~ "svarer med \"mitvaertsnavn\", skal du have en linje a'la \"10.1.0.1 "
 #~ "mitvaertsnavn\" i /etc/hosts."
 
 #~ msgid ""
diff --git a/debian/po/de.po b/debian/po/de.po
index 3a36bf7221f..e1fbad09d67 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1_5.1.37-1_de\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2009-08-27 22:41+0200\n"
 "Last-Translator: Thomas Mueller <thomas.mueller@tmit.eu>\n"
@@ -29,13 +29,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Möchten Sie wirklich eine ältere Version einspielen?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid ""
 "Such a file is an indication that a mariadb-server package with a higher "
 "version has been installed previously."
@@ -53,7 +53,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Wichtige Anmerkung für NIS/YP-Benutzer!"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -79,7 +79,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -89,13 +89,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Alle MariaDB-Datenbanken entfernen?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -105,7 +105,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -117,13 +117,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "Soll der MariaDB-Server automatisch beim Booten starten?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -133,13 +133,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Neues Passwort für den MariaDB »root«-Benutzer:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -149,25 +149,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Wiederholen Sie das Passwort für den MariaDB-»root«-Benutzer:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Konnte für den MariaDB-»root«-Benutzer kein Passwort setzen"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -180,7 +180,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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,13 +188,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mariadb-server-5.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
 "Für weitere Informationen lesen Sie /usr/share/doc/mariadb-server-5.1/README."
@@ -202,13 +202,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr "Passwort-Eingabefehler"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.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 "
@@ -216,13 +216,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "NDB-Cluster scheint gerade benutzt zu werden"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
diff --git a/debian/po/es.po b/debian/po/es.po
index f4e729b5f90..957b40118bb 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -40,7 +40,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1_5.0.24-3\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2007-05-28 22:21+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
@@ -52,20 +52,20 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "¿Desea realmente continuar con la desactualización?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 "Existe un archivo con el nombre /var/lib/mysql/debian-*.flag en este sistema."
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mariadb-server package with a higher "
@@ -79,7 +79,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -89,13 +89,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante para los usuarios de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -103,7 +103,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -117,13 +117,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "¿Desea eliminar todas las bases de datos MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -133,7 +133,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -145,13 +145,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "¿Debería ejecutarse el servidor MariaDB al iniciarse el sistema?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -161,13 +161,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nueva contraseña para el usuario «root» de MariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -177,7 +177,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.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."
@@ -185,7 +185,7 @@ msgstr "No se modificará la contraseña si deja el espacio en blanco."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -193,13 +193,13 @@ msgstr "Nueva contraseña para el usuario «root» de MariaDB:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "No se pudo fijar la contraseña para el usuario «root» de MariaDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -212,7 +212,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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 "
@@ -220,39 +220,39 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
-"Consulte /usr/share/doc/mariadb-server-10.0/README.Debian para más "
+"Consulte /usr/share/doc/mariadb-server-10.1/README.Debian para más "
 "información."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
@@ -356,13 +356,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.1.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "Sólo se instalará MySQL si tiene un nombre de equipo que no sea una "
 #~ "dirección IP y pueda resolverse a través del archivo /etc/hosts. Por "
 #~ "ejemplo, si la orden «hostname» devuelve «MiNombreEquipo» entonces deberá "
-#~ "existir una línea «10.0.0.1 MiNombreEquipo» en dicho archivo."
+#~ "existir una línea «10.1.0.1 MiNombreEquipo» en dicho archivo."
 
 #~ msgid ""
 #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account "
diff --git a/debian/po/eu.po b/debian/po/eu.po
index e5643f1ce65..0a4980488cb 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2009-07-29 11:59+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
@@ -20,19 +20,19 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Benetan bertsio zaharragora itzuli nahi duzu?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mariadb-server package with a higher "
@@ -46,7 +46,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "NIS/YP erabiltzaileentzat ohar garrantzitsua"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -70,7 +70,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -84,13 +84,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Ezabatu MariaDB datubase guztiak?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -99,7 +99,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -111,13 +111,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "Abioan MariaDB zerbitzaria abiarazi?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -127,13 +127,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "MariaDB \"root\" erabiltzailearen pasahitz berria:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -143,7 +143,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.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."
@@ -151,19 +151,19 @@ msgstr "Eremua hau zurian utziaz gero ez da pasahitza aldatuko."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Errepikatu MariaDB \"root\" erabiltzailearen pasahitza:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Ezin da MariaDB \"root\" erabiltzailearen pasahitza ezarri"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -175,46 +175,46 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
-"Mesedez irakurri /usr/share/doc/mariadb-server-10.0/README.Debian fitxategia "
+"Mesedez irakurri /usr/share/doc/mariadb-server-10.1/README.Debian fitxategia "
 "xehetasun gehiagorako."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr "Pasahitz sarrera errorea"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "Dirudienez NDB Cluster-a erabilia dago"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 #, fuzzy
 #| msgid ""
 #| "MySQL-5.1 has orphaned NDB Cluster support. Please migrate to the new "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index da74e64a193..5055a354f9f 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2009-08-08 14:56+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
@@ -22,19 +22,19 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Faut-il vraiment revenir à la version précédente ?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid ""
 "Such a file is an indication that a mariadb-server package with a higher "
 "version has been installed previously."
@@ -44,7 +44,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr "Il n'est pas garanti que cette version puisse en utiliser les données."
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Note importante pour les utilisateurs NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -78,13 +78,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Faut-il supprimer toutes les bases de données MariaDB ?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -94,7 +94,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -105,13 +105,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "Faut-il lancer MariaDB au démarrage ?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -121,13 +121,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nouveau mot de passe du superutilisateur de MariaDB :"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -137,26 +137,26 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Confirmation du mot de passe du superutilisateur de MariaDB :"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""
 "Impossible de changer le mot de passe de l'utilisateur « root » de MariaDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -168,7 +168,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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,27 +176,27 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
-"Veuillez consulter le fichier /usr/share/doc/mysql-server-10.0/README.Debian "
+"Veuillez consulter le fichier /usr/share/doc/mysql-server-10.1/README.Debian "
 "pour plus d'informations."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr "Erreur de saisie du mot de passe"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.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 "
@@ -204,13 +204,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "Abandon de la gestion de NDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 30e58547e78..d991d98053a 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2007-04-20 09:44+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
@@ -17,19 +17,19 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "¿Quere pasar a unha versión anterior?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mariadb-server package with a higher "
@@ -43,7 +43,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante para os usuarios de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -81,13 +81,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "¿Eliminar tódalas bases de datos de MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -97,7 +97,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -109,13 +109,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "¿Iniciar o servidor MariaDB co ordenador?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -125,13 +125,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -141,7 +141,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.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 @@ msgstr "Se deixa o campo en branco, non se ha cambiar o contrasinal."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -157,13 +157,13 @@ msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Non se puido establecer o contrasinal do usuario \"root\" de MariaDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -175,7 +175,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -184,39 +184,39 @@ msgstr "Debería comprobar o contrasinal da conta trala instalación do paquete.
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
-"Consulte o ficheiro /usr/share/doc/mariadb-server-10.0/README.Debian para "
+"Consulte o ficheiro /usr/share/doc/mariadb-server-10.1/README.Debian para "
 "máis información."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
diff --git a/debian/po/it.po b/debian/po/it.po
index bd39afe5398..40b24d575bf 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2009-08-08 11:03+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
@@ -18,20 +18,20 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Procedere realmente con l'abbassamento di versione?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid ""
 "Such a file is an indication that a mariadb-server package with a higher "
 "version has been installed previously."
@@ -41,7 +41,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante per gli utenti NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -77,13 +77,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Eliminare tutti i database MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -93,7 +93,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -105,13 +105,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "Lanciare il server MariaDB all'avvio?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -121,13 +121,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nuova password per l'utente «root» di MariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -137,25 +137,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Ripetere la password per l'utente «root» di MariaDB:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Impossibile impostare la password per l'utente «root» di MariaDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -168,46 +168,46 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
 "Per maggiori informazioni si consulti il file /usr/share/doc/mariadb-"
-"server-10.0/README.Debian."
+"server-10.1/README.Debian."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr "Errore di inserimento della password"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "È in uso un cluster NDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 4cc190425f4..6173c9b1ef8 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2009-09-01 08:25+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "本当にダウングレードを実行しますか?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid ""
 "Such a file is an indication that a mariadb-server package with a higher "
 "version has been installed previously."
@@ -51,7 +51,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "NIS/YP ユーザへの重要な注意"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -77,7 +77,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -85,13 +85,13 @@ msgstr "/var/lib/mysql の所有者権限をチェックする必要もありま
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "すべての MariaDB データベースを削除しますか?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -101,7 +101,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -113,13 +113,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "MariaDB をシステム起動時に開始しますか?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -129,13 +129,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -145,25 +145,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "この値を空のままにしておいた場合は、パスワードは変更されません。"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "MariaDB の \"root\" ユーザのパスワードを設定できません"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -175,45 +175,45 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "パッケージのインストール後、アカウントのパスワードを確認する必要があります。"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
-"詳細は /usr/share/doc/mariadb-server-10.0/README.Debian を参照してください。"
+"詳細は /usr/share/doc/mariadb-server-10.1/README.Debian を参照してください。"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr "パスワード入力エラー"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "入力された二つのパスワードが一致しません。再入力してください。"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "NDB クラスタが利用されているようです"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
diff --git a/debian/po/nb.po b/debian/po/nb.po
index ed02ca1d48e..c3c2be245e7 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql_nb\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2007-02-18 12:13+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid "Do you really want to downgrade?"
 msgid "Really proceed with downgrade?"
@@ -27,13 +27,13 @@ msgstr "Er du sikker på at du vil nedgradere?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid ""
 #| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -66,7 +66,7 @@ msgstr "Viktig merknad for NIS/YP-brukere!"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -96,7 +96,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 #, fuzzy
 #| msgid ""
 #| "The script is about to remove the data directory /var/lib/mysql. If it is "
@@ -113,7 +113,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 #, fuzzy
 #| msgid "Should MySQL start on boot?"
 msgid "Start the MariaDB server on boot?"
@@ -121,7 +121,7 @@ msgstr "Skal MariaDB startes ved maskinoppstart?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 #, fuzzy
 #| msgid ""
 #| "The MySQL can start automatically on boot time or only if you manually "
@@ -135,7 +135,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MariaDB \"root\" user:"
@@ -143,7 +143,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -157,13 +157,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -171,7 +171,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MariaDB \"root\" user"
@@ -179,7 +179,7 @@ msgstr "Klarer ikke angi passord for MariaDBs «root»-bruker"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
 #| "It seems an error occurred while setting the password for the MySQL "
@@ -198,39 +198,39 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
diff --git a/debian/po/nl.po b/debian/po/nl.po
index a3694f6eea0..a8a920ffae8 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2006-02-19 10:20+0100\n"
 "Last-Translator: Thijs Kinkhorst <thijs@debian.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid "Do you really want to downgrade?"
 msgid "Really proceed with downgrade?"
@@ -26,13 +26,13 @@ msgstr "Wilt u echt een oude versie herstellen?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid ""
 #| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -66,7 +66,7 @@ msgstr "Belangrijke opmerking voor gebruikers van NIS/YP!"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -96,7 +96,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 #, fuzzy
 #| msgid ""
 #| "The script is about to remove the data directory /var/lib/mysql. If it is "
@@ -114,7 +114,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 #, fuzzy
 #| msgid "Should MySQL start on boot?"
 msgid "Start the MariaDB server on boot?"
@@ -122,7 +122,7 @@ msgstr "Moet MariaDB starten als de computer start?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 #, fuzzy
 #| msgid ""
 #| "The MySQL can start automatically on boot time or only if you manually "
@@ -136,7 +136,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MariaDB \"root\" user:"
@@ -144,7 +144,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -158,13 +158,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -172,7 +172,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MariaDB \"root\" user"
@@ -180,7 +180,7 @@ msgstr "Kan het wachtwoord voor de MariaDB \"root\"-gebruiker niet instellen"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
 #| "It seems an error occurred while setting the password for the MySQL "
@@ -199,39 +199,39 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 4f2e646dcc7..1cb1b455160 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2007-05-05 21:01+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
@@ -18,19 +18,19 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Deseja mesmo fazer downgrade?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "Existe um ficheiro chamado /var/lib/mysql/debian-*.flag neste sistema."
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mariadb-server package with a higher "
@@ -44,7 +44,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -54,13 +54,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante para utilizadores de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -81,13 +81,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Remover todas as bases de dados MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -97,7 +97,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -109,13 +109,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "Iniciar o servidor MariaDB no arranque?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -125,13 +125,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -141,7 +141,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.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,7 +150,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -158,7 +158,7 @@ msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""
 "Não foi possível definir a palavra-passe para o utilizador \"root\" do "
@@ -166,7 +166,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -179,7 +179,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -189,39 +189,39 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
 "Para mais informação por favor leia o ficheiro /usr/share/doc/mariadb-"
-"server-10.0/README.Debian."
+"server-10.1/README.Debian."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 7cfa5a05190..d8748ad9288 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2007-04-21 15:59-0300\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
@@ -21,19 +21,19 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Realmente proceder com o rebaixamento de versão?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mariadb-server package with a higher "
@@ -47,7 +47,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Aviso importante para usuários NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -71,7 +71,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -84,13 +84,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Remover todas as bases de dados do MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -100,7 +100,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -112,13 +112,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "Iniciar o servidor MariaDB junto a inicialização da máquina?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -128,13 +128,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nova senha para o usuário \"root\" do MariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -144,7 +144,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.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 @@ msgstr "Caso este campo seja deixado em branco, a senha não sera mudada."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -160,13 +160,13 @@ msgstr "Nova senha para o usuário \"root\" do MariaDB:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Impossível definir senha para o usuário \"root\" do MariaDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -179,7 +179,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -188,39 +188,39 @@ msgstr "Você deverá checar a senha dessa conta após a instalação deste paco
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
-"Por favor, leia o arquivo /usr/share/doc/mariadb-server-10.0/README.Debian "
+"Por favor, leia o arquivo /usr/share/doc/mariadb-server-10.1/README.Debian "
 "para maiores informações."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
@@ -323,13 +323,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.1.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "O MySQL será instalado somente caso você possua um nome de host NÃO "
 #~ "NUMÉRICO que possa ser resolvido através do arquivo /etc/hosts, ou seja, "
 #~ "caso o comando \"hostname\" retorne \"myhostname\", uma linha como "
-#~ "\"10.0.0.1 myhostname\" deverá existir no arquivo /etc/hosts."
+#~ "\"10.1.0.1 myhostname\" deverá existir no arquivo /etc/hosts."
 
 #~ msgid ""
 #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account "
diff --git a/debian/po/ro.po b/debian/po/ro.po
index a0c69e7161f..0c37e3c0188 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: po-debconf://mysql-dfsg\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2006-12-20 21:27+0200\n"
 "Last-Translator: stan ioan-eugen <stan.ieugen@gmail.com>\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid "Do you really want to downgrade?"
 msgid "Really proceed with downgrade?"
@@ -27,13 +27,13 @@ msgstr "Sunteţi sigur că doriţi să instalaţi o versiune mai veche?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 #, fuzzy
 #| msgid ""
 #| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -66,7 +66,7 @@ msgstr "Notă importantă pentru utilizatorii NIS/YP!"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -96,7 +96,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 #, fuzzy
 #| msgid ""
 #| "The script is about to remove the data directory /var/lib/mysql. If it is "
@@ -113,7 +113,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 #, fuzzy
 #| msgid "Should MySQL start on boot?"
 msgid "Start the MariaDB server on boot?"
@@ -121,7 +121,7 @@ msgstr "Doriţi ca MariaDB să pornească la initializarea sistemului?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 #, fuzzy
 #| msgid ""
 #| "The MySQL can start automatically on boot time or only if you manually "
@@ -135,7 +135,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MariaDB \"root\" user:"
@@ -143,7 +143,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -157,13 +157,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -171,7 +171,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MariaDB \"root\" user"
@@ -179,7 +179,7 @@ msgstr "Nu s-a putut stabili parola pentru utilizatorul „root” al MariaDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
 #| "It seems an error occurred while setting the password for the MySQL "
@@ -198,39 +198,39 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
diff --git a/debian/po/ru.po b/debian/po/ru.po
index e1e73ee2748..55d06fc86c9 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2009-08-06 20:27+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
@@ -32,19 +32,19 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Действительно установить более старую версию?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "В системе найден файл /var/lib/mysql/debian-*.flag."
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid ""
 "Such a file is an indication that a mariadb-server package with a higher "
 "version has been installed previously."
@@ -54,7 +54,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Важное замечание для пользователей NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -80,7 +80,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -88,13 +88,13 @@ msgstr "Также проверьте права доступа и владел�
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Удалить все базы данных MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -103,7 +103,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -115,13 +115,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "Запускать MariaDB при загрузке системы?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -131,13 +131,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Новый пароль для MariaDB пользователя \"root\":"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -147,25 +147,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Если оставить поле пустым, то пароль изменён не будет."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Повторите ввод пароля для MariaDB пользователя \"root\":"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Невозможно задать пароль MariaDB пользователю \"root\""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -177,44 +177,44 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr "Проверьте пароль учётной записи после установки пакета."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
-"Подробности см. в файле /usr/share/doc/mariadb-server-10.0/README.Debian."
+"Подробности см. в файле /usr/share/doc/mariadb-server-10.1/README.Debian."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr "Ошибка ввода пароля"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Два введённых пароля не одинаковы. Повторите ввод."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "NDB Cluster уже используется"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 788349fa504..67d227618f4 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2009-09-08 21:42+0100\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
@@ -21,19 +21,19 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Vill du verkligen genomföra nedgraderingen?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid ""
 "Such a file is an indication that a mariadb-server package with a higher "
 "version has been installed previously."
@@ -43,7 +43,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Viktig information för NIS/YP-användare"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -69,7 +69,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -79,13 +79,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Ta bort alla MariaDB-databaser?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -95,7 +95,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -107,13 +107,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr "Ska MariaDB startas vid systemets uppstart?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -123,13 +123,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nytt lösenord för MariaDBs \"root\"-användare:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -139,25 +139,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Repetera lösenordet för MariaDBs \"root\"-användare:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Kunde inte sätta lösenord för MariaDBs \"root\"-användare"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -170,45 +170,45 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
-"Läs filen /usr/share/doc/mariadb-server-10.0/README.Debian för mer "
+"Läs filen /usr/share/doc/mariadb-server-10.1/README.Debian för mer "
 "information."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr "Fel vid inmatning av lösenord"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.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
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "NDB-kluster används inte"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index b046b068ff9..66af762ac0d 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -19,19 +19,19 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid ""
 "Such a file is an indication that a mariadb-server package with a higher "
 "version has been installed previously."
@@ -39,7 +39,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -61,7 +61,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -69,13 +69,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -83,7 +83,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -92,13 +92,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid "Start the MariaDB server on boot?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
 "with the '/etc/init.d/mysql start' command."
@@ -106,13 +106,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -120,25 +120,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -147,39 +147,39 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
diff --git a/debian/po/tr.po b/debian/po/tr.po
index a648bf38698..9e80ff89f00 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n"
 "POT-Creation-Date: 2012-01-12 13:08+0100\n"
 "PO-Revision-Date: 2004-06-05 08:53+0300\n"
 "Last-Translator: Gürkan Aslan <gurkan@iaslan.com>\n"
@@ -18,19 +18,19 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.templates:2001
 msgid ""
 "Such a file is an indication that a mariadb-server package with a higher "
 "version has been installed previously."
@@ -38,7 +38,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:2001
+#: ../mariadb-server-10.1.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 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -54,7 +54,7 @@ msgstr "NIS/YP kullanıcıları için önemli not!"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -62,7 +62,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.0.templates:3001
+#: ../mariadb-server-10.1.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -70,13 +70,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -84,7 +84,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:4001
+#: ../mariadb-server-10.1.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -93,7 +93,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 #, fuzzy
 #| msgid "Should MySQL start on boot?"
 msgid "Start the MariaDB server on boot?"
@@ -101,7 +101,7 @@ msgstr "MariaDB açılış sırasında başlatılsın mı?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.0.templates:5001
+#: ../mariadb-server-10.1.templates:5001
 #, fuzzy
 msgid ""
 "The MariaDB server can be launched automatically at boot time or manually "
@@ -113,13 +113,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -127,25 +127,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:6001
+#: ../mariadb-server-10.1.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.0.templates:7001
+#: ../mariadb-server-10.1.templates:7001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -154,39 +154,39 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:8001
+#: ../mariadb-server-10.1.templates:8001
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for "
 "more information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:9001
+#: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.0.templates:10001
+#: ../mariadb-server-10.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
@@ -221,12 +221,12 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.1.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "MySQL sadece /etc/hosts dosyası yoluyla çözülebilir NUMERİK OLMAYAN bir "
 #~ "makine adına sahipseniz kurulacaktır. Örneğin, eğer \"hostname\" komutu "
-#~ "\"makinem\" ismini döndürüyorsa, bu dosya içinde \"10.0.0.1 makinem\" "
+#~ "\"makinem\" ismini döndürüyorsa, bu dosya içinde \"10.1.0.1 makinem\" "
 #~ "gibi bir satır olmalıdır."
 
 #, fuzzy
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index d2ba378fb63..6ef89c8a671 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,2 +1,2 @@
-maintainer-script-lacks-debhelper-token debian/mariadb-server-10.0.postinst
-maintainer-script-lacks-debhelper-token debian/mariadb-server-10.0.postrm
+maintainer-script-lacks-debhelper-token debian/mariadb-server-10.1.postinst
+maintainer-script-lacks-debhelper-token debian/mariadb-server-10.1.postrm
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt
index dc545ee6791..b5993f85656 100644
--- a/storage/tokudb/CMakeLists.txt
+++ b/storage/tokudb/CMakeLists.txt
@@ -15,7 +15,7 @@ ENDIF()
 
 ############################################
 SET(TOKUDB_VERSION "7.1.6")
-SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-10.0/README-TOKUDB\nusr/share/doc/mariadb-server-10.0/README.md" PARENT_SCOPE)
+SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-10.1/README-TOKUDB\nusr/share/doc/mariadb-server-10.1/README.md" PARENT_SCOPE)
 SET(USE_BDB OFF CACHE BOOL "")
 SET(USE_VALGRIND OFF CACHE BOOL "")
 SET(BUILD_TESTING  OFF CACHE BOOL "")
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc
index 27610747a33..0cef79ed32c 100644
--- a/storage/tokudb/ha_tokudb.cc
+++ b/storage/tokudb/ha_tokudb.cc
@@ -410,7 +410,7 @@ static inline bool do_ignore_flag_optimization(THD* thd, TABLE* table, bool opt_
 static inline uint get_key_parts(const KEY *key) {
 #if (50609 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699) || \
     (50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799) || \
-    (100009 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099)
+    (100009 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199)
     return key->user_defined_key_parts;
 #else
     return key->key_parts;
@@ -2076,7 +2076,7 @@ int ha_tokudb::write_frm_data(DB* db, DB_TXN* txn, const char* frm_name) {
     size_t frm_len = 0;
     int error = 0;
 
-#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
+#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199
     error = table_share->read_frm_image((const uchar**)&frm_data,&frm_len);
     if (error) { goto cleanup; }
 #else    
@@ -2116,7 +2116,7 @@ int ha_tokudb::verify_frm_data(const char* frm_name, DB_TXN* txn) {
     HA_METADATA_KEY curr_key = hatoku_frm_data;
 
     // get the frm data from MySQL
-#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
+#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199
     error = table_share->read_frm_image((const uchar**)&mysql_frm_data,&mysql_frm_len);
     if (error) { 
         goto cleanup;
diff --git a/storage/tokudb/ha_tokudb_alter_56.cc b/storage/tokudb/ha_tokudb_alter_56.cc
index 238924e4734..8d8315c271c 100644
--- a/storage/tokudb/ha_tokudb_alter_56.cc
+++ b/storage/tokudb/ha_tokudb_alter_56.cc
@@ -732,13 +732,13 @@ bool ha_tokudb::commit_inplace_alter_table(TABLE *altered_table, Alter_inplace_i
     if (commit) {
 #if (50613 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699) || \
     (50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799) || \
-    (100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099)
+    (100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199)
         if (ha_alter_info->group_commit_ctx) {
             ha_alter_info->group_commit_ctx = NULL;
         }
 #endif
 #if (50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599) || \
-    (100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099)
+    (100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199)
 #if WITH_PARTITION_STORAGE_ENGINE
         if (TOKU_PARTITION_WRITE_FRM_DATA || altered_table->part_info == NULL) {
 #else
diff --git a/storage/tokudb/hatoku_cmp.cc b/storage/tokudb/hatoku_cmp.cc
index 45bd44eec3c..8390bc10d2a 100644
--- a/storage/tokudb/hatoku_cmp.cc
+++ b/storage/tokudb/hatoku_cmp.cc
@@ -119,7 +119,7 @@ static bool field_valid_for_tokudb_table(Field* field) {
     case MYSQL_TYPE_FLOAT:
 #if (50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699) || \
     (50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799) || \
-    (100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099)
+    (100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199)
     case MYSQL_TYPE_DATETIME2:
     case MYSQL_TYPE_TIMESTAMP2:
     case MYSQL_TYPE_TIME2:
@@ -268,7 +268,7 @@ static TOKU_TYPE mysql_to_toku_type (Field* field) {
         goto exit;
 #if (50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699) || \
     (50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799) || \
-    (100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099)
+    (100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199)
     case MYSQL_TYPE_DATETIME2:
     case MYSQL_TYPE_TIMESTAMP2:
     case MYSQL_TYPE_TIME2:
@@ -3232,7 +3232,7 @@ static bool fields_are_same_type(Field* a, Field* b) {
     case MYSQL_TYPE_TIMESTAMP:
 #if (50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699) || \
     (50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799) || \
-    (100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099)
+    (100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199)
     case MYSQL_TYPE_DATETIME2:
     case MYSQL_TYPE_TIMESTAMP2:
     case MYSQL_TYPE_TIME2:
diff --git a/storage/tokudb/hatoku_defines.h b/storage/tokudb/hatoku_defines.h
index 73e6addb529..63c9f107e2e 100644
--- a/storage/tokudb/hatoku_defines.h
+++ b/storage/tokudb/hatoku_defines.h
@@ -96,7 +96,7 @@ PATENT RIGHTS GRANT:
 #pragma interface               /* gcc class implementation */
 #endif
 
-#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
+#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199
 // mariadb 10.0
 #define TOKU_USE_DB_TYPE_TOKUDB 1
 #define TOKU_INCLUDE_ALTER_56 1
diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc
index 2291f2345bb..ea360812bb8 100644
--- a/storage/tokudb/hatoku_hton.cc
+++ b/storage/tokudb/hatoku_hton.cc
@@ -167,7 +167,7 @@ static int tokudb_rollback_by_xid(handlerton* hton, XID*  xid);
 static int tokudb_rollback_to_savepoint(handlerton * hton, THD * thd, void *savepoint);
 static int tokudb_savepoint(handlerton * hton, THD * thd, void *savepoint);
 static int tokudb_release_savepoint(handlerton * hton, THD * thd, void *savepoint);
-#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
+#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199
 static int tokudb_discover_table(handlerton *hton, THD* thd, TABLE_SHARE *ts);
 static int tokudb_discover_table_existence(handlerton *hton, const char *db, const char *name);
 #endif
@@ -376,7 +376,7 @@ static int tokudb_init_func(void *p) {
     tokudb_hton->savepoint_rollback = tokudb_rollback_to_savepoint;
     tokudb_hton->savepoint_release = tokudb_release_savepoint;
 
-#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
+#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199
     tokudb_hton->discover_table = tokudb_discover_table;
     tokudb_hton->discover_table_existence = tokudb_discover_table_existence;
 #else
@@ -931,7 +931,7 @@ static int tokudb_release_savepoint(handlerton * hton, THD * thd, void *savepoin
     TOKUDB_DBUG_RETURN(error);
 }
 
-#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
+#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199
 static int tokudb_discover_table(handlerton *hton, THD* thd, TABLE_SHARE *ts) {
     uchar *frmblob = 0;
     size_t frmlen;
@@ -976,7 +976,7 @@ static int tokudb_discover3(handlerton *hton, THD* thd, const char *db, const ch
     DBT value = {};
     bool do_commit;
 
-#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
+#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199
     tokudb_trx_data *trx = (tokudb_trx_data *) thd_data_get(thd, tokudb_hton->slot);
     if (thd_sql_command(thd) == SQLCOM_CREATE_TABLE && trx && trx->sub_sp_level) {
         do_commit = false;
diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf
index a197868d16c..fb52635d4d8 100644
--- a/support-files/rpm/server.cnf
+++ b/support-files/rpm/server.cnf
@@ -19,8 +19,8 @@
 # you can put MariaDB-only options here
 [mariadb]
 
-# This group is only read by MariaDB-10.0 servers.
+# This group is only read by MariaDB-10.1 servers.
 # If you use the same .cnf file for MariaDB of different versions,
 # use this group for options that older servers don't understand
-[mariadb-10.0]
+[mariadb-10.1]