[Python-apps-commits] r9913 - in packages/alot/trunk/debian (5 files)
laarmen-guest at users.alioth.debian.org
laarmen-guest at users.alioth.debian.org
Tue Jul 23 13:18:48 UTC 2013
Date: Tuesday, July 23, 2013 @ 13:18:46
Author: laarmen-guest
Revision: 9913
* New upstream release
+ Drop the backported GPGFix patch
* d/copyright: Bump the copyright years
* Bump Standard-Version to 3.9.4, no change required
Modified:
packages/alot/trunk/debian/changelog
packages/alot/trunk/debian/control
packages/alot/trunk/debian/copyright
packages/alot/trunk/debian/patches/series
Deleted:
packages/alot/trunk/debian/patches/0008-GPGProblem-fix
Modified: packages/alot/trunk/debian/changelog
===================================================================
--- packages/alot/trunk/debian/changelog 2013-07-23 11:31:01 UTC (rev 9912)
+++ packages/alot/trunk/debian/changelog 2013-07-23 13:18:46 UTC (rev 9913)
@@ -1,12 +1,16 @@
-alot (0.3.4-3) UNRELEASED; urgency=low
+alot (0.3.5-1) UNRELEASED; urgency=low
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
[ Simon Chopin ]
* Add w3m | links to Recommends to enable HTML rendering
+ * New upstream release
+ + Drop the backported GPGFix patch
+ * d/copyright: Bump the copyright years
+ * Bump Standard-Version to 3.9.4, no change required
- -- Simon Chopin <chopin.simon at gmail.com> Thu, 30 May 2013 00:17:41 +0200
+ -- Simon Chopin <chopin.simon at gmail.com> Tue, 23 Jul 2013 15:00:45 +0200
alot (0.3.4-2) unstable; urgency=low
Modified: packages/alot/trunk/debian/control
===================================================================
--- packages/alot/trunk/debian/control 2013-07-23 11:31:01 UTC (rev 9912)
+++ packages/alot/trunk/debian/control 2013-07-23 13:18:46 UTC (rev 9913)
@@ -10,7 +10,7 @@
python-doc,
python-configobj
X-Python-Version: >= 2.7
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://github.com/pazz/alot/
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/alot/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/alot/trunk/
Modified: packages/alot/trunk/debian/copyright
===================================================================
--- packages/alot/trunk/debian/copyright 2013-07-23 11:31:01 UTC (rev 9912)
+++ packages/alot/trunk/debian/copyright 2013-07-23 13:18:46 UTC (rev 9913)
@@ -4,7 +4,7 @@
Source: http://github.com/pazz/alot
Files: *
-Copyright: 2011-2012, Patrick Totzke <patricktotzke at gmail.com>
+Copyright: 2011-2013, Patrick Totzke <patricktotzke at gmail.com>
License: GPL-3+
Files: extra/colour_picker.py
@@ -12,7 +12,7 @@
License: LGPL-2.1+
Files: debian/*
-Copyright: 2012, Simon Chopin <chopin.simon at gmail.com>
+Copyright: 2012-2013, Simon Chopin <chopin.simon at gmail.com>
License: GPL-3+
License: GPL-3+
Deleted: packages/alot/trunk/debian/patches/0008-GPGProblem-fix
===================================================================
--- packages/alot/trunk/debian/patches/0008-GPGProblem-fix 2013-07-23 11:31:01 UTC (rev 9912)
+++ packages/alot/trunk/debian/patches/0008-GPGProblem-fix 2013-07-23 13:18:46 UTC (rev 9913)
@@ -1,56 +0,0 @@
-From: Patrick Totzke <patricktotzke at gmail.com>
-Date: Sat, 6 Apr 2013 13:25:51 +0100
-Description: fix incorrect instanciations of GPGProblem
- with missing 'code' parameter.
- cf issue #590
-Applied-Upstream: commit:a1fc6b97b9d3975a3d0239f5e66ea2b78c53a43d
-
---- a/alot/db/envelope.py
-+++ b/alot/db/envelope.py
-@@ -18,7 +18,7 @@ import alot.helper as helper
- import alot.crypto as crypto
- import gpgme
- from alot.settings import settings
--from alot.errors import GPGProblem
-+from alot.errors import GPGProblem, GPGCode
-
- from attachment import Attachment
- from utils import encode_header
-@@ -192,8 +192,9 @@ class Envelope(object):
- signatures, signature_str = crypto.detached_signature_for(
- plaintext, self.sign_key)
- if len(signatures) != 1:
-- raise GPGProblem(("Could not sign message "
-- "(GPGME did not return a signature)"))
-+ raise GPGProblem("Could not sign message (GPGME "
-+ "did not return a signature)",
-+ code=GPGCode.KEY_CANNOT_SIGN)
- except gpgme.GpgmeError as e:
- if e.code == gpgme.ERR_BAD_PASSPHRASE:
- # If GPG_AGENT_INFO is unset or empty, the user just does
-@@ -201,11 +202,12 @@ class Envelope(object):
- if os.environ.get('GPG_AGENT_INFO', '').strip() == '':
- msg = "Got invalid passphrase and GPG_AGENT_INFO\
- not set. Please set up gpg-agent."
-- raise GPGProblem(msg)
-+ raise GPGProblem(msg, code=GPGCode.BAD_PASSPHRASE)
- else:
-- raise GPGProblem(("Bad passphrase. Is "
-- "gpg-agent running?"))
-- raise GPGProblem(str(e))
-+ raise GPGProblem("Bad passphrase. Is gpg-agent "
-+ "running?",
-+ code=GPGCode.BAD_PASSPHRASE)
-+ raise GPGProblem(str(e), code=GPGCode.KEY_CANNOT_SIGN)
-
- micalg = crypto.RFC3156_micalg_from_algo(signatures[0].hash_algo)
- unencrypted_msg = MIMEMultipart('signed', micalg=micalg,
-@@ -235,7 +237,7 @@ class Envelope(object):
- encrypted_str = crypto.encrypt(plaintext,
- self.encrypt_keys.values())
- except gpgme.GpgmeError as e:
-- raise GPGProblem(str(e))
-+ raise GPGProblem(str(e), code=GPGCode.KEY_CANNOT_ENCRYPT)
-
- outer_msg = MIMEMultipart('encrypted',
- protocol='application/pgp-encrypted')
Modified: packages/alot/trunk/debian/patches/series
===================================================================
--- packages/alot/trunk/debian/patches/series 2013-07-23 11:31:01 UTC (rev 9912)
+++ packages/alot/trunk/debian/patches/series 2013-07-23 13:18:46 UTC (rev 9913)
@@ -1,2 +1 @@
0007-use-local-intersphinx-links
-0008-GPGProblem-fix
More information about the Python-apps-commits
mailing list