diff -Nru geoclue-0.12.99/debian/changelog geoclue-0.12.99/debian/changelog
--- geoclue-0.12.99/debian/changelog	2013-12-16 13:07:49.000000000 +0000
+++ geoclue-0.12.99/debian/changelog	2014-03-25 22:15:42.000000000 +0000
@@ -1,3 +1,27 @@
+geoclue (0.12.99-3ubuntu1) trusty; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Don't build-depend on ofono, it's not in main (yet?).
+    - Don't have geoclue recommend specific providers.
+    - Fix build with gpsd >= 3.1.
+    - Don't fail on resume if position / address providers are already
+      inited when we try to prepare interfaces.
+    - Pay attention to providers that don't claim to be cacheable; this
+      fixes reliability issues with indicator-datetime.
+    - Use dh-autoreconf to update libtool macros for new ports.  This also
+      requires build-depending on gtk-doc-tools.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 25 Mar 2014 22:15:39 +0000
+
+geoclue (0.12.99-3) unstable; urgency=low
+
+  * [cf5a5bd4] debian/control: Add Multi-Arch: same for libgeoclue0 package
+  * [df11e930] debian/control: Use canonical URL for the Vcs-* fields
+  * [b6eda579] Always update autotools helper files during build
+  * [52761c89] debian/gbp.conf: Set tarball-dir and export-dir
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 09 Sep 2013 21:43:46 +0200
+
 geoclue (0.12.99-2ubuntu6) trusty; urgency=low
 
   * Use dh-autoreconf to update libtool macros for new ports.  This also
diff -Nru geoclue-0.12.99/debian/control geoclue-0.12.99/debian/control
--- geoclue-0.12.99/debian/control	2013-12-16 13:07:29.000000000 +0000
+++ geoclue-0.12.99/debian/control	2014-03-25 22:14:04.000000000 +0000
@@ -5,8 +5,8 @@
 XSBC-Original-Maintainer: Laurent Bigonville <bigon@debian.org>
 Uploaders: Craig Andrews <candrews@integralblue.com>
 Build-Depends: debhelper (>= 9),
-               pkg-config,
                dh-autoreconf,
+               pkg-config,
                libglib2.0-dev (>= 2.25.7),
                libdbus-glib-1-dev (>= 0.86),
                libxml2-dev,
@@ -20,6 +20,8 @@
                gtk-doc-tools
 Homepage: http://www.freedesktop.org/wiki/Software/GeoClue
 Standards-Version: 3.9.4
+XS-Debian-Vcs-Git: git://anonscm.debian.org/collab-maint/geoclue.git
+XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/geoclue.git
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/geoclue/ubuntu
 
 Package: geoclue
@@ -41,6 +43,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: geoclue
 Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: C API for GeoClue
  libgeoclue is a convenience wrapper for the GeoClue service, and 
  the recommended way to use GeoClue in the C language.
diff -Nru geoclue-0.12.99/debian/gbp.conf geoclue-0.12.99/debian/gbp.conf
--- geoclue-0.12.99/debian/gbp.conf	2013-05-23 21:33:31.000000000 +0000
+++ geoclue-0.12.99/debian/gbp.conf	2013-09-09 19:43:57.000000000 +0000
@@ -10,6 +10,8 @@
 # Options only affecting git-buildpackage
 [git-buildpackage]
 sign-tags = True
+tarball-dir = ../tarballs/
+export-dir = ../build-area/
 
 # Options only affecting git-dch
 [git-dch]