diff -uNr libtorrent-0.11.4.old/debian/changelog libtorrent-0.11.4/debian/changelog
--- libtorrent-0.11.4.old/debian/changelog	2007-04-18 16:00:27.000000000 +0200
+++ libtorrent-0.11.4/debian/changelog	2007-04-18 15:57:54.000000000 +0200
@@ -1,9 +1,18 @@
 libtorrent (0.11.4-1) unstable; urgency=low
 
-  * New upstream version
-  * debian/patches/update-changelog.patch: modified to patch the full file.
-  * debian/rules: moved patchsys-quilt.mk to simple-patchsys.mk
-  * debian/control: removed quilt as build-depend
+  [ Jose Luis Rivas ]
+  * New upstream version.
+  * debian/patches/update-changelog.patch:
+    + Modified to patch the full file.
+  * debian/rules:
+    + Moved patchsys-quilt.mk to simple-patchsys.mk
+  * debian/control:
+    + Removed quilt from Build-Depends.
+
+  [ Arnaud Fontaine ]
+  * debian/control:
+    + Add Build-Depends against patchutils.
+    + Add XS-Vcs-Bzr field.
 
  -- Jose Luis Rivas <ghostbar38@gmail.com>  Sat, 31 Mar 2007 10:31:05 -0400
 
diff -uNr libtorrent-0.11.4.old/debian/control libtorrent-0.11.4/debian/control
--- libtorrent-0.11.4.old/debian/control	2007-04-18 16:00:27.000000000 +0200
+++ libtorrent-0.11.4/debian/control	2007-04-18 15:40:40.000000000 +0200
@@ -3,8 +3,9 @@
 Section: libs
 Maintainer: Jose Luis Rivas <ghostbar38@gmail.com>
 Uploaders: Arnaud Fontaine <arnaud@andesi.org>
-Build-Depends: debhelper (>= 5), cdbs, libsigc++-2.0-dev, libssl-dev
+Build-Depends: debhelper (>= 5), cdbs, patchutils (>= 0.2.25), libsigc++-2.0-dev, libssl-dev
 Standards-Version: 3.7.2
+XS-Vcs-Bzr: http://bzr.debian.org/collab-maint/libtorrent/
 
 Package: libtorrent-dev
 Section: libdevel
diff -uNr libtorrent-0.11.4.old/debian/patches/update-changelog.patch libtorrent-0.11.4/debian/patches/update-changelog.patch
--- libtorrent-0.11.4.old/debian/patches/update-changelog.patch	2007-04-18 16:00:27.000000000 +0200
+++ libtorrent-0.11.4/debian/patches/update-changelog.patch	2007-04-18 15:54:17.000000000 +0200
@@ -1,5 +1,5 @@
---- ChangeLog	2007-03-26 14:57:56.000000000 -0400
-+++ ../ChangeLog	2007-04-17 19:12:30.000000000 -0400
+--- /dev/null	2007-03-26 14:57:56.000000000 -0400
++++ ChangeLog	2007-04-17 19:12:30.000000000 -0400
 @@ -0,0 +1,256 @@
 +2007-03-29  Jari Petter Sundell <jaris@student.matnat.uio.no>
 +
diff -uNr libtorrent-0.11.4.old/debian/rules libtorrent-0.11.4/debian/rules
--- libtorrent-0.11.4.old/debian/rules	2007-04-18 16:00:27.000000000 +0200
+++ libtorrent-0.11.4/debian/rules	2007-04-18 15:55:16.000000000 +0200
@@ -7,7 +7,3 @@
 DEB_OPT_FLAG = -O3
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-aligned
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
-
-install/libtorrent-dev::
-	mv config.guess.cdbs-orig config.guess
-	mv config.sub.cdbs-orig config.sub
diff -uNr libtorrent-0.11.4.old/home/ghostbar/tests/libtorrent/libtorrent-0.11.2/ChangeLog libtorrent-0.11.4/home/ghostbar/tests/libtorrent/libtorrent-0.11.2/ChangeLog
--- libtorrent-0.11.4.old/home/ghostbar/tests/libtorrent/libtorrent-0.11.2/ChangeLog	2007-04-18 16:00:27.000000000 +0200
+++ libtorrent-0.11.4/home/ghostbar/tests/libtorrent/libtorrent-0.11.2/ChangeLog	1970-01-01 01:00:00.000000000 +0100
@@ -1,256 +0,0 @@
-2007-03-29  Jari Petter Sundell <jaris@student.matnat.uio.no>
-
-	* Allow properly quoted and escaped arguments to options. F.ex 
-	"schedule = wd,10,10,load_start=~/Foo\ Bar/*.torrent" and "schedule = 
-	wd,10,10,load_start="~/Foo Bar/*.torrent"" now works.
-
-	* Added unlimited setting for max unchoked in ChokeManager and made it 
-	the default. Set with 0 as a temporary hack.
-
-	* Don't resize empty files used for creating directories. Fixed for the 
-	n'th time.
-
-2007-03-25  Jari Petter Sundell <jaris@student.matnat.uio.no>
-
-	* Added support for dvorak keyboard layout. Patch by matled at gmx.net.
-
-	* The STOPPED request was being canceled when a download was closed 
-	with f.ex ^K, moved it so it only happens when the download is removed.
-
-	* Added support for dvorak keyboard layout. Patch by matled at gmx.net.
-
-	* The STOPPED request was being canceled when a download was closed wit
-	f.ex ^K, moved it so it only happens when the download is removed.
-
-	* The "tos" option was parsing the hex value with unit == 0, which 
-	caused it to always zero it.
-
-	* Forgot to check if there were any torrents hashing before starting new
-	non-fast-resume checks, which would cause multiple torrents to be hashed
-	at once.
-
-	* File progress is now updated when hash_check is called, and no longer 
-	cleared on close. This fixes a bug with >100% file progress being 
-	reported and optimizes file progress updating for completed torrents.
-
-	* Disabled IPv6 http requests so the trackers won't think we support it
-	and enabled curl's support for gzip encodings.
-
-	* Added 'seeding' view on key 8.
-
-	* Added "max_{up,down}loads_{div,global}" options. See the man page for 
-	more information.
-
-	* Added support for dvorak keyboard layout. Patch by matled at gmx.net.
-
-	* The STOPPED request was being canceled when a download was closed with
-	f.ex ^K, moved it so it only happens when the download is removed.
-
-2007-01-26  Jari Petter Sundell <jaris@student.matnat.uio.no>
-
-	* Added "max_open_http" option that limits the max number of 
-	simultaneous http connections. By default set to 32.
-
-	* Directory structured view of the file list. The '/' key collapses
-	directories, while the right arrow or ^F enters the selected directory.
-	Changing the priority for a directory changes all contained files.
-
-	* Replaced old autoconf scripts with pkg-config checks. If the curl or
-	openssl check now fails, make sure pkg-config can find them.
-
-	* Added "create_link" and "delete_link" options which apply to a 
-	download. These must be used with the new "on_*" options, so as to 
-	allow you to create symbolic links when starting, stopping, finishing, 
-	etc, a torrent.
-
-2006-12-28  Jari Petter Sundell <jaris@student.matnat.uio.no>
-
-	* Added dired view of files and allow priority to be changed for all 
-	files within a directory.
-
-	* Allow initial hash checking to be paused and resumed.
-
-	* Minor bug fixes.
-
-2006-12-13  Jari Petter Sundell <jaris@student.matnat.uio.no>
-
-	* Added "tracker_numwant", "encryption", "connection_proxy",
-	'preload_type', 'preload_min_size', 'preload_required_rate',
-	"split_file_size", "split_suffix", "max_file_size",
-
-	* Encrypted (obfuscated) handshake and connection support. Patch by 
-	Josef Drexler, public domain as per earlier agreement.
-
-	* Append '&' instead of '?' to the tracker url when the url already
-	has '?'.
-
-	* Added support for tunneling through HTTP 1.0 proxies.
-
-	* Cut the size of the libtorrent binary from 925kb to 617kb by using 
-	GCC's symbol export attributes and changes to how exceptions are
-	constructed.
-
-	* Moved client info, etc, from rtorrent to libtorrent and cleaned up 
-	the API.
-
-	* Support for the CANCEL piece request message. (Finally)
-
-	* Allow the user to configure the max file size a torrent is allowed 
-	to create, and the option to split large files.
-
-2006-10-27  Jari Petter Sundell <jaris@student.matnat.uio.no>
-
-	* Use the actual completed torrent data in the 'downloaded' field
-	sent to	the tracker, rather than the download rate total. This should
-	fix someproblems with too much downloaded data being reported to the 
-	tracker.
-
-2004-11-21  Jari Petter Sundell  <jaris@student.matnat.uio.no>
-
-	* library: Properly update interested/not interested depending on
-	file priorities.
-
-2004-11-15  Jari Petter Sundell  <jaris@student.matnat.uio.no>
-
-	* library: Variable pipe size depending on download speed.
-
-2004-10-27    <jaris@ifi.uio.no>
-
-	* client: On 'T' key, retrive 250 peers from tracker.
-
-	* library: Added tracker numwant and key.
-
-2004-10-02  Jari Petter Sundell  <jaris@student.matnat.uio.no>
-
-	* torrent: New class for selecting the chunks to download.
-
-	* client: File priority added.
-
-2004-09-25  Jari Petter Sundell  <jaris@student.matnat.uio.no>
-
-	* client: View files in torrent and their size. Will be used for priority later.
-
-2004-09-19  Jari Petter Sundell  <jaris@student.matnat.uio.no>
-
-	* all: Forgotten to update this file for a while. Lot's of stuff happen with the code. ;)
-
-	* client: Added resume of torrents and snubbing.
-
-2004-08-23  Jari Petter Sundell  <jaris@student.matnat.uio.no>
-
-	* torrent/data: Wrote new and cleaner files to chunk abstraction. Much prettier.
-
-2004-08-14    <jaris@ifi.uio.no>
-
-	* torrent/tracker: New tracker request code. Modular using sigc++
-	and ready for extension.
-
-	* torrent: Moved over to using libcurl for http downloads.
-
-2004-08-07    <jaris@ifi.uio.no>
-
-	* configure: Added sigc++-2.0 to dependencies.
-
-	* torrent/url: Shiny new http interface with sigc++ signals.
-
-2004-08-05    <jaris@ifi.uio.no>
-
-	* client: Added support for http urls.
-
-	* delegator: Fixed a bug that caused us to request pieces the peer
-	didn't have. (DOH!)
-
-2004-08-04    <jaris@ifi.uio.no>
-
-	* bitfield: Clean up bitfield class and opimized .notIn().
-
-	* torrent: Finished http class, testing remains.
-
-2004-08-03      <jaris@ifi.uio.no>
-
-	* torrent: Don't throw on zero length piece messages. Why do they
-	send these?
-
-2004-07-28    <jaris@ifi.uio.no>
-
-	* torrent: Fixed a few bugs in the throttle and added min chunk
-	size.
-
-2004-07-25    <jaris@ifi.uio.no>
-
-	* torrent: Fixed bug that made it skip sending the stop message to
-	the tracker when quiting.
-
-	* torrent: Changed stdint.h to inttypes.h and made it easy to
-	disable execinfo.h in client.
-
-	* torrent: Added throttle with tree structure. Bandwidth
-	delegation needs work.
-
-2004-07-20    <jaris@ifi.uio.no>
-
-	* torrent: Using deque instead of list to increase performance.
-
-	* torrent: Don't close the connection if errno == EINTR.
-
-	* client: Added view of the exceptions log.
-
-2004-07-11    <jaris@ifi.uio.no>
-
-	* torrent: Choosing new chunks to download according to how many
-	we see.
-
-2004-07-10    <jaris@ifi.uio.no>
-
-	* torrent: BitField::allSet() now works right, fixes problems with
-	finished peers not being disconnected.
-
-	* client: No longer breaks when it receives resize interrupts
-	during select.
-
-2004-07-08    <jaris@ifi.uio.no>
-
-	* torrent: Fixed mangling of outgoing commands.
-
-2004-07-07    <jaris@ifi.uio.no>
-
-	* torrent: Cleaned up the BitField class.
-
-	* client: Cleaned up the UI.
-
-2004-07-04    <jaris@ifi.uio.no>
-
-	* client: Added scrolling when selecting peers or downloads. View
-	the local bitfield.
-
-	* torrent: Fixed some unchoking bugs and made it better at
-	choosing whom to unchoke.
-
-2004-06-29    <jaris@ifi.uio.no>
-
-	* torrent: Cleaned up PeerConnection::write and made it buffer
-	more commands in one send.
-
-2004-06-27    <jaris@ifi.uio.no>
-
-	* torrent: Added automatic creation of directories.
-
-	* configure: Added tests for OpenSSL's crypto lib.
-
-2004-06-26    <jaris@ifi.uio.no>
-
-	* client: Made the display code more maintainable. Added chunks
-	seen amongst peers
-	
-	* torrent: Added counting of chunks seen amongst the peers.
-
-2004-06-25    <jaris@ifi.uio.no>
-
-	* torrent: Restructed stuff, removed redundancy in up/down stuff.
-
-2004-06-12    <jaris@ifi.uio.no>
-
-	* configure: Added autoconf scripts.
-	
-	* configure: Separated the test client and library.
-
