diff -Nru motion-3.2.12/debian/changelog motion-3.2.12/debian/changelog
--- motion-3.2.12/debian/changelog	2010-06-22 11:13:33.000000000 +0200
+++ motion-3.2.12/debian/changelog	2010-07-12 13:41:56.000000000 +0200
@@ -1,3 +1,10 @@
+motion (3.2.12-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable (LP: #604565). Remaining changes:
+    - debian/control: Build-depend on unversioned libmysqlclient-dev 
+
+ -- Angel Abad <angelabad@gmail.com>  Sat, 26 Jun 2010 01:25:17 +0100
+
 motion (3.2.12-1) unstable; urgency=low
 
   * New upstream version.
@@ -31,6 +38,37 @@
 
  -- Christian Perrier <bubulle@debian.org>  Tue, 23 Mar 2010 04:57:55 +0100
 
+motion (3.2.11-2ubuntu4) lucid; urgency=low
+
+  * Rebuild for libmysqlclient transition. 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 05 Apr 2010 22:53:00 -0400
+
+motion (3.2.11-2ubuntu3) lucid; urgency=low
+
+  * rebuild for ffmpeg versioned symbols
+
+ -- Reinhard Tartler <siretart@tauware.de>  Tue, 19 Jan 2010 21:30:56 +0100
+
+motion (3.2.11-2ubuntu2) lucid; urgency=low
+
+  * debian/motion.postinst : use getent return code instead of command output
+
+ -- Jean-Baptiste Lallement <jeanbaptiste.lallement@gmail.com>  Mon, 30 Nov 2009 21:53:28 +0100
+
+motion (3.2.11-2ubuntu1) lucid; urgency=low
+
+  * Fixed debian/motion.postinst : Really test if group "motion" exits
+    (LP: #394755)
+
+ -- Jean-Baptiste Lallement <jeanbaptiste.lallement@gmail.com>  Sat, 21 Nov 2009 22:32:34 +0100
+
+motion (3.2.11-2build1) karmic; urgency=low
+
+  * No-change rebuild to pick up new ffmpeg shlibs file.
+
+ -- Stefan Potyra <sistpoty@ubuntu.com>  Fri, 28 Aug 2009 23:42:01 +0200
+
 motion (3.2.11-2) unstable; urgency=low
 
   * Fixed: init.d script action reload is wrong (Closes: #535769).
@@ -460,3 +498,4 @@
   * Trying it with NO original source changes...
 
  -- Paul Hedderly (DH/DSS) <paul@mjr.org>  Wed, 20 Sep 2000 12:39:09 +0100
+
diff -Nru motion-3.2.12/debian/control motion-3.2.12/debian/control
--- motion-3.2.12/debian/control	2010-04-10 19:55:12.000000000 +0200
+++ motion-3.2.12/debian/control	2010-07-12 13:31:07.000000000 +0200
@@ -1,9 +1,10 @@
 Source: motion
 Section: graphics
 Priority: optional
-Maintainer: Juan Angulo Moreno <juan@apuntale.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Juan Angulo Moreno <juan@apuntale.com>
 HomePage: http://motion.sf.net
-Build-Depends: debhelper (>= 6), autotools-dev, libjpeg62-dev, zlib1g-dev, libavcodec-dev, libavformat-dev, libpq-dev, libmysqlclient15-dev
+Build-Depends: debhelper (>= 6), autotools-dev, libjpeg62-dev, zlib1g-dev, libavcodec-dev, libavformat-dev, libpq-dev, libmysqlclient-dev
 Standards-Version: 3.8.4
 
 Package: motion