[Commits] Rev 3357: MDEV 507 deb/rpm packages for galera builds. in file:///home/hf/wmar/mdev507/

holyfoot at askmonty.org holyfoot at askmonty.org
Sun Nov 18 16:19:09 EET 2012


At file:///home/hf/wmar/mdev507/

------------------------------------------------------------
revno: 3357
revision-id: holyfoot at askmonty.org-20121118140702-6ezyxar8pm2kvceu
parent: seppo.jaakola at codership.com-20121024201343-77kxbrn1sjkt1t2o
committer: Alexey Botchkov <holyfoot at askmonty.org>
branch nick: mdev507
timestamp: Sun 2012-11-18 18:07:02 +0400
message:
  MDEV 507 deb/rpm packages for galera builds.
          Debian/Ubuntu packages fixed.
          The mariadb-server-5.5 and mariadb-server packages became
          mariadb-galera-server-5.5 and mariadb-galera-server respectively.
          The rest of packages are removed from the build.
          This patch reflects only files that were changed.
          Second part of this patch has only file renaming/deletions.
-------------- next part --------------
=== modified file 'debian/dist/Debian/control'
--- a/debian/dist/Debian/control	2012-08-23 13:32:03 +0000
+++ b/debian/dist/Debian/control	2012-11-18 14:07:02 +0000
@@ -10,190 +10,25 @@ Homepage: http://mariadb.org/
 Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files
 Vcs-Bzr: bzr://lp:maria
 
-Package: libmariadbclient18
-Section: libs
-Architecture: any
-Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: MariaDB database client library
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the client library.
-
-Package: libmysqlclient18
-Section: libs
-Architecture: any
-Depends: libmariadbclient18 (= ${source:Version})
-Replaces: libmysqlclient18 (<< ${source:Version})
-Description: Virtual package to satisfy external depends
- This is an empty package that provides an updated "best" version of
- libmysqlclient18 that does not conflict with the libmariadbclient18
- package.
- .
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
-
-Package: libmariadbd-dev
-Architecture: any
-Section: libdevel
-Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends}
-Provides: libmysqld-dev
-Conflicts: libmysqld-dev
-Replaces: libmysqld-dev
-Description: MariaDB embedded database development files
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the embedded server library and header files.
-
-Package: libmariadbclient-dev
-Architecture: any
-Section: libdevel
-Depends: libmariadbclient18 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends}
-Replaces: libmariadbclient16-dev, libmysqlclient16-dev
-Conflicts: libmysqlclient-dev, libmariadbclient16-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev
-Provides: libmysqlclient-dev
-Description: MariaDB database development files
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes development libraries and header files.
-
-Package: mysql-common
-Section: database
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes files needed by all versions of the client library
- (e.g. /etc/mysql/my.cnf).
-
-Package: mariadb-common
-Section: database
-Architecture: all
-Depends: mysql-common, ${shlibs:Depends}, ${misc:Depends}
-Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes files needed by all versions of the client library
- (e.g. /etc/mysql/conf.d/mariadb.cnf).
-
-Package: mariadb-client-core-5.5
-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
-Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0,
-    mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}),
-    mysql-client-core-5.1, mysql-client-core-5.5,
-    mariadb-client-5.1, mariadb-client-core-5.1,
-    mariadb-client-5.2, mariadb-client-core-5.2,
-    mariadb-client-5.3, mariadb-client-core-5.3
-Replaces: mysql-client (<< 5.0.51), mysql-client-5.0,
-    mysql-client-5.1, mysql-client-5.5,
-    mysql-client-core-5.1, mysql-client-core-5.5,
-    mariadb-client-5.1, mariadb-client-core-5.1,
-    mariadb-client-5.2, mariadb-client-core-5.2,
-    mariadb-client-5.3, mariadb-client-core-5.3
-Description: MariaDB database core client binaries
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the core client files, as used by Akonadi.
-
-Package: mariadb-client-5.5
-Architecture: any
-Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mariadb-common, libmariadbclient18 (>= ${source:Version}), mariadb-client-core-5.5 (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: virtual-mysql-client, mysql-client,
-    mysql-client-4.1, mysql-client-5.1, mysql-client-5.5
-Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
-    mariadb-client (<< ${source:Version}),
-    mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mysql-client-5.5
-Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
-    mysql-client-5.5,
-    mariadb-client (<< ${source:Version}),
-    mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3
-Description: MariaDB database client binaries
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the client binaries and the additional tools
- innotop and mysqlreport.
-
-Package: mariadb-server-core-5.5
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
-Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
-Conflicts: mariadb-server-5.1 (<< 5.1.60),
-    mariadb-server-5.2 (<< 5.2.10),
-    mariadb-server-5.3 (<< 5.3.3),
-    mysql-server-5.0,
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
-Replaces: mariadb-server-5.1 (<< 5.1.60),
-    mariadb-server-5.2 (<< 5.2.10),
-    mariadb-server-5.3 (<< 5.3.3),
-    mysql-server-5.0,
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
-Description: MariaDB database core server files
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the core server files, as used by Akonadi.
-
-Package: mariadb-test-5.5
-Section: database
-Architecture: all
-Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
-Conflicts: mariadb-test (<< ${source:Version}),
-    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
-Replaces: mariadb-test (<< ${source:Version}),
-    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
-Description: MariaDB database regression test suite
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the regression test suite.
-
-Package: mariadb-server-5.5
+Package: mariadb-galera-server-5.5
 Architecture: any
 Suggests: tinyca, mailx, mariadb-test
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.5 (>= ${binary:Version})
-Provides: mariadb-server, mysql-server, virtual-mysql-server
-Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
+Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), libmariadbclient18 (>= ${binary:Version}), galera (>=23.2)
+Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5, mariadb-galera-server, mysql-server, virtual-mysql-server
+Conflicts: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
-Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
+    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
+    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
+Replaces: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
-    libmariadbclient16 (<< 5.3.4),
-    libmariadbclient-dev (<< 5.5.0)
-Description: MariaDB database server binaries
+    libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
+    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
+    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
+Description: MariaDB database server with Galera cluster binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
@@ -201,14 +36,15 @@ Description: MariaDB database server bin
  .
  This package includes the server binaries.
 
-Package: mariadb-server
+Package: mariadb-galera-server
 Section: database
 Architecture: all
-Depends: mariadb-server-5.5, ${misc:Depends}
-Description: MariaDB database server (metapackage depending on the latest version)
+Depends: mariadb-galera-server-5.5, ${misc:Depends}
+Description: MariaDB database server with Galera cluster
+ (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-server (currently mariadb-server-5.5), as determined by the MariaDB
- maintainers. Install this package if in doubt about which MariaDB
+ mariadb-galera-server (currently mariadb-galera-server-5.5), as determined by the MariaDB
+ maintainers. Install this package if in doubt about which MariaDB-Galera
  version you need. That will install the version recommended by the
  package maintainers.
  .
@@ -216,22 +52,3 @@ Description: MariaDB database server (me
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
-
-Package: mariadb-client
-Section: database
-Architecture: all
-Depends: mariadb-client-5.5, ${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-5.5), 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-5.5
-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-5.5), as determined by the MariaDB
- maintainers.

=== modified file 'debian/dist/Debian/mariadb-server-5.5.files'
--- a/debian/dist/Debian/mariadb-server-5.5.files	2012-01-28 20:22:14 +0000
+++ b/debian/dist/Debian/mariadb-server-5.5.files	2012-11-18 14:07:02 +0000
@@ -1,3 +1,4 @@
+usr/sbin/mysqld
 usr/lib/mysql/plugin/
 usr/lib/libhsclient.so.*
 etc/mysql/debian-start
@@ -55,6 +56,31 @@ usr/share/man/man1/resolveip.1
 usr/share/man/man1/resolve_stack_dump.1
 usr/share/man/man1/innochecksum.1
 usr/share/man/man1/mysql_tzinfo_to_sql.1
+usr/share/man/man8/mysqld.8
+usr/share/mysql/charsets
+usr/share/mysql/czech
+usr/share/mysql/danish
+usr/share/mysql/dutch
+usr/share/mysql/english
+usr/share/mysql/estonian
+usr/share/mysql/french
+usr/share/mysql/german
+usr/share/mysql/greek
+usr/share/mysql/hungarian
+usr/share/mysql/italian
+usr/share/mysql/japanese
+usr/share/mysql/korean
+usr/share/mysql/norwegian
+usr/share/mysql/norwegian-ny
+usr/share/mysql/polish
+usr/share/mysql/portuguese
+usr/share/mysql/romanian
+usr/share/mysql/russian
+usr/share/mysql/serbian
+usr/share/mysql/slovak
+usr/share/mysql/spanish
+usr/share/mysql/swedish
+usr/share/mysql/ukrainian
 usr/share/mysql/debian-start.inc.sh
 usr/share/mysql/echo_stderr
 usr/share/mysql/errmsg-utf8.txt

=== modified file 'debian/dist/Debian/rules'
--- a/debian/dist/Debian/rules	2012-06-06 12:15:29 +0000
+++ b/debian/dist/Debian/rules	2012-11-18 14:07:02 +0000
@@ -190,15 +190,13 @@ 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-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-5.5
-        cp debian/mariadb-client-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-5.5
+        cp debian/mariadb-galera-server-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-5.5
 
         # For 5.0 -> 5.5 transition
         d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
         mkdir -p $$d; \
-        cp debian/mariadb-server-5.5.mysql.init $$d/_etc_init.d_mysql; \
-        cp debian/mariadb-server-5.5.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
+        cp debian/mariadb-galera-server-5.5.mysql.init $$d/_etc_init.d_mysql; \
+        cp debian/mariadb-galera-server-5.5.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
         cp debian/additions/debian-start $$d/_etc_mysql_debian-start;
 
         dh_movefiles

=== modified file 'debian/dist/Ubuntu/control'
--- a/debian/dist/Ubuntu/control	2012-08-23 13:32:03 +0000
+++ b/debian/dist/Ubuntu/control	2012-11-18 14:07:02 +0000
@@ -10,184 +10,25 @@ Homepage: http://mariadb.org/
 Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files
 Vcs-Bzr: bzr://lp:maria
 
-Package: libmariadbclient18
-Section: libs
-Architecture: any
-Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: MariaDB database client library
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the client library.
-
-Package: libmysqlclient18
-Section: libs
-Architecture: any
-Depends: libmariadbclient18 (= ${source:Version})
-Replaces: libmysqlclient18 (<< ${source:Version})
-Description: Virtual package to satisfy external depends
- This is an empty package that provides an updated "best" version of
- libmysqlclient18 that does not conflict with the libmariadbclient18
- package.
- .
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
-
-Package: libmariadbd-dev
-Architecture: any
-Section: libdevel
-Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends}
-Provides: libmysqld-dev
-Conflicts: libmysqld-dev
-Replaces: libmysqld-dev
-Description: MariaDB embedded database development files
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the embedded server library and header files.
-
-Package: libmariadbclient-dev
-Architecture: any
-Section: libdevel
-Depends: libmariadbclient18 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends}
-Replaces: libmariadbclient16-dev, libmysqlclient16-dev
-Conflicts: libmysqlclient-dev, libmariadbclient16-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev
-Provides: libmysqlclient-dev
-Description: MariaDB database development files
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes development libraries and header files.
-
-Package: mysql-common
-Section: database
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes files needed by all versions of the client library
- (e.g. /etc/mysql/my.cnf).
-
-Package: mariadb-common
-Section: database
-Architecture: all
-Depends: mysql-common, ${shlibs:Depends}, ${misc:Depends}
-Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes files needed by all versions of the client library
- (e.g. /etc/mysql/conf.d/mariadb.cnf).
-
-Package: mariadb-client-core-5.5
-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
-Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0,
-    mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}),
-    mysql-client-core-5.1, mysql-client-core-5.5,
-    mariadb-client-5.1, mariadb-client-core-5.1,
-    mariadb-client-5.2, mariadb-client-core-5.2,
-    mariadb-client-5.3, mariadb-client-core-5.3
-Replaces: mysql-client (<< 5.0.51), mysql-client-5.0,
-    mysql-client-5.1, mysql-client-5.5,
-    mysql-client-core-5.1, mysql-client-core-5.5,
-    mariadb-client-5.1, mariadb-client-core-5.1,
-    mariadb-client-5.2, mariadb-client-core-5.2,
-    mariadb-client-5.3, mariadb-client-core-5.3
-Description: MariaDB database core client binaries
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the core client files, as used by Akonadi.
-
-Package: mariadb-client-5.5
-Architecture: any
-Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mariadb-common, libmariadbclient18 (>= ${source:Version}), mariadb-client-core-5.5 (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: virtual-mysql-client, mysql-client,
-    mysql-client-4.1, mysql-client-5.1, mysql-client-5.5
-Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
-    mariadb-client (<< ${source:Version}),
-    mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mysql-client-5.5
-Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
-    mysql-client-5.5,
-    mariadb-client (<< ${source:Version}),
-    mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3
-Description: MariaDB database client binaries
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the client binaries and the additional tools
- innotop and mysqlreport.
-
-Package: mariadb-server-core-5.5
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
-Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
-Conflicts: mysql-server-5.0,
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
-Replaces: mysql-server-5.0,
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
-Description: MariaDB database core server files
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the core server files, as used by Akonadi.
-
-Package: mariadb-test-5.5
-Section: database
-Architecture: all
-Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
-Conflicts: mariadb-test (<< ${source:Version}),
-    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
-Replaces: mariadb-test (<< ${source:Version}),
-    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
-Description: MariaDB database regression test suite
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the regression test suite.
-
 Package: mariadb-server-5.5
 Architecture: any
 Suggests: tinyca, mailx, mariadb-test
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.5 (>= ${binary:Version})
-Provides: mariadb-server, mysql-server, virtual-mysql-server
-Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
+Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), libmariadbclient18 (>= ${binary:Version})
+Provides:  mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5, mariadb-galera-server, mysql-server, virtual-mysql-server
+Conflicts: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
-Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
+    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
+    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
+Replaces: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
-    libmariadbclient16 (<< 5.3.4),
-    libmariadbclient-dev (<< 5.5.0)
-Description: MariaDB database server binaries
+    libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
+    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
+    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
+Description: MariaDB database server with Galera cluster binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
@@ -195,11 +36,11 @@ Description: MariaDB database server bin
  .
  This package includes the server binaries.
 
-Package: mariadb-server
+Package: mariadb-galera-server
 Section: database
 Architecture: all
-Depends: mariadb-server-5.5, ${misc:Depends}
-Description: MariaDB database server (metapackage depending on the latest version)
+Depends: mariadb-galera-server-5.5, ${misc:Depends}
+Description: MariaDB database with Galera cluster 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-5.5), as determined by the MariaDB
  maintainers. Install this package if in doubt about which MariaDB
@@ -211,21 +52,3 @@ Description: MariaDB database server (me
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
 
-Package: mariadb-client
-Section: database
-Architecture: all
-Depends: mariadb-client-5.5, ${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-5.5), 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-5.5
-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-5.5), as determined by the MariaDB
- maintainers.

=== modified file 'debian/dist/Ubuntu/mariadb-server-5.5.files'
--- a/debian/dist/Ubuntu/mariadb-server-5.5.files	2012-01-28 20:22:14 +0000
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.files	2012-11-18 14:07:02 +0000
@@ -1,3 +1,4 @@
+usr/sbin/mysqld
 usr/lib/mysql/plugin/
 usr/lib/libhsclient.so.*
 etc/apparmor.d/usr.sbin.mysqld
@@ -57,6 +58,31 @@ usr/share/man/man1/resolveip.1
 usr/share/man/man1/resolve_stack_dump.1
 usr/share/man/man1/innochecksum.1
 usr/share/man/man1/mysql_tzinfo_to_sql.1
+usr/share/man/man8/mysqld.8
+usr/share/mysql/charsets
+usr/share/mysql/czech
+usr/share/mysql/danish
+usr/share/mysql/dutch
+usr/share/mysql/english
+usr/share/mysql/estonian
+usr/share/mysql/french
+usr/share/mysql/german
+usr/share/mysql/greek
+usr/share/mysql/hungarian
+usr/share/mysql/italian
+usr/share/mysql/japanese
+usr/share/mysql/korean
+usr/share/mysql/norwegian
+usr/share/mysql/norwegian-ny
+usr/share/mysql/polish
+usr/share/mysql/portuguese
+usr/share/mysql/romanian
+usr/share/mysql/russian
+usr/share/mysql/serbian
+usr/share/mysql/slovak
+usr/share/mysql/spanish
+usr/share/mysql/swedish
+usr/share/mysql/ukrainian
 usr/share/mysql/debian-start.inc.sh
 usr/share/mysql/echo_stderr
 usr/share/mysql/errmsg-utf8.txt

=== modified file 'debian/dist/Ubuntu/rules'
--- a/debian/dist/Ubuntu/rules	2012-06-06 12:15:29 +0000
+++ b/debian/dist/Ubuntu/rules	2012-11-18 14:07:02 +0000
@@ -190,15 +190,13 @@ 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-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-5.5
-        cp debian/mariadb-client-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-5.5
+        cp debian/mariadb-galera-server-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-5.5
 
         # For 5.0 -> 5.5 transition
         d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
         mkdir -p $$d; \
-        cp debian/mariadb-server-5.5.mysql.init $$d/_etc_init.d_mysql; \
-        cp debian/mariadb-server-5.5.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
+        cp debian/mariadb-galera-server-5.5.mysql.init $$d/_etc_init.d_mysql; \
+        cp debian/mariadb-galera-server-5.5.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
         cp debian/additions/debian-start $$d/_etc_mysql_debian-start;
 
         # install AppArmor profile



More information about the commits mailing list