diff --git a/debian/changelog b/debian/changelog index 10b8149..62c1379 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,14 @@ ubuntu-dev-tools (0.22) UNRELEASED; urgency=low [ Siegfried-Angel Gevatter Pujals (RainCT) ] * Add dgetlp script (for «dgetting» from Launchpad) - -- Siegfried-Angel Gevatter Pujals (RainCT) Tue, 20 Nov 2007 00:16:55 +0100 + [ Lucas Nussbaum ] + * Enabled support for Bugs/Debian/Usertagging in submittodebian + + [ Michael Vogt ] + * debian/control: + - depend on reportbug (>= 3.39ubuntu1) to have working usertag support + + -- Michael Vogt Tue, 20 Nov 2007 12:15:20 +0100 ubuntu-dev-tools (0.21) hardy; urgency=low diff --git a/debian/control b/debian/control index b82e819..edf5b76 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,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), reportbug, python-debian +Depends: ${python:Depends}, ${misc:Depends}, binutils, devscripts, sudo, python-launchpad-bugs (>= 0.2.14), reportbug (>= 3.39ubuntu1), python-debian Recommends: bzr, pbuilder Conflicts: devscripts (<< 2.10.7ubuntu5) Replaces: devscripts (<< 2.10.7ubuntu5) diff --git a/submittodebian b/submittodebian index 8899ff8..1ba0be0 100755 --- a/submittodebian +++ b/submittodebian @@ -72,7 +72,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): @@ -80,7 +80,7 @@ def run_cmd(cmd): print "%s\n" % cmd os.system(cmd) -changelog_file = check_file('debian/changelog', critical = no) or check_file('../debian/changelog') +changelog_file = check_file('debian/changelog', critical = False) or check_file('../debian/changelog') changelog = Changelog(file(changelog_file).read()) deb_version = get_most_recent_debian_version(changelog)