Bug#548419: #548419: MySQL package split patch [update]

2010-03-18 Thread Didier 'OdyX' Raboud 
Le Vendredi 12 Mars 2010 12:07:02 Didier 'OdyX' Raboud, vous avez écrit :
 Hi all,
 
 I managed to prepare a split of the mysql-server-5.1 package. The patch is
 attached.
 
 It uses the same naming scheme and file repartition as Ubuntu. I also
 patched the descriptions to fit tightly to what the packages really
 contain and I targeted that to experimental. I tried to prepare a
 minimal-impact patch.
 
 This patch is rather important for KDE, because it will allow it to only
 depend on mysql-server-core and avoid forcing people to run a system
 database. Please comment !
 
 Best regards,
 
 OdyX

Hi all, 

the attached patch is the update consecutive to the recent mysql-5.1 upload.

Thanks in advance to consider this patch!

Best regards, 

OdyX

-- 
Didier Raboud, proud Debian Maintainer (DM).
CH-1020 Renens
did...@raboud.com
Index: debian/control
===
--- debian/control	(révision 1855)
+++ debian/control	(copie de travail)
@@ -91,22 +91,37 @@
  This package includes the client binaries and the additional tools
  innotop and mysqlreport.
 
+Package: mysql-server-core-5.1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql-server-5.1 ( 5.1.44-3.1), mysql-server-5.0 ( 5.1.44-3.1)
+Provides: mysql-server-core, mysql-server-core-5.0
+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
+ ease of use.
+ .
+ This package includes the server binaries but doesn't contain all the
+ infrastructure needed to setup system databases.
+
 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-core-5.1 (= ${binary:Version})
 Conflicts: mysql-server ( ${source:Version}), mysql-server-4.1
 Provides: mysql-server, virtual-mysql-server, mysql-server-5.0
 Replaces: mysql-server ( ${source:Version}), mysql-server-5.0, libmysqlclient-dev (= 5.1.41-1)
-Description: MySQL database server binaries 
+Description: MySQL database server binaries and system database setup 
  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 binaries.
+ This package contains all the infrastructure needed to setup system
+ databases.
 
 Package: mysql-server
 Section: database
Index: debian/mysql-server-core-5.1.dirs
===
--- debian/mysql-server-core-5.1.dirs	(révision 0)
+++ debian/mysql-server-core-5.1.dirs	(révision 0)
@@ -0,0 +1,2 @@
+usr/sbin
+usr/share/man/man8
Index: debian/mysql-server-core-5.1.files
===
--- debian/mysql-server-core-5.1.files	(révision 0)
+++ debian/mysql-server-core-5.1.files	(révision 0)
@@ -0,0 +1,26 @@
+usr/sbin/mysqld
+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
Index: debian/mysql-server-5.1.dirs
===
--- debian/mysql-server-5.1.dirs	(révision 1855)
+++ debian/mysql-server-5.1.dirs	(copie de travail)
@@ -2,7 +2,5 @@
 etc/logrotate.d
 etc/mysql/conf.d
 usr/bin
-usr/sbin
-usr/share/man/man8
 usr/share/mysql
 var/lib/mysql-upgrade
Index: debian/mysql-server-5.1.files
===
--- debian/mysql-server-5.1.files	(révision 1855)
+++ debian/mysql-server-5.1.files	(copie de travail)
@@ -24,7 +24,6 @@
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
-usr/sbin/mysqld
 usr/share/doc/mysql-server-5.1/
 usr/share/lintian/overrides/mysql-server-5.1

Bug#548419: [debian-mysql] Bug#548419: #548419: MySQL package split patch [update]

2010-03-18 Thread Norbert Tretkowski 
Hi Didier,

Am Donnerstag, den 18.03.2010, 14:35 +0100 schrieb Didier 'OdyX' Raboud:
 the attached patch is the update consecutive to the recent mysql-5.1
 upload.

thanks a lot for the patch, I submitted it to our svn repository, and
will upload it to experimental when I found time for some testing.

Norbert




-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#548419: #548419: MySQL package split patch

2010-03-12 Thread Didier 'OdyX' Raboud 
tag 548419 +patch
thanks

Hi all, 

I managed to prepare a split of the mysql-server-5.1 package. The patch is 
attached.

It uses the same naming scheme and file repartition as Ubuntu. I also patched 
the descriptions to fit tightly to what the packages really contain and I 
targeted that to experimental. I tried to prepare a minimal-impact patch.

This patch is rather important for KDE, because it will allow it to only depend 
on mysql-server-core and avoid forcing people to run a system database. 
Please 
comment !

Best regards, 

OdyX
-- 
Didier Raboud, proud Debian Maintainer (DM).
CH-1020 Renens
did...@raboud.com
Index: debian/changelog
===
--- debian/changelog	(revision 1848)
+++ debian/changelog	(working copy)
@@ -1,3 +1,16 @@
+mysql-dfsg-5.1 (5.1.44-3.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Add mysql-server-core-5.1 package, containing the package and its manpage,
+to let packages like akonadi use the mysql binary without using system
+databases (Closes: #548419).
+Affects: 
+- debian/control
+- debian/mysql-server-5.1.{files,dirs}
+- debian/mysql-server-core-5.1.{files,dirs}
+
+ -- Didier Raboud did...@raboud.com  Mon, 08 Mar 2010 19:29:36 +0100
+
 mysql-dfsg-5.1 (5.1.44-3) unstable; urgency=low
 
   * Add patch that reinstates the reloading of character set data when a
Index: debian/control
===
--- debian/control	(revision 1848)
+++ debian/control	(working copy)
@@ -91,22 +91,37 @@
  This package includes the client binaries and the additional tools
  innotop and mysqlreport.
 
+Package: mysql-server-core-5.1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql-server-5.1 ( 5.1.44-3.1), mysql-server-5.0 ( 5.1.44-3.1)
+Provides: mysql-server-core, mysql-server-core-5.0
+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
+ ease of use.
+ .
+ This package includes the server binaries but doesn't contain all the
+ infrastructure needed to setup system databases.
+
 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-core-5.1 (= ${binary:Version})
 Conflicts: mysql-server ( ${source:Version}), mysql-server-4.1
 Provides: mysql-server, virtual-mysql-server, mysql-server-5.0
 Replaces: mysql-server ( ${source:Version}), mysql-server-5.0, libmysqlclient-dev (= 5.1.41-1)
-Description: MySQL database server binaries 
+Description: MySQL database server binaries and system database setup 
  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 binaries.
+ This package contains all the infrastructure needed to setup system
+ databases.
 
 Package: mysql-server
 Section: database
Index: debian/mysql-server-5.1.files
===
--- debian/mysql-server-5.1.files	(revision 1848)
+++ debian/mysql-server-5.1.files	(working copy)
@@ -24,7 +24,6 @@
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
-usr/sbin/mysqld
 usr/share/doc/mysql-server-5.1/
 usr/share/lintian/overrides/mysql-server-5.1
 usr/share/man/man1/msql2mysql.1
@@ -51,5 +50,16 @@
 usr/share/man/man1/innochecksum.1
 usr/share/man/man1/mysqltest_embedded.1
 usr/share/man/man1/mysql_tzinfo_to_sql.1
-usr/share/man/man8/mysqld.8
-usr/share/mysql/
+usr/share/mysql/debian-start.inc.sh
+usr/share/mysql/echo_stderr
+usr/share/mysql/errmsg.txt
+usr/share/mysql/fill_help_tables.sql
+usr/share/mysql/mysqld_multi.server
+usr/share/mysql/mysql_fix_privilege_tables.sql
+usr/share/mysql/mysql_system_tables.sql
+usr/share/mysql/mysql_system_tables_data.sql
+usr/share/mysql/mysql_test_data_timezone.sql
+usr/share/mysql/config.huge.ini
+usr/share/mysql/config.medium.ini
+usr/share/mysql/config.small.ini
+usr/share/mysql/ndb-config-2-node.ini
Index: debian/mysql-server-core-5.1.files
===
--- debian/mysql-server-core-5.1.files	(revision 0)
+++ debian/mysql-server-core-5.1.files	(revision 0)
@@ -0,0