--- bzrtools-0.6.1.orig/debian/install
+++ bzrtools-0.6.1/debian/install
@@ -1,4 +1 @@
-bzr-push /usr/bin
-baz2bzr /usr/bin
-bzrtools.py /usr/lib/python2.4/site-packages
-progress.py /usr/lib/python2.4/site-packages
+*.py /usr/lib/python2.4/site-packages/bzrlib/plugins/bzrtools
--- bzrtools-0.6.1.orig/debian/copyright
+++ bzrtools-0.6.1/debian/copyright
@@ -1,9 +1,12 @@
-This package was debianized by Jeff Bailey <jbailey@unknown> on
+This package was debianized by Jeff Bailey <jbailey@ubuntu.com> on
 Wed,  8 Jun 2005 21:21:37 +0000.
 
 It was downloaded from http://panoramicfeedback.com/opensource/bzrtools/
 
 Copyright Holder: Aaron Bentley
 
-License:  GNU GPL
+License: GNU GPLv2
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL file.
 
--- bzrtools-0.6.1.orig/debian/rules
+++ bzrtools-0.6.1/debian/rules
@@ -2,7 +2,6 @@
 # This file is public domain.
   
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 # Hook to add dh_python
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
--- bzrtools-0.6.1.orig/debian/control
+++ bzrtools-0.6.1/debian/control
@@ -1,13 +1,16 @@
 Source: bzrtools
-Section: unknown
+Section: devel
 Priority: optional
-Maintainer: Jeff Bailey <jbailey@unknown>
-Build-Depends-Indep: cdbs (>= 0.4.26-2), debhelper (>= 4.1.0)
-Standards-Version: 3.6.1
+Maintainer: Gustavo Franco <stratus@debian.org>
+Build-Depends-Indep: cdbs (>= 0.4.26-2), debhelper (>= 4.1.0), bzr (>= 0.6-2), python-dev
+Standards-Version: 3.6.2.2
 
 Package: bzrtools
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, rsync
-Recommends: pybaz
+Depends: ${python:Depends}, bzr (>= 0.6-2), bzr (<< 0.7)
+Suggests: rsync (>= 2.6.6-1), graphviz (>= 2.2.1-1sarge1), librsvg2-bin (>= 2.9.5-6), patch (>= 2.5.9-2)
 Description: Collection of tools for bzr
- A collection of tools for bzr.
+ This package contains a collection of plugins for bzr - a distributed 
+ version control system. Some of these tools may work their way into 
+ bzr itself at some point, and some are just convenient addons useful 
+ for day to day operations.
--- bzrtools-0.6.1.orig/debian/changelog
+++ bzrtools-0.6.1/debian/changelog
@@ -1,12 +1,33 @@
-bzrtools (0.0.1.20050608-2) unstable; urgency=low
+bzrtools (0.6.1-2) unstable; urgency=low
 
-  * Tweaked packaging 
+  * debian/control cleanups (Thanks Aaron Bentley)
+    - Standards-Version bumped up to 3.6.2.2
+    - bzr (<< 0.7) added on Depends
+    - rsync removed from Depends (added to Suggests)
+    - pybaz removed from Recommends (it will added back later)
+    - graphviz, librsvg2-bin, patch added to Suggests
+
+ -- Gustavo Franco <stratus@debian.org>  Sun,  8 Jan 2006 12:48:03 -0200
+
+bzrtools (0.6.1-1) unstable; urgency=low
+
+  * First Debian release. (Closes: #344217)
+  * debian/control
+    - Maintainer field changed
+    - Standards-Version updated to 3.6.2.1
+    - Depends field cleaned up
+    - Minor changes into Description
+  * debian/copyright
+    - jbailey email address fixed
+    - s/Ubuntu/Debian/
+  * debian/rules
+    - simple-patchsys line removed
 
- -- Aaron Bentley <aaron.bentley@utoronto.ca>  Wed,  8 Jun 2005 20:10:18 -0400
+ -- Gustavo Franco <stratus@debian.org>  Tue, 20 Dec 2005 18:38:39 -0200
 
-bzrtools (0.0.1.20050608-1) unstable; urgency=low
+bzrtools (0.6.1-0ubuntu1) UNRELEASED; urgency=low
 
-  * Initial release Closes: #nnnn  (nnnn is the bug number of your ITP)
+  * Snapshot
 
- -- Jeff Bailey <jbailey@unknown>  Wed,  8 Jun 2005 21:21:37 +0000
+ -- Jeff Bailey <jbailey@ubuntu.com>  Thu, 10 Nov 2005 11:54:46 -0500