OurDelta

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

  1. ourdelta-mariadb51-2
  2. Merge into trunk015fmt
Proposed by Cafuego
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ourdelta-core/ourdelta/ourdelta-mariadb51-2
Merge into: lp:~ourdelta-core/ourdelta/trunk015fmt
Diff against target: 55 lines
2 files modified
bakery/debian-5.1/dist/Ubuntu/control (+1/-12)
bakery/mysql51-ourdelta-centos.spec (+6/-1)
To merge this branch: bzr merge lp:~ourdelta-core/ourdelta/ourdelta-mariadb51-2
Reviewer Review Type Date Requested Status
OurDelta-core Pending
Review via email: mp+14202@code.launchpad.net
To post a comment you must log in.
lp:~ourdelta-core/ourdelta/ourdelta-mariadb51-2 updated
62. By Arjen Lentz

Merge from 5.1 fixup tree (rpm and ubu fixes)

Updating diff...

An updated diff will be available in a few minutes. Reload to see the changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bakery/debian-5.1/dist/Ubuntu/control'
2--- bakery/debian-5.1/dist/Ubuntu/control 2009-10-14 11:20:21 +0000
3+++ bakery/debian-5.1/dist/Ubuntu/control 2009-10-30 07:15:20 +0000
4@@ -25,17 +25,6 @@
5 .
6 This package includes the client library.
7
8-Package: libmariadbclient16-dev
9-Architecture: all
10-Section: libdevel
11-Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends}
12-Provides: libmysqlclient16-dev
13-Conflicts: libmysqlclient16-dev
14-Replaces: libmysqlclient16-dev
15-Description: MariaDB database development files - empty transitional package
16- This is an empty package that depends on libmysqlclient-dev to ease the
17- transition for packages with versioned build-deps on libmysqlclient16-dev.
18-
19 Package: libmariadbd-dev
20 Architecture: any
21 Section: libdevel
22@@ -55,7 +44,7 @@
23 Architecture: any
24 Section: libdevel
25 Depends: libmariadbclient16 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends}
26-Replaces: libmariadbclient16-dev (<< ${source:Version}), libmysqlclient16-dev (<< ${source:Version})
27+Replaces: libmariadbclient16-dev (<< ${source:Version}), libmysqlclient16-dev
28 Conflicts: libmysqlclient-dev, libmariadbclient16-dev (<< ${source:Version}), libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev (<< ${source:Version})
29 Provides: libmysqlclient-dev, libmariadbclient16-dev, libmysqlclient16-dev
30 Description: MariaDB database development files
31
32=== modified file 'bakery/mysql51-ourdelta-centos.spec'
33--- bakery/mysql51-ourdelta-centos.spec 2009-10-23 09:19:12 +0000
34+++ bakery/mysql51-ourdelta-centos.spec 2009-10-30 07:15:20 +0000
35@@ -175,7 +175,8 @@
36 %package -n %{mysql_basename}-shared
37 Summary: MariaDB - Shared libraries
38 Group: Applications/Databases
39-Provides: mariadb-shared mysql-shared MariaDB-shared MySQL-shared
40+Provides: mariadb-shared MariaDB-shared
41+Requires: mysql-shared MySQL-shared
42 # Obsoletes below to correct old missing Provides:/Obsoletes
43 Obsoletes: mariadb-shared mysql-shared MySQL-shared-standard MySQL-shared-pro
44 Obsoletes: MySQL-shared-pro-cert MySQL-shared-pro-gpl
45@@ -720,6 +721,10 @@
46 # itself - note that they must be ordered by date (important when
47 # merging BK trees)
48 %changelog
49+* Fri Oct 30 2009 Stephen Walsh <steve@nerdvana.org.au>
50+
51+- change mariadb-shared Provides/Requires to handle lp #463161
52+
53 * Mon Oct 12 2009 Arjen Lentz <arjen@openquery.com>
54
55 - Adapt for MariaDB

Subscribers

People subscribed via source and target branches