Browse Source

Various cleanups for 3.39.

suites/jessie-proposed-backports
Chris Lawrence 15 years ago
parent
commit
fc634b4276
  1. 8
      TODO
  2. 11
      debian/changelog
  3. 2
      debian/rules
  4. 2
      querybts.1
  5. 9
      reportbug
  6. 8
      reportbug.1
  7. 6
      reportbug.py

8
TODO

@ -1,14 +1,12 @@
reportbug now has public CVS read access at:
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/reportbug/
http://alioth.debian.org/plugins/scmcvs/cvsweb.php/?cvsroot=reportbug
--
Silly TODO list for 3.0 (possibly sarge, depending on RM's mood):
Silly TODO list for reportbug 4.0 (lenny):
1. Document reportbug.conf properly in a man page.
Silly TODO list for 4.0 (sarge+1):
0. Use debian-btsutils instead of debianbts.py for BTS queries.
1. Proper GNOME interface. My current thinking is to hack the
bug-buddy Glade file to pieces, or do something similar in straight

11
debian/changelog

@ -1,3 +1,14 @@
reportbug (3.39) unstable; urgency=low
* Add man page for reportbug.conf, thanks to Y Giridhar Appaji Nag.
(Closes: #437473)
* Cope (hopefully) with non-ASCII realnames in .reportbugrc when
reportbug --help is invoked. (Closes: #434011, #432505)
* Get rid of duplicate listings for uninstalled packages due to multiple
appearances in the available file. (Closes: #424433, 427660)
-- Chris Lawrence <lawrencc@debian.org> Thu, 16 Aug 2007 17:40:08 -0500
reportbug (3.38) unstable; urgency=low
* Use apt-cache showsrc and apt-cache show to eliminate churns of the

2
debian/rules

@ -70,7 +70,7 @@ binary-arch: build install
# dh_installemacsen
# dh_installinit
dh_installcron
dh_installman querybts.1 reportbug.1 reportbug.fr.1 querybts.fr.1 reportbug.ja.1
dh_installman querybts.1 reportbug.1 reportbug.fr.1 querybts.fr.1 reportbug.ja.1 reportbug.conf.5
# dh_undocumented
dh_installchangelogs
dh_link

2
querybts.1

@ -92,6 +92,6 @@ package name.
You must have the python-newt package installed to run this program.
.SH "SEE ALSO"
reportbug(1)
reportbug(1), reportbug.conf(5)
.SH AUTHOR
Chris Lawrence <lawrencc@debian.org>.

9
reportbug

@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE."""
#
# Version ##VERSION##; see changelog for revision history
# $Id: reportbug,v 1.98.2.31 2007-05-14 03:45:09 lawrencc Exp $
# $Id: reportbug,v 1.98.2.32 2007-08-16 22:40:37 lawrencc Exp $
# Work around case where Python install might be broken (#290043)
try:
@ -558,6 +558,11 @@ def main():
except locale.Error, x:
print >> sys.stderr, '*** Warning:', x
charset = locale.nl_langinfo(locale.CODESET)
# It would be nice if there were some canonical character set conversion
if charset.lower() == 'ansi_x3.4-1968':
charset = 'us-ascii'
defaults = dict(sendto="submit", mode="novice", mta="/usr/sbin/sendmail",
check_available=True, query_src=True, debconf=True,
editor='', offline=False, verify=True, check_uid=True,
@ -576,6 +581,8 @@ def main():
args = reportbug.parse_config_files()
for option, arg in args.items():
if option in reportbug.CONFIG_ARGS:
if isinstance(arg, unicode):
arg = arg.encode(charset, 'replace')
defaults[option] = arg
else:
sys.stderr.write('Warning: untranslated token "%s"\n' % option)

8
reportbug.1

@ -430,8 +430,8 @@ with # is taken to be a comment and will be ignored.
Generally, options corresponding to the GNU long options for
.B reportbug
are supported, without leading \-\- sequences. See the default
.B /etc/reportbug.conf
are supported, without leading \-\- sequences. See
.B reportbug.conf(5)
for all acceptable options.
.SH ENVIRONMENT
.TP
@ -480,7 +480,9 @@ should probably be compatible with other bug tracking systems, like
.B jitterbug
(used by Samba, AbiSource and FreeCiv) but it isn't.
.SH "SEE ALSO"
http://www.debian.org/Bugs/Developer#tags for available tags, querybts(1)
reportbug.conf(5),
.I http://www.debian.org/Bugs/Developer#tags
for available tags, querybts(1)
.SH AUTHOR
Chris Lawrence <lawrencc@debian.org>.

6
reportbug.py

@ -21,7 +21,7 @@
#
# Version ##VERSION##; see changelog for revision history
#
# $Id: reportbug.py,v 1.35.2.22 2007-04-26 03:48:31 lawrencc Exp $
# $Id: reportbug.py,v 1.35.2.23 2007-08-16 22:40:37 lawrencc Exp $
VERSION = "reportbug ##VERSION##"
VERSION_NUMBER = "##VERSION##"
@ -441,6 +441,7 @@ def get_source_name(package):
def get_source_package(package):
packages = []
retlist = []
found = {}
data = commands.getoutput('apt-cache showsrc'+commands.mkarg(package))
data = data.decode('utf-8', 'replace')
@ -454,8 +455,9 @@ def get_source_package(package):
for p in packages:
desc = available_package_description(p)
if desc:
if desc and (p not in found):
retlist += [(p, desc)]
found[p] = desc
retlist.sort()
return retlist

Loading…
Cancel
Save