[Commits] Rev 3235: More 5.5 .deb packaging fixes in http://bazaar.launchpad.net/~maria-captains/maria/5.5

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Tue Jan 24 15:52:43 EET 2012


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

------------------------------------------------------------
revno: 3235
revision-id: knielsen at knielsen-hq.org-20120124135243-fh8k14tskt43o454
parent: knielsen at knielsen-hq.org-20120124112744-mzw60929opoiq8u9
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.5
timestamp: Tue 2012-01-24 14:52:43 +0100
message:
  More 5.5 .deb packaging fixes
=== modified file 'debian/dist/Debian/rules'
--- a/debian/dist/Debian/rules	2012-01-23 14:08:46 +0000
+++ b/debian/dist/Debian/rules	2012-01-24 13:52:43 +0000
@@ -78,7 +78,7 @@ endif
                         -DINSTALL_MANDIR=share/man \
                 \
                 -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
-                -DWITH_COMMENT="(MariaDB - http://mariadb.com/)" \
+                -DCOMPILATION_COMMENT="mariadb.org binary distribution" \
                 -DSYSTEM_TYPE="debian-linux-gnu" \
                 -DINSTALL_LAYOUT=DEB \
                 \
@@ -86,7 +86,6 @@ endif
                 -DWITH_FAST_MUTEXES=1 \
                 \
                 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-                -DMYSQL_USER=mysql \
                 \
                 -DEXTRA_CHARSETS=all \
                 -DWITH_LIBWRAP=1 \

=== modified file 'debian/dist/Ubuntu/rules'
--- a/debian/dist/Ubuntu/rules	2012-01-23 14:08:46 +0000
+++ b/debian/dist/Ubuntu/rules	2012-01-24 13:52:43 +0000
@@ -78,7 +78,7 @@ endif
                         -DINSTALL_MANDIR=share/man \
                 \
                 -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
-                -DWITH_COMMENT="(MariaDB - http://mariadb.com/)" \
+                -DCOMPILATION_COMMENT="mariadb.org binary distribution" \
                 -DSYSTEM_TYPE="debian-linux-gnu" \
                 -DINSTALL_LAYOUT=DEB \
                 \
@@ -86,7 +86,6 @@ endif
                 -DWITH_FAST_MUTEXES=1 \
                 \
                 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-                -DMYSQL_USER=mysql \
                 \
                 -DEXTRA_CHARSETS=all \
                 -DWITH_LIBWRAP=1 \

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2012-01-13 14:50:02 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2012-01-24 13:52:43 +0000
@@ -278,6 +278,7 @@ sub collect_one_suite
     {
       $suitedir= my_find_dir($::basedir,
                              ["share/mysql-test/suite",
+                              "share/mysql/mysql-test/suite",
                               "mysql-test/suite",
                               "mysql-test",
                               # Look in storage engine specific suite dirs



More information about the commits mailing list