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

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Mon Nov 22 13:56:30 EET 2010


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

------------------------------------------------------------
revno: 92
revision-id: knielsen at knielsen-hq.org-20101122115629-4fi6f4mgoh2rjwxe
parent: knielsen at knielsen-hq.org-20101121224735-1kpbf2fpjpm9spat
committer: knielsen at knielsen-hq.org
branch nick: ourdelta-bugfix
timestamp: Mon 2010-11-22 12:56:29 +0100
message:
  More .deb packaging bug fixes.
  
   - MBug#509535, use system libs; libevent is too old on some distros, use bundled there.
  
   - MBug#616307, upgrade failure on Squeeze, apply same fix as on Ubuntu.
  
   - Remove comment that breaks shell
=== modified file 'bakery/debian-5.1/dist/Debian/control'
--- a/bakery/debian-5.1/dist/Debian/control	2010-05-13 11:13:29 +0000
+++ b/bakery/debian-5.1/dist/Debian/control	2010-11-22 11:56:29 +0000
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: OurDelta Developers <ourdelta-developers at lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers at lists.launchpad.net>
 Uploaders: Peter Lieverdink <peter at openquery.com>, Arjen Lentz <arjen at openquery.com>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, libevent-dev, libssl-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper
 Standards-Version: 3.8.3
 Homepage: http://launchpad.net/maria
 Vcs-Browser: http://bazaar.launchpad.net/~ourdelta-core/ourdelta/trunk/files
@@ -116,6 +116,20 @@ Description: MariaDB database client bin
  This package includes the client binaries and the additional tools
  innotop and mysqlreport.
 
+Package: mariadb-server-core-5.1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient16 (>= ${binary:Version})
+Conflicts: mariadb-server-5.1 (<< ${source:Version}), mysql-server-core-5.1, mysql-server-core-5.0, mysql-server-core-5.1
+Provides: mysql-server-core, mysql-server-core-5.1
+Replaces: mariadb-server-5.1 (<< ${source:Version}), mysql-server-5.1 (<< ${source:Version}), mysql-server-core-5.0, mysql-server-core-5.1
+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.1
 Section: database
 Architecture: all
@@ -135,7 +149,7 @@ Architecture: any
 Suggests: tinyca, mariadb-test
 Recommends: mailx, libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-5.1 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10)
+Depends: mariadb-client-5.1 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.1 (>= ${binary:Version})
 Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, mysql-server-5.1
 Provides: mariadb-server, mysql-server, virtual-mysql-server
 Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mysql-server-5.0, mysql-server-5.1

=== modified file 'bakery/debian-5.1/dist/Debian/mariadb-server-5.1.files'
--- a/bakery/debian-5.1/dist/Debian/mariadb-server-5.1.files	2009-10-30 12:49:15 +0000
+++ b/bakery/debian-5.1/dist/Debian/mariadb-server-5.1.files	2010-11-22 11:56:29 +0000
@@ -28,7 +28,6 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
-usr/sbin/mysqld
 usr/share/doc/mariadb-server-5.1/mysqld.sym.gz
 usr/share/lintian/overrides/mariadb-server-5.1
 usr/share/man/man1/msql2mysql.1
@@ -54,7 +53,6 @@ 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/debian-start.inc.sh
 usr/share/mysql/echo_stderr
 usr/share/mysql/errmsg.txt
@@ -64,27 +62,3 @@ usr/share/mysql/mysql_fix_privilege_tabl
 usr/share/mysql/mysql_system_tables_data.sql
 usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_test_data_timezone.sql
-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

=== modified file 'bakery/debian-5.1/dist/Debian/rules'
--- a/bakery/debian-5.1/dist/Debian/rules	2010-11-21 22:47:35 +0000
+++ b/bakery/debian-5.1/dist/Debian/rules	2010-11-22 11:56:29 +0000
@@ -22,6 +22,7 @@ DEB_UPSTREAM_VERSION ?= $(shell echo $(D
 DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
 
 DISTRIBUTION = $(shell lsb_release -i -s)
+RELEASE = $(shell lsb_release -r -s | sed 's/\..*//' )
 
 MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
 ifeq (${MAKE_J}, -j0)
@@ -37,6 +38,14 @@ endif
 
 USE_ASSEMBLER=--enable-assembler 
 
+# From Debian Squeeze we can use system libevent. But before that,
+# system libevent is too old, and we must use bundled.
+ifneq (,$(filter $(RELEASE), 4 5))
+    USE_LIBEVENT=--with-libevent=/usr
+else
+    USE_LIBEVENT=--with-libevent
+endif
+
 ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390))
     TESTSUITE_FAIL_CMD=exit 1
 else
@@ -107,8 +116,8 @@ endif
                 --with-extra-charsets=all \
                 --with-libwrap \
                 --with-ssl=/usr \
-                --with-libevent=/usr \
-                --without-readline # "without bundled", use system libreadline \
+                $(USE_LIBEVENT) \
+                --without-readline \
                 --with-zlib-dir=/usr \
                 --with-embedded-server \
                 --with-embedded-privilege-control \

=== modified file 'bakery/debian-5.1/dist/Ubuntu/control'
--- a/bakery/debian-5.1/dist/Ubuntu/control	2010-05-13 11:13:29 +0000
+++ b/bakery/debian-5.1/dist/Ubuntu/control	2010-11-22 11:56:29 +0000
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: OurDelta Developers <ourdelta-developers at lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers at lists.launchpad.net>
 Uploaders: Peter Lieverdink <peter at openquery.com>, Arjen Lentz <arjen at openquery.com>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript, dpatch, gawk, bison, lsb-release, hardening-wrapper
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, libevent-dev, libssl-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript, dpatch, gawk, bison, lsb-release, hardening-wrapper
 Standards-Version: 3.8.2
 Homepage: http://launchpad.net/maria
 Vcs-Browser: http://bazaar.launchpad.net/~ourdelta-core/ourdelta/trunk/files

=== modified file 'bakery/debian-5.1/dist/Ubuntu/rules'
--- a/bakery/debian-5.1/dist/Ubuntu/rules	2010-11-21 22:47:35 +0000
+++ b/bakery/debian-5.1/dist/Ubuntu/rules	2010-11-22 11:56:29 +0000
@@ -22,6 +22,7 @@ DEB_UPSTREAM_VERSION ?= $(shell echo $(D
 DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
 
 DISTRIBUTION = $(shell lsb_release -i -s)
+RELEASE = $(shell lsb_release -r -s)
 
 MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
 ifeq (${MAKE_J}, -j0)
@@ -43,6 +44,14 @@ MYSQL_BUILD_CXX = gcc -static-libgcc
 MYSQL_BUILD_CFLAGS = -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized
 MYSQL_BUILD_CXXFLAGS = -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized
 
+# From Ubuntu 9.10 "Karmic" we can use system libevent. But before
+# that, system libevent is too old, and we must use bundled.
+ifneq (,$(filter $(RELEASE), 8.04 8.10 9.04))
+    USE_LIBEVENT=--with-libevent=/usr
+else
+    USE_LIBEVENT=--with-libevent
+endif
+
 ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390))
     TESTSUITE_FAIL_CMD=exit 1
 else
@@ -108,8 +117,8 @@ endif
                 --with-extra-charsets=all \
                 --with-libwrap \
                 --with-ssl=/usr \
-                --with-libevent=/usr \
-                --without-readline # "without bundled", use system libreadline \
+                $(USE_LIBEVENT) \
+                --without-readline \
                 --with-zlib-dir=/usr \
                 --with-embedded-server \
                 --with-embedded-privilege-control \

=== renamed file 'bakery/debian-5.1/dist/Ubuntu/mariadb-server-core-5.1.files' => 'bakery/debian-5.1/mariadb-server-core-5.1.files'
=== modified file 'bakery/debian-5.2/dist/Debian/control'
--- a/bakery/debian-5.2/dist/Debian/control	2010-05-16 18:58:17 +0000
+++ b/bakery/debian-5.2/dist/Debian/control	2010-11-22 11:56:29 +0000
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: OurDelta Developers <ourdelta-developers at lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers at lists.launchpad.net>
 Uploaders: Peter Lieverdink <peter at openquery.com>, Arjen Lentz <arjen at openquery.com>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, libevent-dev, libssl-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper
 Standards-Version: 3.8.3
 Homepage: http://launchpad.net/maria
 Vcs-Browser: http://bazaar.launchpad.net/~ourdelta-core/ourdelta/trunk/files
@@ -116,6 +116,20 @@ Description: MariaDB database client bin
  This package includes the client binaries and the additional tools
  innotop and mysqlreport.
 
+Package: mariadb-server-core-5.2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient16 (>= ${binary:Version})
+Conflicts: mariadb-server-5.1, mariadb-server-5.2 (<< ${source:Version}), mysql-server-core-5.1, mysql-server-core-5.0, mysql-server-core-5.1
+Provides: mysql-server-core, mysql-server-core-5.1
+Replaces: mariadb-server-5.1, mariadb-server-5.2 (<< ${source:Version}), mysql-server-5.1 (<< ${source:Version}), mysql-server-core-5.0, mysql-server-core-5.1
+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.2
 Section: database
 Architecture: all
@@ -135,7 +149,7 @@ Architecture: any
 Suggests: tinyca, mariadb-test
 Recommends: mailx, libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-5.2 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10)
+Depends: mariadb-client-5.2 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.2 (>= ${binary:Version})
 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
 Provides: mariadb-server, mysql-server, virtual-mysql-server
 Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mysql-server-5.0, mysql-server-5.1, mariadb-server-5.1, libmariadbclient-dev (<< ${source:Version})

=== modified file 'bakery/debian-5.2/dist/Debian/mariadb-server-5.2.files'
--- a/bakery/debian-5.2/dist/Debian/mariadb-server-5.2.files	2010-09-07 14:10:11 +0000
+++ b/bakery/debian-5.2/dist/Debian/mariadb-server-5.2.files	2010-11-22 11:56:29 +0000
@@ -28,7 +28,6 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
-usr/sbin/mysqld
 usr/share/doc/mariadb-server-5.2/mysqld.sym.gz
 usr/share/lintian/overrides/mariadb-server-5.2
 usr/share/man/man1/msql2mysql.1
@@ -54,7 +53,6 @@ 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/debian-start.inc.sh
 usr/share/mysql/echo_stderr
 usr/share/mysql/errmsg.txt
@@ -64,27 +62,3 @@ usr/share/mysql/mysql_fix_privilege_tabl
 usr/share/mysql/mysql_system_tables_data.sql
 usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_test_data_timezone.sql
-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

=== modified file 'bakery/debian-5.2/dist/Debian/rules'
--- a/bakery/debian-5.2/dist/Debian/rules	2010-11-21 22:47:35 +0000
+++ b/bakery/debian-5.2/dist/Debian/rules	2010-11-22 11:56:29 +0000
@@ -22,6 +22,7 @@ DEB_UPSTREAM_VERSION ?= $(shell echo $(D
 DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
 
 DISTRIBUTION = $(shell lsb_release -i -s)
+RELEASE = $(shell lsb_release -r -s | sed 's/\..*//' )
 
 MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
 ifeq (${MAKE_J}, -j0)
@@ -37,6 +38,14 @@ endif
 
 USE_ASSEMBLER=--enable-assembler 
 
+# From Debian Squeeze we can use system libevent. But before that,
+# system libevent is too old, and we must use bundled.
+ifneq (,$(filter $(RELEASE), 4 5))
+    USE_LIBEVENT=--with-libevent=/usr
+else
+    USE_LIBEVENT=--with-libevent
+endif
+
 ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390))
     TESTSUITE_FAIL_CMD=exit 1
 else
@@ -107,8 +116,8 @@ endif
                 --with-extra-charsets=all \
                 --with-libwrap \
                 --with-ssl=/usr \
-                --with-libevent=/usr \
-                --without-readline # "without bundled", use system libreadline \
+                $(USE_LIBEVENT) \
+                --without-readline \
                 --with-zlib-dir=/usr \
                 --with-embedded-server \
                 --with-embedded-privilege-control \

=== modified file 'bakery/debian-5.2/dist/Ubuntu/control'
--- a/bakery/debian-5.2/dist/Ubuntu/control	2010-05-16 18:58:17 +0000
+++ b/bakery/debian-5.2/dist/Ubuntu/control	2010-11-22 11:56:29 +0000
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: OurDelta Developers <ourdelta-developers at lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers at lists.launchpad.net>
 Uploaders: Peter Lieverdink <peter at openquery.com>, Arjen Lentz <arjen at openquery.com>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript, dpatch, gawk, bison, lsb-release, hardening-wrapper
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, libevent-dev, libssl-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript, dpatch, gawk, bison, lsb-release, hardening-wrapper
 Standards-Version: 3.8.2
 Homepage: http://launchpad.net/maria
 Vcs-Browser: http://bazaar.launchpad.net/~ourdelta-core/ourdelta/trunk/files

=== modified file 'bakery/debian-5.2/dist/Ubuntu/rules'
--- a/bakery/debian-5.2/dist/Ubuntu/rules	2010-11-21 22:47:35 +0000
+++ b/bakery/debian-5.2/dist/Ubuntu/rules	2010-11-22 11:56:29 +0000
@@ -22,6 +22,7 @@ DEB_UPSTREAM_VERSION ?= $(shell echo $(D
 DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
 
 DISTRIBUTION = $(shell lsb_release -i -s)
+RELEASE = $(shell lsb_release -r -s)
 
 MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
 ifeq (${MAKE_J}, -j0)
@@ -43,6 +44,14 @@ MYSQL_BUILD_CXX = g++ -static-libgcc
 MYSQL_BUILD_CFLAGS = -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized
 MYSQL_BUILD_CXXFLAGS = -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized
 
+# From Ubuntu 9.10 "Karmic" we can use system libevent. But before
+# that, system libevent is too old, and we must use bundled.
+ifneq (,$(filter $(RELEASE), 8.04 8.10 9.04))
+    USE_LIBEVENT=--with-libevent=/usr
+else
+    USE_LIBEVENT=--with-libevent
+endif
+
 ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390))
     TESTSUITE_FAIL_CMD=exit 1
 else
@@ -108,8 +117,8 @@ endif
                 --with-extra-charsets=all \
                 --with-libwrap \
                 --with-ssl=/usr \
-                --with-libevent=/usr \
-                --without-readline # "without bundled", use system libreadline \
+                $(USE_LIBEVENT) \
+                --without-readline \
                 --with-zlib-dir=/usr \
                 --with-embedded-server \
                 --with-embedded-privilege-control \

=== renamed file 'bakery/debian-5.2/dist/Ubuntu/mariadb-server-core-5.2.files' => 'bakery/debian-5.2/mariadb-server-core-5.2.files'
=== modified file 'bakery/debian-5.3/dist/Debian/control'
--- a/bakery/debian-5.3/dist/Debian/control	2010-11-01 08:23:55 +0000
+++ b/bakery/debian-5.3/dist/Debian/control	2010-11-22 11:56:29 +0000
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: OurDelta Developers <ourdelta-developers at lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers at lists.launchpad.net>
 Uploaders: Peter Lieverdink <peter at openquery.com>, Arjen Lentz <arjen at openquery.com>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, libevent-dev, libssl-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper
 Standards-Version: 3.8.3
 Homepage: http://launchpad.net/maria
 Vcs-Browser: http://bazaar.launchpad.net/~ourdelta-core/ourdelta/trunk/files
@@ -116,6 +116,20 @@ Description: MariaDB database client bin
  This package includes the client binaries and the additional tools
  innotop and mysqlreport.
 
+Package: mariadb-server-core-5.3
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient16 (>= ${binary:Version})
+Conflicts: mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3 (<< ${source:Version}), mysql-server-core-5.1, mysql-server-core-5.0, mysql-server-core-5.1, mariadb-server-core-5.1
+Provides: mysql-server-core, mysql-server-core-5.1, mariadb-server-core-5.1
+Replaces: mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3 (<< ${source:Version}), mysql-server-5.1 (<< ${source:Version}), mysql-server-core-5.0, mysql-server-core-5.1, mariadb-server-core-5.1
+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.3
 Section: database
 Architecture: all
@@ -135,7 +149,7 @@ Architecture: any
 Suggests: tinyca, mariadb-test
 Recommends: mailx, libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-5.3 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10)
+Depends: mariadb-client-5.3 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.3 (>= ${binary:Version})
 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
 Provides: mariadb-server, mysql-server, virtual-mysql-server
 Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mysql-server-5.0, mysql-server-5.1, mariadb-server-5.1, libmariadbclient-dev (<< ${source:Version})

=== modified file 'bakery/debian-5.3/dist/Debian/mariadb-server-5.3.files'
--- a/bakery/debian-5.3/dist/Debian/mariadb-server-5.3.files	2010-11-01 08:23:55 +0000
+++ b/bakery/debian-5.3/dist/Debian/mariadb-server-5.3.files	2010-11-22 11:56:29 +0000
@@ -28,7 +28,6 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
-usr/sbin/mysqld
 usr/share/doc/mariadb-server-5.3/mysqld.sym.gz
 usr/share/lintian/overrides/mariadb-server-5.3
 usr/share/man/man1/msql2mysql.1
@@ -54,7 +53,6 @@ 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/debian-start.inc.sh
 usr/share/mysql/echo_stderr
 usr/share/mysql/errmsg.txt
@@ -64,27 +62,3 @@ usr/share/mysql/mysql_fix_privilege_tabl
 usr/share/mysql/mysql_system_tables_data.sql
 usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_test_data_timezone.sql
-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

=== modified file 'bakery/debian-5.3/dist/Debian/rules'
--- a/bakery/debian-5.3/dist/Debian/rules	2010-11-21 22:47:35 +0000
+++ b/bakery/debian-5.3/dist/Debian/rules	2010-11-22 11:56:29 +0000
@@ -22,6 +22,7 @@ DEB_UPSTREAM_VERSION ?= $(shell echo $(D
 DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
 
 DISTRIBUTION = $(shell lsb_release -i -s)
+RELEASE = $(shell lsb_release -r -s | sed 's/\..*//' )
 
 MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
 ifeq (${MAKE_J}, -j0)
@@ -37,6 +38,14 @@ endif
 
 USE_ASSEMBLER=--enable-assembler 
 
+# From Debian Squeeze we can use system libevent. But before that,
+# system libevent is too old, and we must use bundled.
+ifneq (,$(filter $(RELEASE), 4 5))
+    USE_LIBEVENT=--with-libevent=/usr
+else
+    USE_LIBEVENT=--with-libevent
+endif
+
 ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390))
     TESTSUITE_FAIL_CMD=exit 1
 else
@@ -107,8 +116,8 @@ endif
                 --with-extra-charsets=all \
                 --with-libwrap \
                 --with-ssl=/usr \
-                --with-libevent=/usr \
-                --without-readline # "without bundled", use system libreadline \
+                $(USE_LIBEVENT) \
+                --without-readline \
                 --with-zlib-dir=/usr \
                 --with-embedded-server \
                 --with-embedded-privilege-control \

=== modified file 'bakery/debian-5.3/dist/Ubuntu/control'
--- a/bakery/debian-5.3/dist/Ubuntu/control	2010-11-01 08:23:55 +0000
+++ b/bakery/debian-5.3/dist/Ubuntu/control	2010-11-22 11:56:29 +0000
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: OurDelta Developers <ourdelta-developers at lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers at lists.launchpad.net>
 Uploaders: Peter Lieverdink <peter at openquery.com>, Arjen Lentz <arjen at openquery.com>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript, dpatch, gawk, bison, lsb-release, hardening-wrapper
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, libevent-dev, libssl-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript, dpatch, gawk, bison, lsb-release, hardening-wrapper
 Standards-Version: 3.8.2
 Homepage: http://launchpad.net/maria
 Vcs-Browser: http://bazaar.launchpad.net/~ourdelta-core/ourdelta/trunk/files

=== modified file 'bakery/debian-5.3/dist/Ubuntu/rules'
--- a/bakery/debian-5.3/dist/Ubuntu/rules	2010-11-21 22:47:35 +0000
+++ b/bakery/debian-5.3/dist/Ubuntu/rules	2010-11-22 11:56:29 +0000
@@ -22,6 +22,7 @@ DEB_UPSTREAM_VERSION ?= $(shell echo $(D
 DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
 
 DISTRIBUTION = $(shell lsb_release -i -s)
+RELEASE = $(shell lsb_release -r -s)
 
 MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
 ifeq (${MAKE_J}, -j0)
@@ -43,6 +44,14 @@ MYSQL_BUILD_CXX = g++ -static-libgcc
 MYSQL_BUILD_CFLAGS = -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized
 MYSQL_BUILD_CXXFLAGS = -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized
 
+# From Ubuntu 9.10 "Karmic" we can use system libevent. But before
+# that, system libevent is too old, and we must use bundled.
+ifneq (,$(filter $(RELEASE), 8.04 8.10 9.04))
+    USE_LIBEVENT=--with-libevent=/usr
+else
+    USE_LIBEVENT=--with-libevent
+endif
+
 ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390))
     TESTSUITE_FAIL_CMD=exit 1
 else
@@ -108,8 +117,8 @@ endif
                 --with-extra-charsets=all \
                 --with-libwrap \
                 --with-ssl=/usr \
-                --with-libevent=/usr \
-                --without-readline # "without bundled", use system libreadline \
+                $(USE_LIBEVENT) \
+                --without-readline \
                 --with-zlib-dir=/usr \
                 --with-embedded-server \
                 --with-embedded-privilege-control \

=== renamed file 'bakery/debian-5.3/dist/Ubuntu/mariadb-server-core-5.3.files' => 'bakery/debian-5.3/mariadb-server-core-5.3.files'


More information about the commits mailing list