diff -Nru reportbug-4.6/bin/reportbug reportbug-4.6ubuntu1/bin/reportbug --- reportbug-4.6/bin/reportbug 2009-08-12 14:30:12.000000000 +0530 +++ reportbug-4.6ubuntu1/bin/reportbug 2009-08-13 01:32:22.000000000 +0530 @@ -974,6 +974,14 @@ print LICENSE sys.exit(0) + # Cancel if "bts" is not configured or "ubuntu" + if not self.options.bts or self.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 specifying \'bts debian\' in your ~/.reportbugrc\n' + 'or by passing the -B debian option on the commandline (see reportbug(1)).\n') + sys.exit(1) + # These option values may get adjusted below, so give them a variable name. sendto = self.options.sendto check_available = self.options.check_available diff -Nru /tmp/stiiPco17E/reportbug-4.6/debian/changelog /tmp/087IqiT5go/reportbug-4.6ubuntu1/debian/changelog --- reportbug-4.6/debian/changelog 2009-08-12 14:30:12.000000000 +0530 +++ reportbug-4.6ubuntu1/debian/changelog 2009-08-16 12:07:32.000000000 +0530 @@ -1,3 +1,15 @@ +reportbug (4.6ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #414338 + - bin/reportbug + + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug" + instead. + + exit with an error, if bts=ubuntu (or unconfigured). + - reportbug/__init__.py: Match reportbug version with package version. + - debian/control: Add prominent note to package description. + + -- Bhavani Shankar Sun, 16 Aug 2009 12:06:53 +0530 + reportbug (4.6) unstable; urgency=low * reportbug/__init__.py @@ -50,6 +62,18 @@ -- Sandro Tosi Wed, 12 Aug 2009 10:57:03 +0200 +reportbug (4.5ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #401925), remaining changes: + - bin/reportbug + + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug" + instead. + + exit with an error, if bts=ubuntu (or unconfigured). + - reportbug/__init__.py: Match reportbug version with package version. + - debian/control: Add prominent note to package description. + + -- Andres Rodriguez Mon, 20 Jul 2009 15:47:06 -0500 + reportbug (4.5) unstable; urgency=low [ Sandro Tosi ] @@ -106,6 +130,18 @@ -- Sandro Tosi Mon, 29 Jun 2009 18:14:33 +0200 +reportbug (4.4ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #382562), remaining changes: + - Make reportbug stop working for bts=ubuntu and refer to + "ubuntu-bug" instead + - reportbug: exit with an error, if bts=ubuntu (or unconfigured) + - Match reportbug version with package version. + - debian/control: add prominent note to package description + - debian/rules: Remove dh_desktop, no longer does anything. + + -- Kenneth E. Drake Mon, 01 Jun 2009 16:06:13 -0500 + reportbug (4.4) unstable; urgency=low * reportbug/__init__.py @@ -168,6 +204,25 @@ -- Sandro Tosi Sun, 24 May 2009 21:54:21 +0200 +reportbug (4.2ubuntu1) karmic; urgency=low + + [ Kenneth E. Drake ] + * Merge with Debian unstable (LP: #378591), remaining changes: + - Make reportbug stop working for bts=ubuntu and refer to + "ubuntu-bug" instead + - reportbug: exit with an error, if bts=ubuntu (or unconfigured) + - Match reportbug version with package version. + - debian/control: add prominent note to package description + - debian/rules: + + Append "--install-layout=deb" to distutils install command. + This ensures installation to the correct directory with python2.6. + + Remove dh_desktop, no longer does anything. + + [ Iain Lane ] + * bin/reportbug: Modify Ubuntu error message to be slightly more explicit. + + -- Kenneth E. Drake Wed, 20 May 2009 02:29:33 -0500 + reportbug (4.2) unstable; urgency=low [ Sandro Tosi ] @@ -391,6 +446,16 @@ -- Sandro Tosi Thu, 23 Oct 2008 16:04:28 +0200 +reportbug (3.48ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #314556), remaining changes: + - Make reportbug stop working for bts=ubuntu and refer to + "ubuntu-bug" instead + - reportbug: exit with an error, if bts=ubuntu (or unconfigured) + - debian/control: add prominent note to package description + + -- Iain Lane Tue, 06 Jan 2009 23:24:20 +0000 + reportbug (3.48) unstable; urgency=low [ Don Armstrong ] @@ -404,6 +469,16 @@ -- Sandro Tosi Sun, 14 Dec 2008 15:39:20 +0100 +reportbug (3.47ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Make reportbug stop working for bts=ubuntu and refer to + "ubuntu-bug" instead (LP: #228183, #123414) + - reportbug: exit with an error, if bts=ubuntu (or unconfigured) + - debian/control: add prominent note to package description + + -- Daniel Hahler Wed, 10 Dec 2008 21:52:53 +0100 + reportbug (3.47) unstable; urgency=low * reportbuglib/reportbug_ui_text.py @@ -533,6 +608,28 @@ -- Sandro Tosi Mon, 30 Jun 2008 00:39:27 +0200 +reportbug (3.41ubuntu2) intrepid; urgency=low + + * reportbug: pick new shebang line from 3.42, which fixes import of + python-urwid (LP: #276062) + + -- Daniel Hahler Mon, 29 Sep 2008 22:19:12 +0200 + +reportbug (3.41ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu specific changes: + - reportbug.conf: + - "bts ubuntu" + - "smtphost fiordland.ubuntu.com": + Added the fiordland.ubuntu.com SMTP server in reportbug.conf so + that reportbug works without a MTA. + - reportbug_submit.py: only display ubuntu-users specific message if + BTS "ubuntu" is used in send_report. + - reportbug.1: mention Ubuntu specific changes (LP: #163924) + * Fixes LP: #239124, #204009 + + -- Daniel Hahler Fri, 20 Jun 2008 18:11:24 +0200 + reportbug (3.41) unstable; urgency=high [ Sandro Tosi ] @@ -671,6 +768,33 @@ -- Y Giridhar Appaji Nag Sat, 22 Mar 2008 15:33:23 +0530 +reportbug (3.39ubuntu3) hardy; urgency=low + + * reportbug.1: mention Ubuntu specific changes (LP: #163924) + + -- Daniel Hahler Tue, 29 Jan 2008 23:41:19 +0100 + +reportbug (3.39ubuntu2) hardy; urgency=low + + * reportbug_submit.py: only display ubuntu-users specific message if + BTS "ubuntu" is used in send_report. + Restore the general debbugs message to be used in all other + cases. (LP: #114917) + + -- dAniel hAhler Wed, 16 Jan 2008 01:54:11 +0100 + +reportbug (3.39ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - send bug reports to the ubuntu-users mailing list. + - Added the fiordland.ubuntu.com SMTP server in reportbug.conf so + that reportbug works without a MTA. + * Add a -P option to allow to set pseudo-headers. This is useful to + set usertags at bug submission time. (patch is from Debian bug + #445144) + + -- Lucas Nussbaum Wed, 03 Oct 2007 16:44:28 +0200 + reportbug (3.39) unstable; urgency=low * Add man page for reportbug.conf, thanks to Y Giridhar Appaji Nag. @@ -682,6 +806,20 @@ -- Chris Lawrence Thu, 16 Aug 2007 17:40:08 -0500 +reportbug (3.38ubuntu2) gutsy; urgency=low + + * Added the fiordland.ubuntu.com SMTP server in reportbug.conf so that + reportbug works without a MTA. + + -- Sarah Hobbs Sat, 16 Jun 2007 17:00:42 +1000 + +reportbug (3.38ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - send bug reports to the the ubuntu-users mailing list + + -- Andrea Veri Sat, 12 May 2007 12:01:49 +0200 + reportbug (3.38) unstable; urgency=low * Use apt-cache showsrc and apt-cache show to eliminate churns of the @@ -691,6 +829,14 @@ -- Chris Lawrence Fri, 11 May 2007 21:00:36 -0500 +reportbug (3.37ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - send bug reports to the the ubuntu-users mailing list + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Kjell Braden Sat, 5 May 2007 09:29:23 +0200 + reportbug (3.37) unstable; urgency=low * More Unicode cleanups (Closes: #420038) @@ -3945,3 +4091,4 @@ * Initial Release. -- Chris Lawrence Fri, 14 May 1999 05:38:23 -0500 + diff -Nru /tmp/stiiPco17E/reportbug-4.6/debian/control /tmp/087IqiT5go/reportbug-4.6ubuntu1/debian/control --- reportbug-4.6/debian/control 2009-08-12 14:30:12.000000000 +0530 +++ reportbug-4.6ubuntu1/debian/control 2009-08-13 01:32:23.000000000 +0530 @@ -1,7 +1,8 @@ Source: reportbug Section: utils Priority: standard -Maintainer: Reportbug Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Reportbug Maintainers Uploaders: Sandro Tosi , Chris Lawrence Standards-Version: 3.8.2 Build-Depends: debhelper (>= 7), po4a (>= 0.23), python (>= 2.5) @@ -35,6 +36,10 @@ . This package also includes the "querybts" script for browsing the Debian bug tracking system. + . + REPORTBUG IS MEANT FOR UBUNTU DEVELOPERS TO FORWARD BUGS TO DEBIAN. + IF YOU WANT TO REPORT A BUG IN UBUNTU, PLEASE USE "ubuntu-bug" + INSTEAD (from the "apport" package). Package: python-reportbug Section: python diff -Nru /tmp/stiiPco17E/reportbug-4.6/reportbug/__init__.py /tmp/087IqiT5go/reportbug-4.6ubuntu1/reportbug/__init__.py --- reportbug-4.6/reportbug/__init__.py 2009-08-12 14:30:12.000000000 +0530 +++ reportbug-4.6ubuntu1/reportbug/__init__.py 2009-08-16 11:35:13.000000000 +0530 @@ -25,7 +25,7 @@ __all__ = ['bugreport', 'utils', 'urlutils', 'checkbuildd', 'checkversions', 'debianbts', 'exceptions', 'submit', 'tempfile'] -VERSION_NUMBER = "4.6" +VERSION_NUMBER = "4.6ubuntu1" VERSION = "reportbug "+VERSION_NUMBER COPYRIGHT = VERSION + '\nCopyright (C) 1999-2008 Chris Lawrence ' + \