Skip to content

Commit c104e90

Browse files
ottokottok
committed
Unify virtual-* package definitions with official Debian packaging
Plus minor other fixes to debian/control file, wrap-and-sort, versioned mariadb-common dependency etc. All changes based on comparison with mariadb-10.0 packaging in official Debian repositories.
1 parent 7b344bf commit c104e90

File tree

1 file changed

+37
-19
lines changed

1 file changed

+37
-19
lines changed

‎debian/control

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Build-Depends: bison,
2525
libjemalloc-dev (>= 3.0.0~) [linux-any]
2626
Standards-Version: 3.8.2
2727
Homepage: http://mariadb.org/
28-
Vcs-Bzr: https://github.com/MariaDB/server.git
28+
Vcs-Git: https://github.com/MariaDB/server.git
2929
Vcs-Browser: https://github.com/MariaDB/server/
3030

3131
Package: libmariadbclient18
@@ -131,13 +131,14 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
131131
Package: mariadb-client-core-10.1
132132
Architecture: any
133133
Depends: libmariadbclient18 (>= ${source:Version}),
134-
mariadb-common,
134+
mariadb-common (>= ${source:Version}),
135135
${misc:Depends},
136136
${shlibs:Depends}
137137
Provides: mysql-client-core,
138138
mysql-client-core-5.1,
139139
mysql-client-core-5.5,
140-
mysql-client-core-5.6
140+
mysql-client-core-5.6,
141+
virtual-mysql-client-core
141142
Conflicts: mariadb-client-10.0,
142143
mariadb-client-5.1,
143144
mariadb-client-5.2,
@@ -154,7 +155,8 @@ Conflicts: mariadb-client-10.0,
154155
mysql-client-5.5 (<< ${source:Version}),
155156
mysql-client-core-5.1,
156157
mysql-client-core-5.5,
157-
mysql-client-core-5.6
158+
mysql-client-core-5.6,
159+
virtual-mysql-client-core
158160
Replaces: mariadb-client-10.0,
159161
mariadb-client-5.1,
160162
mariadb-client-5.2,
@@ -171,7 +173,8 @@ Replaces: mariadb-client-10.0,
171173
mysql-client-5.5,
172174
mysql-client-core-5.1,
173175
mysql-client-core-5.5,
174-
mysql-client-core-5.6
176+
mysql-client-core-5.6,
177+
virtual-mysql-client-core
175178
Description: MariaDB database core client binaries
176179
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
177180
server. SQL (Structured Query Language) is the most popular database query
@@ -208,7 +211,8 @@ Conflicts: mariadb-client (<< ${source:Version}),
208211
mysql-client-5.0,
209212
mysql-client-5.1,
210213
mysql-client-5.5,
211-
mysql-client-5.6
214+
mysql-client-5.6,
215+
virtual-mysql-client
212216
Replaces: mariadb-client (<< ${source:Version}),
213217
mariadb-client-10.0,
214218
mariadb-client-5.1,
@@ -219,7 +223,8 @@ Replaces: mariadb-client (<< ${source:Version}),
219223
mysql-client-5.0,
220224
mysql-client-5.1,
221225
mysql-client-5.5,
222-
mysql-client-5.6
226+
mysql-client-5.6,
227+
virtual-mysql-client
223228
Description: MariaDB database client binaries
224229
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
225230
server. SQL (Structured Query Language) is the most popular database query
@@ -232,12 +237,14 @@ Description: MariaDB database client binaries
232237
Package: mariadb-server-core-10.1
233238
Architecture: any
234239
Depends: libmariadbclient18 (>= ${binary:Version}),
240+
mariadb-common (>= ${source:Version}),
235241
${misc:Depends},
236242
${shlibs:Depends}
237243
Provides: mysql-server-core,
238244
mysql-server-core-5.1,
239245
mysql-server-core-5.5,
240-
mysql-server-core-5.6
246+
mysql-server-core-5.6,
247+
virtual-mysql-server-core
241248
Conflicts: mariadb-server-core-10.0,
242249
mariadb-server-core-5.1,
243250
mariadb-server-core-5.2,
@@ -247,7 +254,8 @@ Conflicts: mariadb-server-core-10.0,
247254
mysql-server-core-5.0,
248255
mysql-server-core-5.1,
249256
mysql-server-core-5.5,
250-
mysql-server-core-5.6
257+
mysql-server-core-5.6,
258+
virtual-mysql-server-core
251259
Replaces: mariadb-server-core-10.0,
252260
mariadb-server-core-5.1,
253261
mariadb-server-core-5.2,
@@ -257,7 +265,8 @@ Replaces: mariadb-server-core-10.0,
257265
mysql-server-core-5.0,
258266
mysql-server-core-5.1,
259267
mysql-server-core-5.5,
260-
mysql-server-core-5.6
268+
mysql-server-core-5.6,
269+
virtual-mysql-server-core
261270
Description: MariaDB database core server files
262271
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
263272
server. SQL (Structured Query Language) is the most popular database query
@@ -268,21 +277,24 @@ Description: MariaDB database core server files
268277

269278
Package: mariadb-test-10.1
270279
Architecture: any
271-
Depends: mariadb-client-10.1 (= ${source:Version}),
272-
mariadb-server-10.1 (= ${source:Version})
280+
Depends: mariadb-client-10.1 (= ${binary:Version}),
281+
mariadb-server-10.1 (= ${binary:Version})
273282
Suggests: patch
274283
Conflicts: mariadb-galera-server-5.5 (<< 5.5.33),
275284
mariadb-server-5.5 (<< 5.5.33),
276285
mariadb-test (<< ${source:Version}),
277286
mariadb-test-10.0,
278287
mariadb-test-5.1,
279288
mariadb-test-5.2,
280-
mariadb-test-5.3
289+
mariadb-test-5.3,
290+
virtual-mysql-testsuite
281291
Replaces: mariadb-test (<< ${source:Version}),
282292
mariadb-test-10.0,
283293
mariadb-test-5.1,
284294
mariadb-test-5.2,
285-
mariadb-test-5.3
295+
mariadb-test-5.3,
296+
virtual-mysql-testsuite
297+
Provides: virtual-mysql-testsuite
286298
Description: MariaDB database regression test suite
287299
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
288300
server. SQL (Structured Query Language) is the most popular database query
@@ -328,7 +340,8 @@ Conflicts: mariadb-server (<< ${source:Version}),
328340
mysql-server-5.0,
329341
mysql-server-5.1,
330342
mysql-server-5.5,
331-
mysql-server-5.6
343+
mysql-server-5.6,
344+
virtual-mysql-server
332345
Replaces: libmariadbclient-dev (<< 5.5.0),
333346
libmariadbclient16 (<< 5.3.4),
334347
mariadb-server (<< ${source:Version}),
@@ -344,7 +357,8 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
344357
mysql-server-5.0,
345358
mysql-server-5.1,
346359
mysql-server-5.5,
347-
mysql-server-5.6
360+
mysql-server-5.6,
361+
virtual-mysql-server
348362
Description: MariaDB database server binaries
349363
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
350364
server. SQL (Structured Query Language) is the most popular database query
@@ -379,7 +393,7 @@ Description: MariaDB database client (metapackage depending on the latest versio
379393

380394
Package: mariadb-test
381395
Architecture: all
382-
Depends: mariadb-test-10.1 (= ${source:Version})
396+
Depends: mariadb-test-10.1 (= ${source:Version}), ${misc:Depends}
383397
Description: MariaDB database regression test suite (metapackage for the latest version)
384398
This is an empty package that depends on the current "best" version of
385399
mariadb-test (currently mariadb-test-10.1), as determined by the MariaDB
@@ -388,7 +402,11 @@ Description: MariaDB database regression test suite (metapackage for the latest
388402
Package: mariadb-connect-engine-10.1
389403
Architecture: any
390404
Depends: libxml2, mariadb-server-10.1, unixODBC
391-
Build-Depends: libxml2-dev, mariadb-server-10.1, unixODBC-dev
405+
Build-Depends: libxml2-dev,
406+
mariadb-server-10.1,
407+
unixODBC-dev,
408+
${misc:Depends},
409+
${shlibs:Depends}
392410
Description: Connect storage engine for MariaDB
393411
Connect engine supports a number of file formats (dbf, xml, txt, bin, etc),
394412
connections to ODBC tables and remote MySQL tables, as well as a number of
@@ -397,7 +415,7 @@ Description: Connect storage engine for MariaDB
397415

398416
Package: mariadb-oqgraph-engine-10.1
399417
Architecture: any
400-
Depends: libjudydebian1, mariadb-server-10.1
418+
Depends: libjudydebian1, mariadb-server-10.1, ${misc:Depends}, ${shlibs:Depends}
401419
Description: OQGraph storage engine for MariaDB
402420
The OQGraph engine is a computation engine plugin for handling hierarchies
403421
(trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL.

0 commit comments

Comments
 (0)