Skip to content

Commit 7b344bf

Browse files
committed
Add MariaDB 10.0 stanzas next to MariaDB 5.5 in debian/control file
This should make the provides/breaks/replaces/conflicts lines work properly when upgrading from mariadb-10.0 to mariadb-10.1
1 parent cc08c13 commit 7b344bf

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

debian/control

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,12 @@ Provides: mysql-client-core,
138138
mysql-client-core-5.1,
139139
mysql-client-core-5.5,
140140
mysql-client-core-5.6
141-
Conflicts: mariadb-client-5.1,
141+
Conflicts: mariadb-client-10.0,
142+
mariadb-client-5.1,
142143
mariadb-client-5.2,
143144
mariadb-client-5.3,
144145
mariadb-client-5.5,
146+
mariadb-client-core-10.0,
145147
mariadb-client-core-5.1,
146148
mariadb-client-core-5.2,
147149
mariadb-client-core-5.3,
@@ -153,10 +155,12 @@ Conflicts: mariadb-client-5.1,
153155
mysql-client-core-5.1,
154156
mysql-client-core-5.5,
155157
mysql-client-core-5.6
156-
Replaces: mariadb-client-5.1,
158+
Replaces: mariadb-client-10.0,
159+
mariadb-client-5.1,
157160
mariadb-client-5.2,
158161
mariadb-client-5.3,
159162
mariadb-client-5.5,
163+
mariadb-client-core-10.0,
160164
mariadb-client-core-5.1,
161165
mariadb-client-core-5.2,
162166
mariadb-client-core-5.3,
@@ -195,6 +199,7 @@ Provides: mysql-client,
195199
mysql-client-5.6,
196200
virtual-mysql-client
197201
Conflicts: mariadb-client (<< ${source:Version}),
202+
mariadb-client-10.0,
198203
mariadb-client-5.1,
199204
mariadb-client-5.2,
200205
mariadb-client-5.3,
@@ -205,6 +210,7 @@ Conflicts: mariadb-client (<< ${source:Version}),
205210
mysql-client-5.5,
206211
mysql-client-5.6
207212
Replaces: mariadb-client (<< ${source:Version}),
213+
mariadb-client-10.0,
208214
mariadb-client-5.1,
209215
mariadb-client-5.2,
210216
mariadb-client-5.3,
@@ -232,7 +238,8 @@ Provides: mysql-server-core,
232238
mysql-server-core-5.1,
233239
mysql-server-core-5.5,
234240
mysql-server-core-5.6
235-
Conflicts: mariadb-server-core-5.1,
241+
Conflicts: mariadb-server-core-10.0,
242+
mariadb-server-core-5.1,
236243
mariadb-server-core-5.2,
237244
mariadb-server-core-5.3,
238245
mariadb-server-core-5.5,
@@ -241,7 +248,8 @@ Conflicts: mariadb-server-core-5.1,
241248
mysql-server-core-5.1,
242249
mysql-server-core-5.5,
243250
mysql-server-core-5.6
244-
Replaces: mariadb-server-core-5.1,
251+
Replaces: mariadb-server-core-10.0,
252+
mariadb-server-core-5.1,
245253
mariadb-server-core-5.2,
246254
mariadb-server-core-5.3,
247255
mariadb-server-core-5.5,
@@ -266,10 +274,12 @@ Suggests: patch
266274
Conflicts: mariadb-galera-server-5.5 (<< 5.5.33),
267275
mariadb-server-5.5 (<< 5.5.33),
268276
mariadb-test (<< ${source:Version}),
277+
mariadb-test-10.0,
269278
mariadb-test-5.1,
270279
mariadb-test-5.2,
271280
mariadb-test-5.3
272281
Replaces: mariadb-test (<< ${source:Version}),
282+
mariadb-test-10.0,
273283
mariadb-test-5.1,
274284
mariadb-test-5.2,
275285
mariadb-test-5.3
@@ -306,6 +316,7 @@ Depends: bsdutils,
306316
${shlibs:Depends}
307317
Provides: mariadb-server, mysql-server, virtual-mysql-server
308318
Conflicts: mariadb-server (<< ${source:Version}),
319+
mariadb-server-10.0,
309320
mariadb-server-5.1,
310321
mariadb-server-5.2,
311322
mariadb-server-5.3,
@@ -321,6 +332,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
321332
Replaces: libmariadbclient-dev (<< 5.5.0),
322333
libmariadbclient16 (<< 5.3.4),
323334
mariadb-server (<< ${source:Version}),
335+
mariadb-server-10.0,
324336
mariadb-server-5.1,
325337
mariadb-server-5.2,
326338
mariadb-server-5.3,

0 commit comments

Comments
 (0)