Package: mariadb-server-10.0
Version: 10.0.15-2
Severity: normal
Tags: patch

Hello,

The attached patch fixes it. Could you please apply it?

(I don't know why MariaDB decided to bundle Mroonga. For me, it looks saner
to build a source package, like mysql-source-5.5, and have a separate 'mroonga'
source package from upstream.)

Julien
From: Julien Muchembled <j...@jmuchemb.eu>
Date: Mon, 22 Dec 2014 17:50:14 +0100
Subject: [PATCH] Fix inclusion of Mroonga & TokuDB plugins in
 mariadb-server-10.0

---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 3c5c441..a38bee2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,10 +137,10 @@ override_dh_auto_install:
 	dh_testroot
 	
 	# If TokuDB plugin was built add it to the server install list.
-	[ ! -f $(BUILDDIR)/usr/lib/mysql/plugin/ha_tokudb.so ] || echo 'usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-10.0/README-TOKUDB\nusr/share/doc/mariadb-server-10.0/README.md' >> debian/mariadb-server-10.0.install
+	[ ! -f $(BUILDDIR)/storage/tokudb/ha_tokudb.so ] || echo 'usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-10.0/README-TOKUDB\nusr/share/doc/mariadb-server-10.0/README.md' >> debian/mariadb-server-10.0.install
 	
 	# If Mroonga plugin was built add it to the server install list.
-	[ ! -f $(BUILDDIR)/usr/lib/mysql/plugin/ha_mroonga.so ] || echo 'usr/lib/mysql/plugin/ha_mroonga.so' >> debian/mariadb-server-10.0.install
+	[ ! -f $(BUILDDIR)/storage/mroonga/ha_mroonga.so ] || echo 'usr/lib/mysql/plugin/ha_mroonga.so' >> debian/mariadb-server-10.0.install
 	
 	# If libthrift-dev was available (manually installed, as it is not in Debian)
 	# and ha_cassandra.so was thus built add it to the server install list.
-- 
2.1.3

Reply via email to