From 85c1a202d25726af703594f4deb56d162181fc1f Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel.holbach@ubuntu.com>
Date: Fri, 5 Oct 2007 11:36:28 +0200
Subject: [PATCH] * Added support for Bugs/Debian/Usertagging in
 submittodebian. * setup.py: actually install submittodebian.

---
 debian/changelog | 10 ++++++++++
 debian/control   |  2 +-
 setup.py         |  3 ++-
 submittodebian   |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 127958b..d1fcaf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ubuntu-dev-tools (0.16) gutsy; urgency=low
+
+  [ Lucas Nussbaum ]
+  * Added support for Bugs/Debian/Usertagging in submittodebian.
+
+  [ Daniel Holbach ]
+  * setup.py: actually install submittodebian.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Fri, 05 Oct 2007 11:05:29 +0200
+
 ubuntu-dev-tools (0.15) gutsy; urgency=low
 
   [ Laurent Bigonville ]
diff --git a/debian/control b/debian/control
index 3097a6a..dff076c 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Standards-Version: 3.7.2
 Package: ubuntu-dev-tools
 Architecture: all
 Section: devel
-Depends: ${python:Depends}, ${misc:Depends}, binutils, devscripts, sudo, python-launchpad-bugs (>= 0.2.14)
+Depends: ${python:Depends}, ${misc:Depends}, binutils, devscripts, sudo, python-launchpad-bugs (>= 0.2.14), reportbug (>= 3.38ubuntu3)
 Recommends: bzr, pbuilder
 Conflicts: devscripts (<< 2.10.7ubuntu5)
 Replaces: devscripts (<< 2.10.7ubuntu5)
diff --git a/setup.py b/setup.py
index a19154b..19c35d7 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,8 @@ setup(name='ubuntu-dev-tools',
                'ppaput',
                'requestsync',
 	       'hugdaylist',
-	       'massfile'
+	       'massfile',
+	       'submittodebian'
   	       ],
 )
 
diff --git a/submittodebian b/submittodebian
index b29b1fd..3e65f7f 100755
--- a/submittodebian
+++ b/submittodebian
@@ -64,7 +64,7 @@ def edit_debdiff(debdiff):
 	run_cmd(cmd)
 
 def submit_bugreport(body, debdiff, changelog):
-	cmd = 'reportbug -A %s -B debian -i %s -V %s %s' % (debdiff, body, deb_version, changelog.package)
+	cmd = 'reportbug -P "User: ubuntu-devel@lists.ubuntu.com" -P "Usertags: origin-ubuntu hardy ubuntu-patch" -A %s -B debian -i %s -V %s %s' % (debdiff, body, deb_version, changelog.package)
 	run_cmd(cmd)
 
 def run_cmd(cmd):