diff -Nru cacti-spine-0.8.8h/debian/changelog cacti-spine-0.8.8h/debian/changelog
--- cacti-spine-0.8.8h/debian/changelog	2016-05-16 20:57:09.000000000 +0200
+++ cacti-spine-0.8.8h/debian/changelog	2016-05-20 15:11:14.000000000 +0200
@@ -1,3 +1,12 @@
+cacti-spine (0.8.8h-1ubuntu1) yakkety; urgency=medium
+
+  * Sync from Debian
+    Remaining change:
+    - d/p/libmysqlclient_r: build against libmysqlclient, not _r (LP:
+      #1564871).
+
+ -- Paul Gevers <elbrus@debian.org>  Fri, 20 May 2016 15:11:04 +0200
+
 cacti-spine (0.8.8h-1) unstable; urgency=medium
 
   * New upstream release (Closes: #780347)
diff -Nru cacti-spine-0.8.8h/debian/control cacti-spine-0.8.8h/debian/control
--- cacti-spine-0.8.8h/debian/control	2016-05-16 20:57:09.000000000 +0200
+++ cacti-spine-0.8.8h/debian/control	2016-05-18 22:14:21.000000000 +0200
@@ -1,7 +1,8 @@
 Source: cacti-spine
 Section: web
 Priority: extra
-Maintainer: Cacti Maintainer <pkg-cacti-maint@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Cacti Maintainer <pkg-cacti-maint@lists.alioth.debian.org>
 Uploaders: Mahyuddin Susanto <udienz@ubuntu.com>,
            Paul Gevers <elbrus@debian.org>,
 Build-Depends: autoconf,
diff -Nru cacti-spine-0.8.8h/debian/patches/libmysqlclient_r cacti-spine-0.8.8h/debian/patches/libmysqlclient_r
--- cacti-spine-0.8.8h/debian/patches/libmysqlclient_r	1970-01-01 01:00:00.000000000 +0100
+++ cacti-spine-0.8.8h/debian/patches/libmysqlclient_r	2016-05-20 15:06:14.000000000 +0200
@@ -0,0 +1,27 @@
+Author: Robie Basak <robie.basak@canonical.com>
+Bug-Ubuntu: https://launchpad.net/bugs/1564871
+Forwarded: no
+Last-Update: 2016-05-20
+
+Index: cacti-spine/configure.ac
+===================================================================
+--- cacti-spine.orig/configure.ac
++++ cacti-spine/configure.ac
+@@ -208,7 +208,7 @@ fi
+ # ****************** MySQL Checks ***********************
+ 
+ AC_DEFUN([MYSQL_LIB_CHK],
+-  [ str="$1/libmysqlclient_r.*"
++  [ str="$1/libmysqlclient.*"
+     for j in `echo $str`; do
+       if test -r $j; then
+         MYSQL_LIB_DIR=$1
+@@ -245,7 +245,7 @@ if test -n "$MYSQL_LIB_DIR" ; then
+ fi
+ CFLAGS="-I$MYSQL_INC_DIR $CFLAGS"
+ 
+-AC_CHECK_LIB(mysqlclient_r,mysql_init, LIBS="-lmysqlclient_r",
++AC_CHECK_LIB(mysqlclient,mysql_init, LIBS="-lmysqlclient",
+   AC_MSG_ERROR([MySQL libraries not found])
+ )
+ 
diff -Nru cacti-spine-0.8.8h/debian/patches/series cacti-spine-0.8.8h/debian/patches/series
--- cacti-spine-0.8.8h/debian/patches/series	2016-05-16 20:39:37.000000000 +0200
+++ cacti-spine-0.8.8h/debian/patches/series	2016-05-18 22:16:21.000000000 +0200
@@ -1,3 +1,4 @@
 03-config-dir.patch
 build_man_from_help.patch
 make_spine_sql_mode-strict_compatible.patch
+libmysqlclient_r