[Reportbug-commits] [reportbug] 01/01: Merge branch 'experimental' into master

Sandro Tosi morph at moszumanska.debian.org
Tue Oct 28 12:12:17 UTC 2014


This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository reportbug.

commit 372dca4610b074711e5c89be9adf87d1a1257171
Merge: 5d99572 73d5622
Author: Sandro Tosi <sandro.tosi at hp.com>
Date:   Tue Oct 28 12:10:49 2014 +0000

    Merge branch 'experimental' into master
    
    Conflicts:
    	debian/changelog
    	reportbug/ui/gtk2_ui.py

 bin/reportbug           |  2 ++
 debian/changelog        | 32 ++++++++++++++++++++++++++++++++
 debian/control          |  2 +-
 man/reportbug.1         | 10 +++++++++-
 reportbug/debbugs.py    |  2 --
 reportbug/submit.py     |  5 +++--
 reportbug/ui/gtk2_ui.py |  5 +++++
 reportbug/utils.py      |  3 ++-
 8 files changed, 54 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index ec6f7a9,6260aa1..f05f76e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,94 -1,44 +1,126 @@@
 -reportbug (6.99.0) UNRELEASED; urgency=low
 +reportbug (6.5.2) UNRELEASED; urgency=medium
  
 +  * bin/reportbug, man/reportbug.1 share/reportbug.el
 +    - rename GNUS to Gnus; thanks to Tollef Fog Heen for the report and to Tomas
 +      Pospisek for the patch; Closes: #683325
    * reportbug/debbugs.py
 -    - fix a typo; thanks to Niels Thykier for the report; Closes: #683277
 +    - fix vesion/version typo; thanks to Niels Thykier for the report and to
 +      Tomas Pospisek for the patch; Closes: #683277
 +    - use a future-proof URL for the rc_policy.txt document; thanks to Paul Wise
 +      for the report and patch; Closes: #673270
+     - remove 'ROSRM' options from ftp.d.o removal requests; thanks to Scott
+       Kitterman for the report and to Adam D. Barratt and Philipp Kern for
+       ack'ing it (on IRC); Closes: #682105
 -  * bin/reportbug, man/reportbug.1, share/reportbug.el
 -    - the correct name is Gnus, not GNUS; thanks to Tollef Fog Heen for the
 -      report; Closes: #683325
+   * man/reportbug.1
+     - mention that deb-src lines has to be available in sources.list to populate
+       apt cache with source packages too, needed for --src/--source option to
+       work; thanks to Ian Bruce for the report; Closes: #684227
+     - clarify that when using an external MUA, the attachment feature will not
+       be able to send those files to the MUA, so they are actually discarded;
+       thanks to Stefano Rivera for the report; Closes: #679907
+   * reportbug/submit.py
+     - properly handle ~/~user in --output cli option, expanding it to the user's
+       homedir; thanks to Fritz Wuehler for the report; Closes: #680465
+     - don't show the last menu (about how to provide additional info) if
+       quitting or saving to file; thanks to Adrian Bunk for the report;
+       Closes: #668838
+   * reportbug/ui/gtk2_ui.py
+     - hide 'Apply' button on the last screen of GTK+ UI; thanks to Samuel Hym
+       for the report; Closes: #675735
+     - remove indication that 'e' would edit the bug report in the last menu,
+       it's text UI specific; thanks to David Smith for the report;
+       Closes: #686168
+   * bin/reportbug
+     - suggests to contact debian-users@ in case of difficulties in identifying
+       the package to associate the bug to; thanks to Jonathan Nieder for the
+       report and patch; Closes: #661563
+   * reportbug/utils.py
+     - identify also config files with spaces in the filename; thanks to Vincent
+       Lefevre for the report; Closes: #669022
+   * debian/control
+     - update Suggests on emacs packages; thanks to Adrian Bunk for the report;
+       Closes: #686165
  
 - -- Sandro Tosi <morph at debian.org>  Sat, 01 Sep 2012 22:51:33 +0200
 + -- Sandro Tosi <morph at debian.org>  Fri, 12 Sep 2014 00:59:10 +0100
 +
 +reportbug (6.5.1) unstable; urgency=medium
 +
 +  * debian/rules
 +    - convert to dh sequencer
 +  * Switch to dh_python2
 +  * Bump compat to 9
 +  * man/reportbug.1
 +    - mark it explicitly that -N/--bugnumber must receive the bug number as an
 +      argument to the command; thanks to Ron Murray for the report;
 +      Closes: #741369
 +  * reportbug/{debbugs.py, utils.py}
 +    - check for valid (as per Policy) package name while handling WNPP; thanks
 +      to Paul Wise for the report; Closes: #748719
 +  * reportbug/ui/gtk2_ui.py
 +    - set monospace font when entering the bug body; thanks to Bob Bib for the
 +      report; Closes: #700032
 +  * Acknowledge NMU (thanks for that!); Closes: #757190
 +  * reportbug/ui/gtk2_ui.py
 +    - uninstall GTK+ readline hook, this prevent a crash in reportbug; thanks to
 +      Eric Valette for the report and to Simon McVittie for the GTK+-side
 +      analysis and patch; Closes: #758619
 +
 + -- Sandro Tosi <morph at debian.org>  Fri, 05 Sep 2014 22:34:23 +0100
 +
 +reportbug (6.5.0+nmu1) unstable; urgency=high
 +
 +  * Non-maintainer upload.
 +  * CVE-2014-0479: Arbitrary code execution in compare_versions.
 +    A man-in-the-middle attacker could put shell metacharacters in the
 +    version number, causing execution of code of their choice.
 +    Thanks to Jakub Wilk <jwilk at debian.org>
 +
 + -- Salvatore Bonaccorso <carnil at debian.org>  Sun, 03 Aug 2014 16:03:15 +0200
 +
 +reportbug (6.5.0) unstable; urgency=low
 +
 +  [ Sandro Tosi ]
 +  * bin/reportbug
 +    - changed to "No" the default to local MTA question in configuration mode;
 +      thanks to Hartmut Bruening for the report; Closes: #732789
 +  * reportbug/debbugs.py
 +    - improve the ITP template to ask for more information; thanks to Lucas
 +      Nussbaum for the report and patch; Closes: #719067
 +  * bin/reportbug, reportbug/utils.py, doc/README.developers
 +    - implement support for attachments in bugscripts; thanks to Joachim
 +      Breitner for the report and to Michael Stapelberg for the patch;
 +      Closes: #526110
 +  * reportbug/utils.py
 +    - improve the template provided to less-expert reporters to be clear the
 +      questions should be answered by the reporter themselves; thanks to Tony
 +      Houghton for the report; Closes: #690782
 +    - match 'Description-en' too when getting package description
 +  * reportbug/checkversions.py
 +    - if NEW has several versions of the given package, choose the bigger;
 +      thanks to Thorsten Glaser for the report; Closes: #704040
 +  * debian/control
 +    - use canonical URL for Alioth service
 +    - bump Standards-Version to 3.9.5 (no changes needed)
 +  * debian/copyright
 +    - extend copyright years
 +
 +  [ Julien Cristau ]
 +  * Update codename/suite mapping for wheezy release
 +  * test: don't assert that unstable version is strictly greater than stable
 +  * checkversions: let rmadison do the architecture/suite filtering
 +  * debbugs: retire the opu tag for release.debian.org; Closes: #707631
 +
 + -- Sandro Tosi <morph at debian.org>  Sun, 26 Jan 2014 20:40:56 +0100
 +
 +reportbug (6.4.4) unstable; urgency=low
 +
 +  * reportbug/ui/gtk2_ui.py
 +    - proper update GTK+ UI from threads, using gobject.idle_add(), possibily
 +      fixing the crashes seen with GTK+ reportbug UI; thanks to all the
 +      reporters and to Bruno Filipe Oliveira Ramos for the patch;
 +      Closes: #620225
 +
 + -- Sandro Tosi <morph at debian.org>  Tue, 12 Mar 2013 23:45:13 +0100
  
  reportbug (6.4.3) unstable; urgency=low
  
diff --cc reportbug/ui/gtk2_ui.py
index 4942a76,784c092..5b04840
--- a/reportbug/ui/gtk2_ui.py
+++ b/reportbug/ui/gtk2_ui.py
@@@ -1217,7 -1215,9 +1217,9 @@@ class SelectOptionsPage (Page)
              self.default.grab_focus ()
  
      def execute (self, prompt, menuopts, options):
+         # remove text UI indication
+         prompt = prompt.replace(' (e to edit)', '')
 -        self.label.set_text (prompt)
 +        gobject.idle_add (self.label.set_text, prompt)
  
          buttons = []
          for menuopt in menuopts:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reportbug/reportbug.git



More information about the Reportbug-commits mailing list