[Pkg-privacy-commits] [monkeysign] 02/05: Merge tag '0.9' 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 8ed44adbd71fec4478e6ac75f3218680e1a21afe
Merge: 1116ed2 b9fa638
Author: Antoine Beaupré <anarcat at koumbit.org>
Date:   Wed Aug 14 19:14:52 2013 -0400

    Merge tag '0.9' into bpo
    
    monkeysign (0.9) unstable; urgency=low
    
      * refactor unit tests again to optimise UI tests and test mail generation
      * fix error handling in encryption/decryption (Closes: #717622)
      * rename msign-cli to monkeysign and msign to monkeyscan (Closes: #717623)
      * handle interruptions cleanly when choosing user IDs (see: #716675)
    
     -- Antoine Beaupré <anarcat at debian.org>  Tue, 23 Jul 2013 10:56:50 -0400
    
    Conflicts:
    	debian/changelog

 TODO                         | 12 ++++++---
 debian/changelog             | 25 +++++++++++++++++
 debian/menu                  |  2 +-
 monkeysign/__init__.py       |  2 +-
 monkeysign/cli.py            | 37 +++++++++++++++----------
 monkeysign/gpg.py            | 21 ++++++++-------
 monkeysign/gtkui.py          |  4 +--
 monkeysign/ui.py             | 44 ++++++++++++++++++++++--------
 msign-cli                    |  1 -
 msign => scripts/monkeyscan  | 12 ++++++---
 scripts/monkeysign           |  1 +
 setup.py                     |  2 +-
 tests/test_gpg.py            |  4 +--
 test.py => tests/test_lib.py | 41 +++++++++++++++++++++++-----
 tests/test_network.py        | 11 ++++++--
 tests/test_ui.py             | 64 +++++++++++++++++++++++++++++++++++++++-----
 16 files changed, 218 insertions(+), 65 deletions(-)

diff --cc debian/changelog
index 4e41369,10bdd21..d00b00b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,22 +1,35 @@@
++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
+   * fix error handling in encryption/decryption (Closes: #717622)
+   * rename msign-cli to monkeysign and msign to monkeyscan (Closes: #717623)
+   * handle interruptions cleanly when choosing user IDs (see: #716675)
+ 
+  -- Antoine Beaupré <anarcat at debian.org>  Tue, 23 Jul 2013 10:56:50 -0400
+ 
+ monkeysign (0.8) unstable; urgency=low
+ 
+   * refactor unit test suite to allow testing the commandline tool
+     interactively
+   * don't fail on empty input when choosing uid (Closes: #716675)
+   * we also explain how to refuse signing a key better
+   * optimise network tests so they timeout (so fail) faster
+ 
+  -- Antoine Beaupré <anarcat at debian.org>  Wed, 17 Jul 2013 22:52:02 -0400
+ 
 +monkeysign (0.7.1~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +  * No change required.
 +
 + -- Antoine Beaupré <anarcat at debian.org>  Thu, 18 Jul 2013 11:18:38 -0400
 +
  monkeysign (0.7.1) unstable; urgency=low
  
    * fix binary package dependency on python

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