diff -Nru reportbug-3.18ubuntu1/debian/changelog reportbug-3.18ubuntu1.1/debian/changelog --- reportbug-3.18ubuntu1/debian/changelog 2006-01-16 10:58:33.000000000 +0100 +++ reportbug-3.18ubuntu1.1/debian/changelog 2009-01-25 19:05:25.000000000 +0100 @@ -1,3 +1,13 @@ +reportbug (3.18ubuntu1.1) dapper-proposed; urgency=low + + * Stop spamming ubuntu-users mailinglist. + Stop working for bts=ubuntu and refer to ubuntu-bug instead. + - reportbug + - reportbug_submit.py + (LP: #310741) + + -- Daniel Hahler Sun, 25 Jan 2009 18:28:25 +0100 + reportbug (3.18ubuntu1) dapper; urgency=low * resync with debian diff -Nru reportbug-3.18ubuntu1/reportbug reportbug-3.18ubuntu1.1/reportbug --- reportbug-3.18ubuntu1/reportbug 2006-01-16 10:57:08.000000000 +0100 +++ reportbug-3.18ubuntu1.1/reportbug 2009-01-25 18:22:21.000000000 +0100 @@ -785,6 +785,13 @@ print LICENSE sys.exit(0) + # Cancel if "bts" is not configured or "ubuntu" + if not options.bts or options.bts == "ubuntu": + ui.long_message('*** ERROR: "Ubuntu" BTS is currently unsupported.\n\n' + 'Please use "ubuntu-bug" (from the apport package) for reporting bugs in Ubuntu.\n\n' + 'You can report bugs to Debian by using bts=debian (see reportbug(1)).\n') + sys.exit(1) + # These option values may get adjusted below, so give them a variable name. sendto = options.sendto check_available = options.check_available diff -Nru reportbug-3.18ubuntu1/reportbug_submit.py reportbug-3.18ubuntu1.1/reportbug_submit.py --- reportbug-3.18ubuntu1/reportbug_submit.py 2006-01-16 10:57:08.000000000 +0100 +++ reportbug-3.18ubuntu1.1/reportbug_submit.py 2009-01-25 18:25:46.000000000 +0100 @@ -418,14 +418,12 @@ if not (exinfo or kudos) and rtype == 'debbugs' and sysinfo: ewrite('\n') ui.long_message( -"""Your bug report has been sent to %s. -You can subscribe to this mailing list at - http://lists.ubuntu.com/mailman/listinfo/ubuntu-users -An archive of this mailing list can be found at - http://lists.ubuntu.com/archives/ubuntu-users/ - -""", - (sysinfo['email'])) +"""If you want to provide additional information, please wait to +receive the bug tracking number via email; you may then send any extra +information to %s (e.g. %s), where n is the bug number. Normally you +will receive an acknowledgement via email including the bug report number +within an hour.\n""", + (sysinfo['email'] % 'n'), (sysinfo['email'] % '999999')) # If we've stored more than one copy of the message, delete the # one without the SMTP headers.