[Pkg-mysql-commits] r2017 - mysql-5.5/branches/experimental/debian

[Clint Byrum]

Author: spamaps-guest
Date: 2011-11-09 23:02:51 +0000 (Wed, 09 Nov 2011)
New Revision: 2017

Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/libmysqlclient-dev.files
   mysql-5.5/branches/experimental/debian/libmysqlclient18.files
   mysql-5.5/branches/experimental/debian/rules
Log:
d/rules, d/libmysqlclient*.files: changes to support
multiarch.

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2011-11-09 22:43:43 UTC (rev 2016)
+++ mysql-5.5/branches/experimental/debian/changelog	2011-11-09 23:02:51 UTC (rev 2017)
@@ -2,8 +2,10 @@
 
   * d/rules, d/control: Build with gcc 4.5 to avoid
     gcc 4.6 compile problems (see Debian bug number 630471)
+  * d/rules, d/libmysqlclient*.files: changes to support
+    multiarch.
 
- -- Clint Byrum <clint at ubuntu.com>  Wed, 09 Nov 2011 14:43:10 -0800
+ -- Clint Byrum <clint at ubuntu.com>  Wed, 09 Nov 2011 15:02:15 -0800
 
 mysql-5.5 (5.5.17-1) experimental; urgency=low
 

Modified: mysql-5.5/branches/experimental/debian/libmysqlclient-dev.files
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqlclient-dev.files	2011-11-09 22:43:43 UTC (rev 2016)
+++ mysql-5.5/branches/experimental/debian/libmysqlclient-dev.files	2011-11-09 23:02:51 UTC (rev 2017)
@@ -1,9 +1,9 @@
 usr/bin/mysql_config
 usr/include/mysql/*.h
-usr/lib/libmysqlclient.a
-usr/lib/libmysqlclient_r.a
-usr/lib/mysql/plugin/ha_example.*
-usr/lib/mysql/plugin/ha_*_plugin.a
-usr/lib/mysql/plugin/ha_*_plugin.la
+usr/lib/*/libmysqlclient.a
+usr/lib/*/libmysqlclient_r.a
+usr/lib/*/mysql/plugin/ha_example.*
+usr/lib/*/mysql/plugin/ha_*_plugin.a
+usr/lib/*/mysql/plugin/ha_*_plugin.la
 usr/share/aclocal/mysql.m4
 usr/share/man/man1/mysql_config.1

Modified: mysql-5.5/branches/experimental/debian/libmysqlclient18.files
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqlclient18.files	2011-11-09 22:43:43 UTC (rev 2016)
+++ mysql-5.5/branches/experimental/debian/libmysqlclient18.files	2011-11-09 23:02:51 UTC (rev 2017)
@@ -1 +1 @@
-usr/lib/libmysqlclient*.so.*
+usr/lib/*/libmysqlclient*.so.*

Modified: mysql-5.5/branches/experimental/debian/rules
===================================================================
--- mysql-5.5/branches/experimental/debian/rules	2011-11-09 22:43:43 UTC (rev 2016)
+++ mysql-5.5/branches/experimental/debian/rules	2011-11-09 23:02:51 UTC (rev 2017)
@@ -21,6 +21,7 @@
 DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
 DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
 DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 EXPORTED_SOURCE_TARBALL = debian/mysql-source-5.5.tar.gz
 
@@ -90,7 +91,7 @@
 	    -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
 	    -DSYSTEM_TYPE="debian-linux-gnu" \
 	    -DINSTALL_LAYOUT=RPM \
-	    -DINSTALL_LIBDIR=lib \
+	    -DINSTALL_LIBDIR=/$(DEB_HOST_MULTIARCH) \
 	    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
         -DWITH_EMBEDDED_SERVER=ON \
         -DHAVE_EMBEDDED_PRIVILEGE_CONTROL=ON \