[Pkg-privacy-commits] [monkeysign] 04/05: Merge tag '1.0' into bpo

[Ximin Luo]

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

infinity0 pushed a commit to branch bpo
in repository monkeysign.

commit 7c04cbc72bf3223bddc4ddca5598d537a9d645b9
Merge: 4c3a365 de845a2
Author: Antoine Beaupré <anarcat at koumbit.org>
Date:   Sat Aug 31 11:11:30 2013 -0400

    Merge tag '1.0' into bpo
    
    monkeysign (1.0) unstable; urgency=low
    
      * stop copying secrets to the temporary keyring
      * make sure we use the right signing key when specified
      * signatures on multiple UIDs now get properly sent separately (Closes: #719241)
      * this includes "deluid" support on the gpg library
      * significantly refactor email creation
      * improve unit tests on commandline scripts, invalid (revoked) keys and
        timeout handling
      * provide manpages (Closes: #716674)
      * avoid showing binary garbage on export when debugging
      * properly fail if password confirmation fails
      * user interfaces now translatable
      * accept space-separated key fingerprints
      * fix single UID key signing
      * proper formatting of UIDs with comments (removed) and spaces (wrapped)
        for emails
    
     -- Antoine Beaupré <anarcat at debian.org>  Wed, 14 Aug 2013 20:51:44 -0400
    
    Conflicts:
    	TODO
    	debian/changelog

 TODO                      |   9 +-
 debian/changelog          |  28 ++++
 debian/control            |  18 ++-
 monkeysign/__init__.py    |   2 +-
 monkeysign/cli.py         |  33 ++--
 monkeysign/gpg.py         | 112 +++++++++++---
 monkeysign/gtkui.py       |  41 ++---
 monkeysign/manpage.py     | 147 ++++++++++++++++++
 monkeysign/msgfmt.py      | 220 ++++++++++++++++++++++++++
 monkeysign/translation.py |  91 +++++++++++
 monkeysign/ui.py          | 283 +++++++++++++++++++++-------------
 po/Makefile               |   6 +
 po/messages.pot           | 382 ++++++++++++++++++++++++++++++++++++++++++++++
 scripts/monkeyscan        |  10 +-
 setup.cfg                 |   4 +
 setup.py                  |   7 +-
 tests/96F47C6A-revoke.asc |  10 ++
 tests/96F47C6A-secret.asc |  35 +++--
 tests/96F47C6A.asc        |  21 ++-
 tests/test_gpg.py         |  69 +++++++--
 tests/test_network.py     |  14 +-
 tests/test_ui.py          | 191 +++++++++++++++++------
 22 files changed, 1472 insertions(+), 261 deletions(-)

diff --cc debian/changelog
index d00b00b,87e0ce9..cbdb1e0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,37 @@@
++monkeysign (1.0~bpo60+1) wheezy-backports; urgency=low
++
++  * Rebuild for wheezy-backports.
++  * No change required.
++
++ -- Antoine Beaupré <anarcat at debian.org>  Sat, 31 Aug 2013 11:06:55 -0400
++
+ monkeysign (1.0) unstable; urgency=low
+ 
+   * stop copying secrets to the temporary keyring
+   * make sure we use the right signing key when specified
+   * signatures on multiple UIDs now get properly sent separately
+     (Closes: #719241)
+   * this includes "deluid" support on the gpg library
+   * significantly refactor email creation
+   * improve unit tests on commandline scripts, invalid (revoked) keys and
+     timeout handling
+   * provide manpages (Closes: #716674)
+   * avoid showing binary garbage on export when debugging
+   * properly fail if password confirmation fails
+   * user interfaces now translatable
+   * accept space-separated key fingerprints
+   * fix single UID key signing
+   * proper formatting of UIDs with comments (removed) and spaces (wrapped)
+     for emails
+ 
+  -- Antoine Beaupré <anarcat at debian.org>  Wed, 14 Aug 2013 20:51:44 -0400
+ 
 +monkeysign (0.9~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports, no change.
 +
 + -- Antoine Beaupré <anarcat at debian.org>  Wed, 14 Aug 2013 19:13:51 -0400
 +
  monkeysign (0.9) unstable; urgency=low
  
    * refactor unit tests again to optimise UI tests and test mail generation

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/monkeysign.git