set version to 10.1.0

15 files changed, 80 insertions, 80 deletions

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;                                                 \