[Pkg-privacy-commits] [monkeysign] 05/05: Merge tag '1.1' 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 08d15335cda515a1f5c1e0364bed33b3179a1bd4
Merge: 7c04cbc c0813bb
Author: Antoine Beaupré <anarcat at koumbit.org>
Date:   Fri Oct 11 19:26:06 2013 +0200

    Merge tag '1.1' into bpo
    
    monkeysign (1.1) unstable; urgency=low
    
      [Antoine Beaupré]
      * improved SMTP support:
        * SMTP username and passwords can be passed as commandline arguments
        * SMTP password is prompted if not specified
        * use STARTTLS if available
        * enable SMTP debugging only debugging is enabled
      * show the unencrypted email with --no-mail (Closes: #720049)
      * warn when gpg-agent is not running or failing (Closes: #723052)
      * set GPG_TTY if it is missing (Closes: #719908)
      * bail out on already signed keys (Closes: #720055)
      * mention monkeyscan in the package description so it can be found more
        easily
      * fix python-pkg-resources dependency
      * don't show backtrace on control-c
      * add missing files to .gitignore (Closes: #724007)
      * ship with a neat little slideshow to make presentations
    
      [Philip Jägenstedt]
      * fix some typos (Closes: #722964)
      * add --cert-level option (Closes: #722740)
    
     -- Antoine Beaupré <anarcat at debian.org>  Tue, 01 Oct 2013 00:22:30 +0200
    
    Conflicts:
    	debian/changelog

 .gitignore                                  |  5 +++
 TODO                                        | 38 ++++++++++++++++++++--
 debian/changelog                            | 31 ++++++++++++++++++
 debian/control                              |  8 ++++-
 debian/doc-base                             | 12 +++++++
 monkeysign/__init__.py                      |  2 +-
 monkeysign/cli.py                           | 12 +++++++
 monkeysign/{manpage.py => documentation.py} | 20 ++++++++++++
 monkeysign/gpg.py                           | 16 +++++++---
 monkeysign/gtkui.py                         |  1 -
 monkeysign/ui.py                            | 42 +++++++++++++++++++++----
 presentation.rst                            | 49 +++++++++++++++++++++++++++++
 scripts/monkeyscan                          |  2 ++
 setup.cfg                                   |  3 ++
 setup.py                                    | 12 +++++--
 tests/test_network.py                       |  4 +--
 tests/test_ui.py                            | 21 +++++--------
 17 files changed, 242 insertions(+), 36 deletions(-)

diff --cc debian/changelog
index cbdb1e0,cb77363..2eba6ad
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,28 +1,41 @@@
++monkeysign (1.1~bpo70+1) wheezy-backports; urgency=low
++
++  * Rebuild for wheezy-backports.
++
++ -- Antoine Beaupré <anarcat at debian.org>  Fri, 11 Oct 2013 19:25:42 +0200
++
+ monkeysign (1.1) unstable; urgency=low
+ 
+   [Antoine Beaupré]
+   * improved SMTP support:
+     * SMTP username and passwords can be passed as commandline arguments
+     * SMTP password is prompted if not specified
+     * use STARTTLS if available
+     * enable SMTP debugging only debugging is enabled
+   * show the unencrypted email with --no-mail (Closes: #720049)
+   * warn when gpg-agent is not running or failing (Closes: #723052)
+   * set GPG_TTY if it is missing (Closes: #719908)
+   * bail out on already signed keys (Closes: #720055)
+   * mention monkeyscan in the package description so it can be found more
+     easily
+   * fix python-pkg-resources dependency
+   * don't show backtrace on control-c
+   * add missing files to .gitignore (Closes: #724007)
+   * ship with a neat little slideshow to make presentations
+ 
+   [Philip Jägenstedt]
+   * fix some typos (Closes: #722964)
+   * add --cert-level option (Closes: #722740)
+ 
+  -- Antoine Beaupré <anarcat at debian.org>  Tue, 01 Oct 2013 00:22:30 +0200
+ 
 +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

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