Salut,
In order to make Amarok (embedded mysql 5.1) and Akonadi (mysql 5.0) on
Kubuntu co-installable again, we'd like to upload a revised mysql-5.1 package
with your consent :)
Attached you'll find a debdiff for current mysql-5.1 packaging, moving data
files
to a spearate package, which can be used by applications with embedded mysql
(e.g. amarok).
We changed the datadir to /usr/share/mysql-5.1, to make this new data package
co-installable with mysql-server-5.0 (e.g. as used by akonadi).
I have also added a couple of replaces/conflicts for the unofficial
amarok-mysql
packages Kubuntu published for the Amarok 2 deployment on Intrepid.
regards,
Harald
diff -u mysql-dfsg-5.1-5.1.30/debian/mysql-server-5.1.dirs mysql-dfsg-5.1-5.1.30/debian/mysql-server-5.1.dirs
--- mysql-dfsg-5.1-5.1.30/debian/mysql-server-5.1.dirs
+++ mysql-dfsg-5.1-5.1.30/debian/mysql-server-5.1.dirs
@@ -4,5 +4,4 @@
usr/sbin
usr/share/man/man8
-usr/share/mysql
var/run/mysqld
var/lib/mysql-upgrade
diff -u mysql-dfsg-5.1-5.1.30/debian/mysql-server-5.1.postinst mysql-dfsg-5.1-5.1.30/debian/mysql-server-5.1.postinst
--- mysql-dfsg-5.1-5.1.30/debian/mysql-server-5.1.postinst
+++ mysql-dfsg-5.1-5.1.30/debian/mysql-server-5.1.postinst
@@ -4,7 +4,7 @@
if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
-
+
export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
# This command can be used as pipe to syslog. With "-s" it also logs to stderr.
@@ -58,10 +58,10 @@
# In case the server wasn't running at all it should be ok if the stop
# script fails. I can't tell at this point because of the cleaned /var/run.
set +e; invoke stop; set -e
-
+
case "$1" in
configure)
- mysql_datadir=/usr/share/mysql
+ mysql_datadir=/usr/share/mysql-5.1/mysql
mysql_statedir=/var/lib/mysql
mysql_rundir=/var/run/mysqld
mysql_logdir=/var/log
@@ -104,7 +104,7 @@
fi
rmdir $mysql_upgradedir 2>/dev/null || true
done
-
+
# Ensure the existence and right permissions for the database and
# log files.
if [ ! -d "$mysql_statedir" -a ! -L "$mysql_statedir" ]; then mkdir "$mysql_statedir"; fi
@@ -135,15 +135,15 @@
touch $mysql_statedir/debian-5.1.flag
# initiate databases. Output is not allowed by debconf :-(
- # Debian: beware of the bashisms...
- # Debian: can safely run on upgrades with existing databases
+ # Debian: beware of the bashisms...
+ # Debian: can safely run on upgrades with existing databases
set +e
/bin/bash /usr/bin/mysql_install_db --rpm 2>&1 | $ERR_LOGGER
if [ "$?" != "0" ]; then
echo "ATTENTION: An error has occured. More info is in the syslog!"
fi
set -e
-
+
## On every reconfiguration the maintenance user is recreated.
#
# - It is easier to regenerate the password every time but as people
@@ -162,7 +162,7 @@
# the old query which always succeeds and then the new which may or may not.
# recreate the credentials file if not present or without mysql_upgrade stanza
- dc=$mysql_cfgdir/debian.cnf;
+ dc=$mysql_cfgdir/debian.cnf;
if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then
pass="`sed -n 's/^[ ]*password *= *// p' $dc | head -n 1`"
else
reverted:
--- mysql-dfsg-5.1-5.1.30/debian/mysql-server-5.1.links
+++ mysql-dfsg-5.1-5.1.30.orig/debian/mysql-server-5.1.links
@@ -1,2 +0,0 @@
-usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run
-usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr
diff -u mysql-dfsg-5.1-5.1.30/debian/mysql-server-5.1.files mysql-dfsg-5.1-5.1.30/debian/mysql-server-5.1.files
--- mysql-dfsg-5.1-5.1.30/debian/mysql-server-5.1.files
+++ mysql-dfsg-5.1-5.1.30/debian/mysql-server-5.1.files
@@ -53 +52,0 @@
-usr/share/mysql/
diff -u mysql-dfsg-5.1-5.1.30/debian/changelog mysql-dfsg-5.1-5.1.30/debian/changelog
--- mysql-dfsg-5.1-5.1.30/debian/changelog
+++ mysql-dfsg-5.1-5.1.30/debian/changelog
@@ -1,3 +1,22 @@
+mysql-dfsg-5.1 (5.1.30-2ubuntu4) jaunty; urgency=low
+
+ [ Jonathan Riddell ]
+ * Move data files to /usr/share/mysql-5.1 with
+ --datadir=/usr/share/mysql-5.1 to make them co-installable with mysql 5.0
+ * Update debian/rules for the above change
+ * Split out /usr/share/mysql-5.1 into new mysql-server-data-5.1 package.
+ These files are needed for embedded use of mysql (e.g. by Amarok).
+
+ [ Harald Sitter ]
+ * Update all remaining references of usr/share/mysql/
+ * Conflicts for the Kubuntu Intrepid deployment (subject for upgrade testing):
+ + libmysqlclient16 replaces & conflicts amarok-libmysqlclient16
+ + libmysqlclient16.dev replaces & conflicts amarok-libmysqlclient-dev
+ + mysql-data-5.1 replaces & conflicts amarok-mysql-data
+ * Link /usr/share/mysql-5.1/aclocal/mysql.m4 to /usr/share/aclocal/
+
+ -- Harald Sitter <[email protected]> Tue, 20 Jan 2009 15:43:46 +0100
+
mysql-dfsg-5.1 (5.1.30-2ubuntu3) jaunty; urgency=low
* Change file names on the following files:
diff -u mysql-dfsg-5.1-5.1.30/debian/rules mysql-dfsg-5.1-5.1.30/debian/rules
--- mysql-dfsg-5.1-5.1.30/debian/rules
+++ mysql-dfsg-5.1-5.1.30/debian/rules
@@ -75,7 +75,7 @@
--prefix=/usr \
--exec-prefix=/usr \
--libexecdir=/usr/sbin \
- --datadir=/usr/share \
+ --datadir=/usr/share/mysql-5.1 \
--localstatedir=/var/lib/mysql \
--includedir=/usr/include \
--infodir=/usr/share/info \
@@ -224,15 +224,15 @@
# mysql-server
install -m 0755 scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe
mkdir -p $(TMP)/usr/share/doc/mysql-server-5.1/examples
- mv $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/mysql-server-5.1/examples/
- rm -vf $(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
+ mv $(TMP)/usr/share/mysql-5.1/mysql/*cnf $(TMP)/usr/share/doc/mysql-server-5.1/examples/
+ rm -vf $(TMP)/usr/share/mysql-5.1/mysql/mi_test_all* \
+ $(TMP)/usr/share/mysql-5.1/mysql/mysql-log-rotate \
+ $(TMP)/usr/share/mysql-5.1/mysql/mysql.server \
+ $(TMP)/usr/share/mysql-5.1/mysql/binary-configure
nm -n sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mysql-server-5.1/mysqld.sym.gz
- install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
+ install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql-5.1/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 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql-5.1/mysql/
# lintian overrides
mkdir -p $(TMP)/usr/share/lintian/overrides/
cp debian/mysql-common.lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-common
diff -u mysql-dfsg-5.1-5.1.30/debian/control mysql-dfsg-5.1-5.1.30/debian/control
--- mysql-dfsg-5.1-5.1.30/debian/control
+++ mysql-dfsg-5.1-5.1.30/debian/control
@@ -14,6 +14,8 @@
Section: libs
Architecture: any
Depends: mysql-common (>= ${source:Version}), ${shlibs:Depends}
+Replaces: amarok-libmysqlclient16
+Conflicts: amarok-libmysqlclient16
Description: MySQL database client library
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
@@ -25,8 +27,10 @@
Package: libmysqlclient16-dev
Architecture: any
Section: libdevel
-Depends: libmysqlclient16 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}
-Conflicts: libmysqlclient15-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev
+Depends: libmysqlclient16 (>= ${source:Version}), zlib1g-dev, ${shlibs:Depends}
+Replaces: amarok-libmysqlclient-dev
+Conflicts: libmysqlclient15-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev,
+ amarok-libmysqlclient-dev
Description: MySQL database development files
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
@@ -48,14 +52,29 @@
This package includes the client binaries and the additional tools
innotop and mysqlreport.
+Package: mysql-server-data-5.1
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: mysql-server-5.1 (<< 5.1.30-2ubuntu4), amarok-mysql-data
+Conflicts: amarok-mysql-data
+Description: MySQL database server data files
+ MySQL 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 MySQL are speed, robustness and
+ ease of use.
+ .
+ This package includes the server's data files, used by applications
+ using embedded MySQL.
+
Package: mysql-server-5.1
Architecture: any
Suggests: tinyca
Recommends: mailx, libhtml-template-perl
Pre-Depends: mysql-common (>= ${source:Version}), adduser (>= 3.40), debconf
-Depends: mysql-client-5.1 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10)
+Depends: mysql-client-5.1 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10),
+ mysql-server-data-5.1 (>= ${source:Version})
Conflicts: mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0
-Description: MySQL database server binaries
+Description: MySQL database server binaries
MySQL 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 MySQL are speed, robustness and
diff -u mysql-dfsg-5.1-5.1.30/debian/additions/my.cnf mysql-dfsg-5.1-5.1.30/debian/additions/my.cnf
--- mysql-dfsg-5.1-5.1.30/debian/additions/my.cnf
+++ mysql-dfsg-5.1-5.1.30/debian/additions/my.cnf
@@ -4,7 +4,7 @@
# You can copy this to one of:
# - "/etc/mysql/my.cnf" to set global options,
# - "~/.my.cnf" to set user-specific options.
-#
+#
# One can use all long options that the program supports.
# Run program with --help to get a list of available options and with
# --print-defaults to see which it would actually understand and use.
@@ -39,7 +39,7 @@
basedir = /usr
datadir = /var/lib/mysql
tmpdir = /tmp
-language = /usr/share/mysql/english
+language = /usr/share/mysql-5.1/mysql/english
skip-external-locking
#
# For compatibility to other Debian packages that still use
diff -u mysql-dfsg-5.1-5.1.30/debian/additions/debian-start mysql-dfsg-5.1-5.1.30/debian/additions/debian-start
--- mysql-dfsg-5.1-5.1.30/debian/additions/debian-start
+++ mysql-dfsg-5.1-5.1.30/debian/additions/debian-start
@@ -1,11 +1,11 @@
#!/bin/bash
#
# This script is executed by "/etc/init.d/mysql" on every (re)start.
-#
+#
# Changes to this file will be preserved when updating the Debian package.
#
-source /usr/share/mysql/debian-start.inc.sh
+source /usr/share/mysql-5.1/mysql/debian-start.inc.sh
MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf"
MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
@@ -19,7 +19,7 @@
# where they do not block the server start and in one shell instance so that
# they run sequentially. They are supposed not to echo anything to stdout.
# If you want to disable the check for crashed tables comment
-# "check_for_crashed_tables" out.
+# "check_for_crashed_tables" out.
# (There may be no output to stdout inside the background process!)
echo "Checking for corrupt, not cleanly closed and upgrade needing tables."
(
only in patch2:
unchanged:
--- mysql-dfsg-5.1-5.1.30.orig/debian/mysql-server-data-5.1.files
+++ mysql-dfsg-5.1-5.1.30/debian/mysql-server-data-5.1.files
@@ -0,0 +1 @@
+usr/share/mysql-5.1/
only in patch2:
unchanged:
--- mysql-dfsg-5.1-5.1.30.orig/debian/mysql-server-data-5.1.dirs
+++ mysql-dfsg-5.1-5.1.30/debian/mysql-server-data-5.1.dirs
@@ -0,0 +1 @@
+usr/share/mysql-5.1/mysql
only in patch2:
unchanged:
--- mysql-dfsg-5.1-5.1.30.orig/debian/mysql-server-data-5.1.links
+++ mysql-dfsg-5.1-5.1.30/debian/mysql-server-data-5.1.links
@@ -0,0 +1,3 @@
+usr/share/mysql-5.1/mysql/mysql-test/mysql-test-run.pl usr/share/mysql-5.1/mysql/mysql-test/mysql-test-run
+usr/share/mysql-5.1/mysql/mysql-test/mysql-test-run.pl usr/share/mysql-5.1/mysql/mysql-test/mtr
+usr/share/mysql-5.1/aclocal/mysql.m4 usr/share/aclocal/mysql.m4
--
ubuntu-server mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-server
More info: https://wiki.ubuntu.com/ServerTeam
