diff -Nru apt-transport-debtorrent-0.2.0/debian/changelog apt-transport-debtorrent-0.2.0ubuntu1/debian/changelog
--- apt-transport-debtorrent-0.2.0/debian/changelog	2008-01-10 06:29:47.000000000 +0100
+++ apt-transport-debtorrent-0.2.0ubuntu1/debian/changelog	2008-01-15 12:05:54.000000000 +0100
@@ -1,3 +1,14 @@
+apt-transport-debtorrent (0.2.0ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable (LP: #183143). Remaining Ubuntu changes:
+    - Build-dep on libapt-pkg-dev (>= 0.7.9).
+    - Add quilt support
+    - debian/patches/SetFailReason.patch: fix FTBFS
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Andrea Colangelo <warp10@libero.it>  Sat, 12 Jan 2008 10:10:56 +0100
+
 apt-transport-debtorrent (0.2.0) unstable; urgency=low
 
   * Upgrade transport version to 0.2
@@ -12,6 +23,20 @@
 
  -- Cameron Dale <camrdale@gmail.com>  Wed, 09 Jan 2008 21:28:07 -0800
 
+apt-transport-debtorrent (0.1.1ubuntu2) hardy; urgency=low
+
+  * Rebuild against libapt-pkg-libc6.6-6-4.6.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 14 Dec 2007 12:06:30 +0100
+
+apt-transport-debtorrent (0.1.1ubuntu1) hardy; urgency=low
+
+  * Add quilt support
+  * debian/patches/SetFailReason.patch: fix FTBFS
+  * debian/control: update Maintainer field as per spec
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Tue, 13 Nov 2007 14:55:07 +0100
+
 apt-transport-debtorrent (0.1.1) unstable; urgency=low
 
   * Add the source location to the copyright file
diff -Nru apt-transport-debtorrent-0.2.0/debian/control apt-transport-debtorrent-0.2.0ubuntu1/debian/control
--- apt-transport-debtorrent-0.2.0/debian/control	2008-01-10 06:35:14.000000000 +0100
+++ apt-transport-debtorrent-0.2.0ubuntu1/debian/control	2008-01-12 10:10:56.000000000 +0100
@@ -1,10 +1,11 @@
 Source: apt-transport-debtorrent
 Section: admin
 Priority: optional
-Maintainer: Cameron Dale <camrdale@gmail.com>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Cameron Dale <camrdale@gmail.com>
 Homepage: http://debtorrent.alioth.debian.org/
 Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5.0), libapt-pkg-dev
+Build-Depends: debhelper (>= 5.0), libapt-pkg-dev (>= 0.7.9), quilt
 Vcs-Svn: svn://svn.debian.org/debtorrent/apt-transport-debtorrent/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debtorrent/apt-transport-debtorrent/trunk/
 XS-Dm-Upload-Allowed: yes
diff -Nru apt-transport-debtorrent-0.2.0/debian/patches/series apt-transport-debtorrent-0.2.0ubuntu1/debian/patches/series
--- apt-transport-debtorrent-0.2.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ apt-transport-debtorrent-0.2.0ubuntu1/debian/patches/series	2008-01-10 10:31:04.000000000 +0100
@@ -0,0 +1 @@
+SetFailReason.patch
diff -Nru apt-transport-debtorrent-0.2.0/debian/patches/SetFailReason.patch apt-transport-debtorrent-0.2.0ubuntu1/debian/patches/SetFailReason.patch
--- apt-transport-debtorrent-0.2.0/debian/patches/SetFailReason.patch	1970-01-01 01:00:00.000000000 +0100
+++ apt-transport-debtorrent-0.2.0ubuntu1/debian/patches/SetFailReason.patch	2008-01-10 10:31:04.000000000 +0100
@@ -0,0 +1,56 @@
+Index: apt-transport-debtorrent-0.1.1ubuntu1/connect.cc
+===================================================================
+--- apt-transport-debtorrent-0.1.1ubuntu1.orig/connect.cc	2007-11-13 15:53:38.000000000 +0100
++++ apt-transport-debtorrent-0.1.1ubuntu1/connect.cc	2007-11-13 16:11:45.000000000 +0100
+@@ -18,6 +18,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <unistd.h>
++#include <sstream>
+ 
+ // Internet stuff
+ #include <netinet/in.h>
+@@ -66,12 +67,10 @@
+       wrong this will get tacked onto the end of the error message */
+    if (LastHostAddr->ai_next != 0)
+    {
+-      char Name2[NI_MAXHOST + NI_MAXSERV + 10];
+-      snprintf(Name2,sizeof(Name2),"[IP: %s %s]",Name,Service);
+-      Owner->SetFailExtraMsg(string(Name2));
+-   }   
+-   else
+-      Owner->SetFailExtraMsg("");
++      std::stringstream ss;
++      ioprintf(ss, "[IP: %s %s]",Name,Service);
++      Owner->SetIP(ss.str());
++   }
+       
+    // Get a socket
+    if ((Fd = socket(Addr->ai_family,Addr->ai_socktype,
+@@ -88,7 +87,7 @@
+    /* This implements a timeout for connect by opening the connection
+       nonblocking */
+    if (WaitFd(Fd,true,TimeOut) == false) {
+-      Owner->SetFailExtraMsg("\nFailReason: Timeout");
++      Owner->SetFailReason("Timeout");
+       return _error->Error("Could not connect to %s:%s (%s), "
+ 			   "connection timed out",Host.c_str(),Service,Name);
+    }
+@@ -103,7 +102,7 @@
+    {
+       errno = Err;
+       if(errno == ECONNREFUSED)
+-         Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused");
++         Owner->SetFailReason("ConnectionRefused");
+       return _error->Errno("connect","Could not connect to %s:%s (%s).",Host.c_str(),
+ 			   Service,Name);
+    }
+@@ -168,7 +167,7 @@
+ 	    
+ 	    if (Res == EAI_AGAIN)
+ 	    {
+-	       Owner->SetFailExtraMsg("\nFailReason: TmpResolveFailure");
++	       Owner->SetFailReason("TmpResolveFailure");
+ 	       return _error->Error("Temporary failure resolving '%s'",
+ 				    Host.c_str());
+ 	    }
diff -Nru apt-transport-debtorrent-0.2.0/debian/rules apt-transport-debtorrent-0.2.0ubuntu1/debian/rules
--- apt-transport-debtorrent-0.2.0/debian/rules	2007-08-17 19:11:39.000000000 +0200
+++ apt-transport-debtorrent-0.2.0ubuntu1/debian/rules	2008-01-10 10:31:04.000000000 +0100
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -13,7 +15,7 @@
 
 build: build-stamp
 
-build-stamp:
+build-stamp: patch
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -21,7 +23,7 @@
 
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	rm -f build-stamp