summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDaniel Black <daniel.black@au.ibm.com>2016-11-04 10:20:34 +1100
committerOtto Kekäläinen <otto@seravo.fi>2016-11-17 12:37:21 +0200
commit7072ca1f5837d1303c51de04a83ab79493929e8b (patch)
treefe32c48277c627bbd71cf1e3d7053c0ed21380d5 /debian
parent2387c91b8aba450f83dde6e51a39e1aef28144b7 (diff)
downloadmariadb-git-7072ca1f5837d1303c51de04a83ab79493929e8b.tar.gz
MDEV-5725: mysqld embedded libraries into libmariadbd19 Deb package
libmariadbd19 was intended to be added as the package that included the libmysqld shared library. This was missing from the debian control file. The libmariadbd-dev package requires libmariadbd19 to provide the shared library. The shared libraries for embedded mysql will go into the libmariadbd18 package rather than the libmariadbd-dev development package. /usr/bin/mariadb_config is a executable that assists embedded developers to use the correctly correct header and library files during their development. Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
Diffstat (limited to 'debian')
-rw-r--r--debian/control18
-rw-r--r--debian/libmariadbd-dev.install2
-rw-r--r--debian/libmariadbd18.install1
-rw-r--r--debian/libmariadbd19.install1
4 files changed, 19 insertions, 3 deletions
diff --git a/debian/control b/debian/control
index c8b0dfb6785..d53c84bf513 100644
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,8 @@ Architecture: any
Section: libdevel
Provides: libmysqld-dev
Pre-Depends: ${misc:Pre-Depends}
-Depends: libmariadbclient-dev (= ${binary:Version}),
+Depends: libmariadbd19,
+ libmariadbclient-dev (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: libmysqld-dev
@@ -87,6 +88,21 @@ Description: MariaDB embedded database, development files
.
This package includes the embedded server library development and header files.
+Package: libmariadbd19
+Architecture: any
+Section: libs
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
+Breaks: libmariadbd-dev (<< ${source:Version}), libmysqld-dev
+Replaces: libmariadbd-dev (<< ${source:Version}), libmysqld-dev
+Description: MariaDB embedded database, shared 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
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
+ .
+ This package includes a shared library for embedded MariaDB applications
+
Package: libmariadbclient-dev
Architecture: any
Section: libdevel
diff --git a/debian/libmariadbd-dev.install b/debian/libmariadbd-dev.install
index 4608bf6e838..7b058025175 100644
--- a/debian/libmariadbd-dev.install
+++ b/debian/libmariadbd-dev.install
@@ -1,2 +1,2 @@
usr/lib/*/libmysqld.a
-usr/lib/*/libmysqld.so
+usr/bin/mariadb_config
diff --git a/debian/libmariadbd18.install b/debian/libmariadbd18.install
deleted file mode 100644
index 9ae9f9e1721..00000000000
--- a/debian/libmariadbd18.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libmysqld.so.18
diff --git a/debian/libmariadbd19.install b/debian/libmariadbd19.install
new file mode 100644
index 00000000000..a6b58841445
--- /dev/null
+++ b/debian/libmariadbd19.install
@@ -0,0 +1 @@
+usr/lib/*/libmysqld.so*