Revert most of commit 579282f2 and re-enable Mroonga

debian/changelog

@@ -4,6 +4,7 @@ mariadb-10.0 (10.0.21-2) UNRELEASED; urgency=low
   * Add CVE IDs to previous changelog entries
   * Pass DEB_BUILD_ARCH to CMake options to enhance buils on some platforms
   * Test suite failures are now fatal on all platforms and not ignored anywhere
+  * Revert most of commit 579282f and re-enable Mroonga
 
  -- Otto Kekäläinen <otto@seravo.fi>  Wed, 26 Aug 2015 18:20:54 +0300
 

debian/patches/mroonga-disable-switch.patch

-Description: Add Mroonga disable switch
- It seems Mroonga does not build or at least does not pass
- it's own build time tests on i386. On arch amd64 it seems
- to work OK. Added a switch in the CMakeLists.txt
- so that Mroonga can be disabled in debian/rules for non-amd64.
-Author: Otto Kekäläinen <otto@seravo.fi>
-Bug: https://mariadb.atlassian.net/browse/MDEV-7210
-
---- a/storage/mroonga/CMakeLists.txt
-+++ b/storage/mroonga/CMakeLists.txt
-@@ -17,6 +17,10 @@
- # License along with this library; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
-+if(WITHOUT_MROONGA)
-+  return()
-+endif()
-+
- cmake_minimum_required(VERSION 2.6)
- project(mroonga)
- 

debian/patches/series

@@ -8,6 +8,5 @@ extend_default_test_timeout_for_tokudb.patch
 remove_rename_mariadb-server_files_in.patch
 innodb_simulate_comp_test_speedup.patch
 fix-spelling-errors.patch
-mroonga-disable-switch.patch
 mysqld_multi_confd.patch
 mysqld_multi.server_lsb-header.patch

debian/rules

@@ -49,11 +49,6 @@ endif
 # See https://lists.launchpad.net/maria-developers/msg08390.html
 CMAKEFLAGS += -DWITHOUT_TOKUDB=true
 
-# Skip Mroonga if arch is not amd64
-ifneq ($(ARCH), amd64)
-    CMAKEFLAGS += -DWITHOUT_MROONGA=true
-endif
-
 # Add support for verbose builds
 MAKEFLAGS += VERBOSE=1