Followup-For: Bug #935988
Control: retitle -1 buster-pu: package reportbug/7.5.3~deb10u1
new debdiff for rebuilding the 7.5.3 maintainer upload for buster.
Andreas
diff -Nru reportbug-7.5.2/bin/reportbug reportbug-7.5.3~deb10u1/bin/reportbug
--- reportbug-7.5.2/bin/reportbug 2019-02-01 02:57:49.000000000 +0100
+++ reportbug-7.5.3~deb10u1/bin/reportbug 2019-08-29 01:54:08.000000000
+0200
@@ -1936,7 +1936,6 @@
detected_addr = self.options.email or utils.get_email()[1]
if not detected_addr:
efail("list-cc-me option specified but email address not
detected")
- ewrite("list-cc-me DEBUG: {}".format(detected_addr))
listcc += [detected_addr]
if not listcc and mode > MODE_STANDARD and rtype == 'debbugs' and not
self.options.testmode and not self.options.template and self.options.ccmenu:
diff -Nru reportbug-7.5.2/debian/changelog
reportbug-7.5.3~deb10u1/debian/changelog
--- reportbug-7.5.2/debian/changelog 2019-02-01 02:57:49.000000000 +0100
+++ reportbug-7.5.3~deb10u1/debian/changelog 2019-08-29 22:47:26.000000000
+0200
@@ -1,3 +1,33 @@
+reportbug (7.5.3~deb10u1) buster; urgency=medium
+
+ * Non-maintainer upload.
+ * Re-enable submitting stretch-pu requests.
+ * Rebuild for buster.
+
+ -- Andreas Beckmann <a...@debian.org> Thu, 29 Aug 2019 22:47:26 +0200
+
+reportbug (7.5.3) unstable; urgency=medium
+
+ * debian/control
+ - replace emacs* Suggests with emacs-bin-common; Closes: #925422
+ - bump Standards-Version to 4.4.0 (no changes needed)
+ - add sensible-utils dep, patch by Nis Martensen
+ * reportbug/debbugs.py
+ - when handling ftp.d.o, dont look up package information if the package
+ doesnt exist, fixing a crash; Closes: #923631
+ - fix a crash with stable version lookup, patch by Nis Martensen;
+ Closes: #935602
+ * bin/reportbug
+ - remove debug code when handling list-cc-me, patch by Josh Triplett
+ * reportbug/utils.py
+ - update release names, following Buster releases, patch by Nicolas
+ Braud-Santoni; Closes: #932524, #931609
+ - recognize versioned Provides; patch by Nis Martensen; Closes: #934472
+ * man/reportbug.1
+ - add default for --draftpath; patch by laokz
+
+ -- Sandro Tosi <mo...@debian.org> Wed, 28 Aug 2019 19:54:08 -0400
+
reportbug (7.5.2) unstable; urgency=medium
* bin/reportbug
diff -Nru reportbug-7.5.2/debian/control reportbug-7.5.3~deb10u1/debian/control
--- reportbug-7.5.2/debian/control 2019-02-01 02:57:49.000000000 +0100
+++ reportbug-7.5.3~deb10u1/debian/control 2019-08-29 01:54:08.000000000
+0200
@@ -3,7 +3,7 @@
Priority: standard
Maintainer: Reportbug Maintainers <debian-report...@lists.debian.org>
Uploaders: Sandro Tosi <mo...@debian.org>
-Standards-Version: 4.1.2
+Standards-Version: 4.4.0
Build-Depends: debhelper (>= 10), python3, dh-python
Build-Depends-Indep: python3-nose, python3-setuptools, python3-mock
Vcs-Git: https://salsa.debian.org/reportbug-team/reportbug.git
@@ -12,7 +12,7 @@
Package: reportbug
Architecture: all
Depends: ${misc:Depends}, ${python3:Depends}, apt, python3-reportbug (=
${source:Version}), sensible-utils
-Suggests: postfix | exim4 | mail-transport-agent, gnupg | pgp, debconf-utils
(>> 1.1.0), debsums (>= 2.0.47), file (>> 1.30), dlocate, python3-urwid,
reportbug-gtk (= ${source:Version}), xdg-utils, emacs24-bin-common |
emacs25-bin-common, claws-mail (>= 3.8.0)
+Suggests: postfix | exim4 | mail-transport-agent, gnupg | pgp, debconf-utils
(>> 1.1.0), debsums (>= 2.0.47), file (>> 1.30), dlocate, python3-urwid,
reportbug-gtk (= ${source:Version}), xdg-utils, emacs-bin-common, claws-mail
(>= 3.8.0)
Description: reports bugs in the Debian distribution
reportbug is a tool designed to make the reporting of bugs in Debian
and derived distributions relatively painless. Its features include:
@@ -35,7 +35,7 @@
Package: python3-reportbug
Section: python
Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, apt, python3-debian,
python3-debianbts (>= 1.13), file, python3-requests, python3-apt
+Depends: ${misc:Depends}, ${python3:Depends}, apt, python3-debian,
python3-debianbts (>= 1.13), file, python3-requests, python3-apt, sensible-utils
Suggests: reportbug
Description: Python modules for interacting with bug tracking systems
reportbug is a tool designed to make the reporting of bugs in Debian
diff -Nru reportbug-7.5.2/man/reportbug.1
reportbug-7.5.3~deb10u1/man/reportbug.1
--- reportbug-7.5.2/man/reportbug.1 2019-02-01 02:57:49.000000000 +0100
+++ reportbug-7.5.3~deb10u1/man/reportbug.1 2019-08-29 01:54:08.000000000
+0200
@@ -122,7 +122,7 @@
.TP
.B \-\-draftpath=DRAFTPATH
Save the draft (for example, when exiting and saving the report
-without reporting it) into \fIDRAFTPATH\fP directory.
+without reporting it) into \fIDRAFTPATH\fP directory(default /tmp).
.TP
.B \-e EDITOR, \-\-editor=EDITOR
Specify the editor to use, overriding any \fBEDITOR\fP or \fBVISUAL\fP
diff -Nru reportbug-7.5.2/reportbug/__init__.py
reportbug-7.5.3~deb10u1/reportbug/__init__.py
--- reportbug-7.5.2/reportbug/__init__.py 2019-02-01 02:57:49.000000000
+0100
+++ reportbug-7.5.3~deb10u1/reportbug/__init__.py 2019-08-29
17:24:16.000000000 +0200
@@ -25,7 +25,7 @@
__all__ = ['bugreport', 'utils', 'urlutils', 'checkbuildd', 'checkversions',
'debbugs', 'exceptions', 'submit', 'tempfile']
-VERSION_NUMBER = "7.5.2"
+VERSION_NUMBER = "7.5.3~deb10u1"
VERSION = "reportbug " + VERSION_NUMBER
COPYRIGHT = VERSION + '\nCopyright (C) 1999-2008 Chris Lawrence
<lawre...@debian.org>' + \
diff -Nru reportbug-7.5.2/reportbug/debbugs.py
reportbug-7.5.3~deb10u1/reportbug/debbugs.py
--- reportbug-7.5.2/reportbug/debbugs.py 2019-02-01 02:57:49.000000000
+0100
+++ reportbug-7.5.3~deb10u1/reportbug/debbugs.py 2019-08-29
17:25:01.000000000 +0200
@@ -261,8 +261,8 @@
'n': 'Exit without filing a report.'})
if cont == 'n':
sys.exit(1)
-
- section, priority = info[16], info[10]
+ else:
+ section, priority = info[16], info[10]
if tag == 'override':
headers.append('X-Debbugs-CC: debian-b...@lists.debian.org')
@@ -412,7 +412,7 @@
'britney': "testing migration script bugs",
'transition': "transition tracking",
'unblock': "unblock requests",
- #oldstable_pu: "%s proposed updates requests" %
oldstable,
+ oldstable_pu: "%s proposed updates requests" % oldstable,
stable_pu: "%s proposed updates requests" % stable,
'rm': "Stable/Testing removal requests",
'other': "None of the other options",
@@ -462,7 +462,10 @@
# FIXME: pu/rm should lookup the version elsewhere
version = info and info[0]
if online and tag.endswith('-pu'):
- version = list(checkversions.get_versions_available(package,
timeout, (tag[:-3],)).values())[0]
+ try:
+ version = list(checkversions.get_versions_available(package,
timeout, (tag[:-3],)).values())[0]
+ except IndexError:
+ pass
if version:
cont = ui.select_options(
"Latest version seems to be %s, is this the proper one ?" %
(version),
diff -Nru reportbug-7.5.2/reportbug/utils.py
reportbug-7.5.3~deb10u1/reportbug/utils.py
--- reportbug-7.5.2/reportbug/utils.py 2019-02-01 02:57:49.000000000 +0100
+++ reportbug-7.5.3~deb10u1/reportbug/utils.py 2019-08-29 01:54:08.000000000
+0200
@@ -93,13 +93,14 @@
'/usr/man', '/usr/doc', '/usr/bin']
# A map between codenames and suites
-CODENAME2SUITE = {'wheezy': 'oldoldstable',
- 'jessie': 'oldstable',
- 'stretch': 'stable',
- 'buster': 'testing',
- 'bullseye': 'next-testing',
- 'sid': 'unstable',
- 'experimental': 'experimental'}
+CODENAME2SUITE = {'wheezy': 'oldoldoldstable',
+ 'jessie': 'oldoldstable',
+ 'stretch': 'oldstable',
+ 'buster': 'stable',
+ 'bullseye': 'testing',
+ 'bookworm': 'next-testing',
+ 'sid': 'unstable',
+ 'experimental': 'experimental'}
SUITE2CODENAME = dict([(suite, codename) for codename, suite in
list(CODENAME2SUITE.items())])
@@ -570,7 +571,7 @@
return []
packinfo = get_dpkg_database()
- pkgname = r'(?:[\S]+(?:$|,\s+))'
+ pkgname = r'(?:[\S]+(?:\s+\(=[^()]+\))?(?:$|,\s+))'
groupfor = {}
searchpkgs = []
@@ -578,7 +579,7 @@
for (group, package) in packages:
groupfor[package] = group
escpkg = re.escape(package)
- searchpkgs.append(escpkg)
+ searchpkgs.append(escpkg + r'(?:\s+\(=[^()]+\))?')
searchbits = [
# Package regular expression
@@ -614,7 +615,7 @@
continue
if m.group('hdr') == 'Provides':
- provides = m.group('pkg')
+ provides = m.group('pkg').split()[0]
else:
provides = None
