Skip to content

Commit c5e7098

Browse files
ottokvuvova
authored andcommitted
Add MySQL 5.6 stanzas next to MySQL 5.5 in debian/control file
This should make the provides/breaks/replaces/conflicts lines work properly when upgrading from mysql-5.6 to mariadb-packages. Conflicts: debian/control
1 parent 0d604dd commit c5e7098

File tree

1 file changed

+25
-10
lines changed

1 file changed

+25
-10
lines changed

debian/control

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,10 @@ Depends: libmariadbclient18 (>= ${source:Version}),
136136
mariadb-common,
137137
${misc:Depends},
138138
${shlibs:Depends}
139-
Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5
139+
Provides: mysql-client-core,
140+
mysql-client-core-5.1,
141+
mysql-client-core-5.5,
142+
mysql-client-core-5.6
140143
Conflicts: mariadb-client-5.1,
141144
mariadb-client-5.2,
142145
mariadb-client-5.3,
@@ -150,7 +153,8 @@ Conflicts: mariadb-client-5.1,
150153
mysql-client-5.1 (<< ${source:Version}),
151154
mysql-client-5.5 (<< ${source:Version}),
152155
mysql-client-core-5.1,
153-
mysql-client-core-5.5
156+
mysql-client-core-5.5,
157+
mysql-client-core-5.6
154158
Replaces: mariadb-client-5.1,
155159
mariadb-client-5.2,
156160
mariadb-client-5.3,
@@ -164,7 +168,8 @@ Replaces: mariadb-client-5.1,
164168
mysql-client-5.1,
165169
mysql-client-5.5,
166170
mysql-client-core-5.1,
167-
mysql-client-core-5.5
171+
mysql-client-core-5.5,
172+
mysql-client-core-5.6
168173
Description: MariaDB database core client binaries
169174
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
170175
server. SQL (Structured Query Language) is the most popular database query
@@ -189,6 +194,7 @@ Provides: mysql-client,
189194
mysql-client-4.1,
190195
mysql-client-5.1,
191196
mysql-client-5.5,
197+
mysql-client-5.6,
192198
virtual-mysql-client
193199
Conflicts: mariadb-client (<< ${source:Version}),
194200
mariadb-client-5.1,
@@ -198,7 +204,8 @@ Conflicts: mariadb-client (<< ${source:Version}),
198204
mysql-client (<< 5.0.51),
199205
mysql-client-5.0,
200206
mysql-client-5.1,
201-
mysql-client-5.5
207+
mysql-client-5.5,
208+
mysql-client-5.6
202209
Replaces: mariadb-client (<< ${source:Version}),
203210
mariadb-client-5.1,
204211
mariadb-client-5.2,
@@ -207,7 +214,8 @@ Replaces: mariadb-client (<< ${source:Version}),
207214
mysql-client (<< 5.0.51),
208215
mysql-client-5.0,
209216
mysql-client-5.1,
210-
mysql-client-5.5
217+
mysql-client-5.5,
218+
mysql-client-5.6
211219
Description: MariaDB database client binaries
212220
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
213221
server. SQL (Structured Query Language) is the most popular database query
@@ -222,23 +230,28 @@ Architecture: any
222230
Depends: libmariadbclient18 (>= ${binary:Version}),
223231
${misc:Depends},
224232
${shlibs:Depends}
225-
Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
233+
Provides: mysql-server-core,
234+
mysql-server-core-5.1,
235+
mysql-server-core-5.5,
236+
mysql-server-core-5.6
226237
Conflicts: mariadb-server-core-5.1,
227238
mariadb-server-core-5.2,
228239
mariadb-server-core-5.3,
229240
mariadb-server-core-5.5,
230241
mysql-server-5.0,
231242
mysql-server-core-5.0,
232243
mysql-server-core-5.1,
233-
mysql-server-core-5.5
244+
mysql-server-core-5.5,
245+
mysql-server-core-5.6
234246
Replaces: mariadb-server-core-5.1,
235247
mariadb-server-core-5.2,
236248
mariadb-server-core-5.3,
237249
mariadb-server-core-5.5,
238250
mysql-server-5.0,
239251
mysql-server-core-5.0,
240252
mysql-server-core-5.1,
241-
mysql-server-core-5.5
253+
mysql-server-core-5.5,
254+
mysql-server-core-5.6
242255
Description: MariaDB database core server files
243256
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
244257
server. SQL (Structured Query Language) is the most popular database query
@@ -298,7 +311,8 @@ Conflicts: mariadb-server (<< ${source:Version}),
298311
mysql-server-4.1,
299312
mysql-server-5.0,
300313
mysql-server-5.1,
301-
mysql-server-5.5
314+
mysql-server-5.5,
315+
mysql-server-5.6
302316
Replaces: libmariadbclient-dev (<< 5.5.0),
303317
libmariadbclient16 (<< 5.3.4),
304318
mariadb-server (<< ${source:Version}),
@@ -312,7 +326,8 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
312326
mysql-server-4.1,
313327
mysql-server-5.0,
314328
mysql-server-5.1,
315-
mysql-server-5.5
329+
mysql-server-5.5,
330+
mysql-server-5.6
316331
Description: MariaDB database server binaries
317332
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
318333
server. SQL (Structured Query Language) is the most popular database query

0 commit comments

Comments
 (0)