* Enabled support for Bugs/Debian/Usertagging in submittodebian

* debian/control:
  - depend on reportbug (>= 3.39ubuntu1) to have working usertag support
This commit is contained in:
Michael Vogt 2007-11-20 12:21:17 +01:00
parent 6ef10be9bb
commit d333c56e3e
3 changed files with 11 additions and 4 deletions

9
debian/changelog vendored
View File

@ -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) <sgevatter@ubuntu.cat> 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 <michael.vogt@ubuntu.com> Tue, 20 Nov 2007 12:15:20 +0100
ubuntu-dev-tools (0.21) hardy; urgency=low

2
debian/control vendored
View File

@ -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)

View File

@ -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)