[Commits] Rev 3234: More small 5.5 .deb packaging fixes found in Buildbot tests. in http://bazaar.launchpad.net/~maria-captains/maria/5.5

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Tue Jan 24 13:27:45 EET 2012


At http://bazaar.launchpad.net/~maria-captains/maria/5.5

------------------------------------------------------------
revno: 3234
revision-id: knielsen at knielsen-hq.org-20120124112744-mzw60929opoiq8u9
parent: knielsen at knielsen-hq.org-20120124094757-de1zyppcl66mj6aw
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.5
timestamp: Tue 2012-01-24 12:27:44 +0100
message:
  More small 5.5 .deb packaging fixes found in Buildbot tests.
=== modified file 'debian/additions/my.cnf'
--- a/debian/additions/my.cnf	2012-01-23 11:20:16 +0000
+++ b/debian/additions/my.cnf	2012-01-24 11:27:44 +0000
@@ -54,7 +54,8 @@ port		= 3306
 basedir         = /usr
 datadir         = /var/lib/mysql
 tmpdir          = /tmp
-language        = /usr/share/mysql/english
+lc_messages_dir = /usr/share/mysql
+lc_messages     = en_US
 skip-external-locking
 #
 # * Character sets

=== modified file 'debian/dist/Debian/control'
--- a/debian/dist/Debian/control	2012-01-24 09:47:57 +0000
+++ b/debian/dist/Debian/control	2012-01-24 11:27:44 +0000
@@ -178,8 +178,7 @@ Depends: mariadb-client-5.5 (>= ${source
 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,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
-    libmariadbclient16 (<< 5.3.4)
+    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
 Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,

=== modified file 'debian/dist/Debian/mariadb-server-5.5.files'
--- a/debian/dist/Debian/mariadb-server-5.5.files	2012-01-23 11:20:16 +0000
+++ b/debian/dist/Debian/mariadb-server-5.5.files	2012-01-24 11:27:44 +0000
@@ -15,6 +15,7 @@ usr/bin/aria_chk
 usr/bin/aria_dump_log
 usr/bin/mysql_convert_table_format
 usr/bin/mysql_install_db
+usr/bin/mysql_plugin
 usr/bin/mysql_secure_installation
 usr/bin/mysql_setpermission
 usr/bin/mysql_tzinfo_to_sql

=== modified file 'debian/dist/Ubuntu/control'
--- a/debian/dist/Ubuntu/control	2012-01-24 09:47:57 +0000
+++ b/debian/dist/Ubuntu/control	2012-01-24 11:27:44 +0000
@@ -172,8 +172,7 @@ Depends: mariadb-client-5.5 (>= ${source
 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,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
-    libmariadbclient16 (<< 5.3.4)
+    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
 Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,

=== modified file 'debian/dist/Ubuntu/mariadb-server-5.5.files'
--- a/debian/dist/Ubuntu/mariadb-server-5.5.files	2012-01-23 16:07:01 +0000
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.files	2012-01-24 11:27:44 +0000
@@ -17,6 +17,7 @@ usr/bin/aria_chk
 usr/bin/aria_dump_log
 usr/bin/mysql_convert_table_format
 usr/bin/mysql_install_db
+usr/bin/mysql_plugin
 usr/bin/mysql_secure_installation
 usr/bin/mysql_setpermission
 usr/bin/mysql_tzinfo_to_sql



More information about the commits mailing list