diff -Nru /tmp/t06QxZVLLq/reportbug-3.38/debian/changelog /tmp/reLIm279lG/reportbug-3.38ubuntu1/debian/changelog --- /tmp/t06QxZVLLq/reportbug-3.38/debian/changelog 2007-05-12 04:00:45.000000000 +0200 +++ /tmp/reLIm279lG/reportbug-3.38ubuntu1/debian/changelog 2007-05-13 20:10:28.000000000 +0200 @@ -1,3 +1,10 @@ +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 @@ -7,6 +14,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) diff -Nru /tmp/t06QxZVLLq/reportbug-3.38/debian/control /tmp/reLIm279lG/reportbug-3.38ubuntu1/debian/control --- /tmp/t06QxZVLLq/reportbug-3.38/debian/control 2007-05-12 03:59:45.000000000 +0200 +++ /tmp/reLIm279lG/reportbug-3.38ubuntu1/debian/control 2007-05-12 12:01:48.000000000 +0200 @@ -1,7 +1,8 @@ Source: reportbug Section: utils Priority: standard -Maintainer: Chris Lawrence +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Chris Lawrence Standards-Version: 3.7.2 Build-Depends: debhelper (>= 5.0.37.2), python-central (>= 0.5), po4a (>= 0.23) Build-Depends-Indep: python-dev diff -Nru /tmp/t06QxZVLLq/reportbug-3.38/reportbug.conf /tmp/reLIm279lG/reportbug-3.38ubuntu1/reportbug.conf --- /tmp/t06QxZVLLq/reportbug-3.38/reportbug.conf 2004-12-06 14:59:04.000000000 +0100 +++ /tmp/reLIm279lG/reportbug-3.38ubuntu1/reportbug.conf 2007-05-12 12:01:48.000000000 +0200 @@ -6,7 +6,7 @@ # severity normal # BTS to use -#bts debian +bts ubuntu # See 'reportbug --bts help' for a current list of supported BTSes # Submission address: default is 'submit' diff -Nru /tmp/t06QxZVLLq/reportbug-3.38/reportbug_submit.py /tmp/reLIm279lG/reportbug-3.38ubuntu1/reportbug_submit.py --- /tmp/t06QxZVLLq/reportbug-3.38/reportbug_submit.py 2007-04-19 23:22:08.000000000 +0200 +++ /tmp/reLIm279lG/reportbug-3.38ubuntu1/reportbug_submit.py 2007-05-12 12:01:48.000000000 +0200 @@ -460,12 +460,14 @@ if not (exinfo or kudos) and rtype == 'debbugs' and sysinfo: ewrite('\n') ui.long_message( -"""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')) +"""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 we've stored more than one copy of the message, delete the # one without the SMTP headers.