Merge lp:~ourdelta-core/ourdelta/ourdelta-mariadb51-2-depfixes into lp:~ourdelta-core/ourdelta/trunk015fmt

[Cafuego]

[Cafuego (cafuego)]

Resolves Karmic and Etch install and build problems.

Unmerged revisions

67. By Cafuego on 2009-11-05

Add gs-gpl as ghostscript alternative in build deps.
Build with -d to ignore broken texlive-latex-base and non-existent hardening-wrapper on Etch.
Resolves #474078

66. By Cafuego on 2009-11-05

Added a virtual libmysqlclient16 package to shutup depend whinges on Karmic.

=== modified file 'bakery/autobake51-deb.sh'
--- bakery/autobake51-deb.sh	2009-10-30 01:36:18 +0000
+++ bakery/autobake51-deb.sh	2009-11-05 01:45:22 +0000
@@ -135,9 +135,15 @@
   fi
 fi
 
+BUILDOPTS=""
+# Check if we're on Debian 4.0 "Etch". If so, build with -d to ignore depends that aren't available.
+if [ "${CODENAME}" = "etch" ]; then
+  BUILDOPTS="-d"
+fi
+
 # Build the package.
 #
-fakeroot dpkg-buildpackage
+fakeroot dpkg-buildpackage ${BUILDOPTS}
 
 # Check if the local mirror deb-pool exists and move the results there.
 # we have ourdelta, ourdelta-sail, and mariadb-ourdelta

=== modified file 'bakery/debian-5.1/dist/Debian/control'
--- bakery/debian-5.1/dist/Debian/control	2009-10-30 12:05:46 +0000
+++ bakery/debian-5.1/dist/Debian/control	2009-11-05 01:45:22 +0000
@@ -4,7 +4,7 @@
 Maintainer: OurDelta Developers <[e-mail]>
 XSBC-Original-Maintainer: Maria Developers <[e-mail]>
 Uploaders: Peter Lieverdink <[e-mail]>, Arjen Lentz <[e-mail]>
-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, 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, 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
@@ -13,10 +13,7 @@
 Package: libmariadbclient16
 Section: libs
 Architecture: any
-Depends: mariadb-common, ${shlibs:Depends}, ${misc:Depends}
-Provides: libmysqlclient16
-Conflicts: libmysqlclient16
-Replaces: libmysqlclient16
+Depends: mariadb-common, libmysqlclient16 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: MariaDB database client library
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -25,6 +22,21 @@
  .
  This package includes the client library.
 
+Package: libmysqlclient16
+Section: libs
+Architecture: any
+Depends: libmariadbclient16 (= ${source:Version})
+Replaces: libmysqlclient16 (<< ${source:Version})
+Description: Virtual package to satisfy external depends
+ This is an empty package that provides an updated "best" version of
+ libmysqlclient16 that does not conflict with the libmariadbclient16
+ package.
+ .
+ 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.
+
 Package: libmariadbd-dev
 Architecture: any
 Section: libdevel

=== modified file 'bakery/debian-5.1/dist/Ubuntu/control'
--- bakery/debian-5.1/dist/Ubuntu/control	2009-10-30 12:05:46 +0000
+++ bakery/debian-5.1/dist/Ubuntu/control	2009-11-05 01:45:22 +0000
@@ -13,10 +13,7 @@
 Package: libmariadbclient16
 Section: libs
 Architecture: any
-Depends: mariadb-common, ${shlibs:Depends}, ${misc:Depends}
-Provides: libmysqlclient16
-Conflicts: libmysqlclient16
-Replaces: libmysqlclient16
+Depends: mariadb-common, libmysqlclient16 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: MariaDB database client library
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -25,6 +22,21 @@
  .
  This package includes the client library.
 
+Package: libmysqlclient16
+Section: libs
+Architecture: any
+Depends: libmariadbclient16 (= ${source:Version})
+Replaces: libmysqlclient16 (<< ${source:Version})
+Description: Virtual package to satisfy external depends
+ This is an empty package that provides an updated "best" version of
+ libmysqlclient16 that does not conflict with the libmariadbclient16
+ package.
+ .
+ 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.
+
 Package: libmariadbd-dev
 Architecture: any
 Section: libdevel