diff -Nru libgpod-0.8.3/debian/changelog libgpod-0.8.3/debian/changelog
--- libgpod-0.8.3/debian/changelog	2013-11-07 21:13:54.000000000 +0100
+++ libgpod-0.8.3/debian/changelog	2013-12-10 23:17:45.000000000 +0100
@@ -1,3 +1,13 @@
+libgpod (0.8.3-1.1ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable. (LP: #1259706) Remaining changes:
+    - debian/control:
+      + Add armhf support to get libgpod-cil-dev back.
+  * d/p/70_adjust-to-latest-libimobiledevice-API-changes.patch:
+    - Dropped, fixed upstream.
+
+ -- Artur Rona <ari-tczew@tlen.pl>  Fri, 22 Nov 2013 01:06:08 +0100
+
 libgpod (0.8.3-1.1) unstable; urgency=low
 
   * Non-maintainer upload
@@ -16,6 +26,32 @@
 
  -- Chow Loong Jin <hyperair@debian.org>  Thu, 31 Oct 2013 02:19:22 +0800
 
+libgpod (0.8.2-7ubuntu4) saucy; urgency=low
+
+  * 70_adjust-to-latest-libimobiledevice-API-changes.patch: correctly 
+    initialize a variable to avoid a segfault (lp: #1221031)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 21 Oct 2013 18:09:43 -0400
+
+libgpod (0.8.2-7ubuntu3) saucy; urgency=low
+
+  * New patch, 70_adjust-to-latest-libimobiledevice-API-changes, cherry-pick
+    e620b2f from upsteam to fix breakage with libimobiledevice 1.1.5.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Mon, 02 Sep 2013 10:24:40 +0200
+
+libgpod (0.8.2-7ubuntu2) saucy; urgency=low
+
+  * No-change rebuild against latest libimobiledevice
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 08 Aug 2013 12:16:14 -0400
+
+libgpod (0.8.2-7ubuntu1) raring; urgency=low
+
+  * Add armhf support to debian/control to get libgpod-cil-dev back.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 06 Nov 2012 11:19:41 -0700
+
 libgpod (0.8.2-7) unstable; urgency=low
 
   * [1c86366] Make -cil packages non-arch-all (Closes: #689054)
diff -Nru libgpod-0.8.3/debian/control libgpod-0.8.3/debian/control
--- libgpod-0.8.3/debian/control	2013-11-07 20:27:00.000000000 +0100
+++ libgpod-0.8.3/debian/control	2013-11-22 17:02:59.000000000 +0100
@@ -1,7 +1,8 @@
 Source: libgpod
 Priority: optional
 Section: libs
-Maintainer: gtkpod Maintainers <pkg-gtkpod-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: gtkpod Maintainers <pkg-gtkpod-devel@lists.alioth.debian.org>
 Uploaders: Chow Loong Jin <hyperair@debian.org>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
@@ -25,10 +26,10 @@
                gtk-doc-tools,
                docbook-xml,
                xsltproc,
-               cli-common-dev (>= 0.5.7) [amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x],
-               mono-devel (>= 2.4.3) [amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x],
-               libgtk2.0-cil-dev (>= 2.12) [amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x],
-               libglib2.0-cil-dev (>= 2.12) [amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x]
+               cli-common-dev (>= 0.5.7) [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x],
+               mono-devel (>= 2.4.3) [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x],
+               libgtk2.0-cil-dev (>= 2.12) [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x],
+               libglib2.0-cil-dev (>= 2.12) [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x]
 Homepage: http://www.gtkpod.org/wiki/Libgpod
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-gtkpod/packages/libgpod.git
@@ -138,7 +139,7 @@
 
 Package: libgpod-cil
 Section: cli-mono
-Architecture: amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x
+Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x
 Depends: ${cli:Depends}, ${misc:Depends}
 Description: CLI bindings for libgpod
  libgpod is a library meant to abstract access to an iPod's content. It
@@ -151,7 +152,7 @@
 
 Package: libgpod-cil-dev
 Section: cli-mono
-Architecture: amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x
+Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x
 Depends: libgpod-cil (= ${binary:Version}), ${misc:Depends}
 Description: CLI bindings for libgpod -- development files
  libgpod is a library meant to abstract access to an iPod's content. It