diff -Nru forked-daapd-0.19gcd/debian/changelog forked-daapd-0.19gcd/debian/changelog
--- forked-daapd-0.19gcd/debian/changelog	2011-09-22 19:15:32.000000000 +0200
+++ forked-daapd-0.19gcd/debian/changelog	2012-01-07 15:35:33.000000000 +0100
@@ -1,3 +1,10 @@
+forked-daapd (0.19gcd-2ubuntu1) precise; urgency=low
+
+  * Merge from debian unstable (LP: #896668).  Remaining changes:
+    - debian/control: Build-Depends on libevent1-dev (LP: #749137)
+
+ -- Leo Iannacone <l3on@ubuntu.com>  Thu, 22 Sep 2011 23:43:17 +0000
+
 forked-daapd (0.19gcd-2) unstable; urgency=low
 
   * Move the GCD codebase to unstable.
@@ -13,6 +20,12 @@
 
  -- Julien BLACHE <jblache@debian.org>  Sun, 11 Sep 2011 16:19:40 +0200
 
+forked-daapd (0.19-1ubuntu1) oneiric; urgency=low
+
+  * debian/control: Build-Depends on libevent1-dev (LP: #749137)
+
+ -- Jamie Strandboge <jamie@ubuntu.com>  Thu, 15 Sep 2011 09:10:09 -0500
+
 forked-daapd (0.19-1) unstable; urgency=low
 
   * New upstream release.
@@ -35,6 +48,13 @@
 
  -- Julien BLACHE <jblache@debian.org>  Sun, 07 Aug 2011 12:16:39 +0200
 
+forked-daapd (0.18-2) unstable; urgency=low
+
+  * debian/patches/dacp-unknown-prop-loop-fix.patch:
+    + Added; fix infinite loop on unknown DACP property (closes: #637864).
+
+ -- Julien BLACHE <jblache@debian.org>  Mon, 15 Aug 2011 12:58:09 +0200
+
 forked-daapd (0.18-1) unstable; urgency=low
 
   * New upstream release.
@@ -267,3 +287,4 @@
   * Initial release.
 
  -- Julien BLACHE <jblache@debian.org>  Sun, 20 Sep 2009 15:42:18 +0200
+
diff -Nru forked-daapd-0.19gcd/debian/control forked-daapd-0.19gcd/debian/control
--- forked-daapd-0.19gcd/debian/control	2011-06-20 18:15:20.000000000 +0200
+++ forked-daapd-0.19gcd/debian/control	2011-11-26 21:32:55.000000000 +0100
@@ -1,8 +1,9 @@
 Source: forked-daapd
 Section: sound
 Priority: optional
-Maintainer: Julien BLACHE <jblache@debian.org>
-Build-Depends: debhelper (>= 7), libflac-dev, libtagc0-dev, libavcodec-dev (>= 3:0.svn20090204), libavformat-dev (>= 3:0.svn20090204), libswscale-dev, libavutil-dev, libavahi-client-dev, libsqlite3-dev (>= 3.6.23.1-2), libconfuse-dev, libavl-dev, libmxml-dev, libplist-dev (>= 0.16), libgcrypt11-dev, libgpg-error-dev, libasound2-dev [linux-any], oss4-dev [kfreebsd-any], zlib1g-dev, libunistring-dev (>= 0.9.3), libtre-dev (>= 0.8.0), libblocksruntime-dev, libdispatch-dev (>= 0~svn197-2), clang, libantlr3c-dev (>= 3.2), antlr3 (>= 3.2-3), gperf, autotools-dev
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Julien BLACHE <jblache@debian.org>
+Build-Depends: debhelper (>= 7), libflac-dev, libtagc0-dev, libavcodec-dev (>= 3:0.svn20090204), libavformat-dev (>= 3:0.svn20090204), libswscale-dev, libavutil-dev, libavahi-client-dev, libsqlite3-dev (>= 3.6.23.1-2), libconfuse-dev, libavl-dev, libmxml-dev, libplist-dev (>= 0.16), libgcrypt11-dev, libgpg-error-dev, libasound2-dev [linux-any], oss4-dev [kfreebsd-any], zlib1g-dev, libunistring-dev (>= 0.9.3), libtre-dev (>= 0.8.0), libblocksruntime-dev, libdispatch-dev (>= 0~svn197-2), clang, libantlr3c-dev (>= 3.2), antlr3 (>= 3.2-3), gperf, autotools-dev, libc6-dev (>= 2.13-20)
 Standards-Version: 3.9.2
 
 Package: forked-daapd