[Python-apps-commits] r11204 - in packages/alot/trunk/debian (5 files)
laarmen-guest at users.alioth.debian.org
laarmen-guest at users.alioth.debian.org
Fri Aug 22 11:00:00 UTC 2014
Date: Friday, August 22, 2014 @ 10:59:59
Author: laarmen-guest
Revision: 11204
* New upstream release
+ Drop the GPG encoding patch, merged upstream.
* d/copyright: update copyright years.
* d/control: Bump Standard-Version to 3.9.5, no changes 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-unicode-GPG-fix
Modified: packages/alot/trunk/debian/changelog
===================================================================
--- packages/alot/trunk/debian/changelog 2014-08-22 10:35:59 UTC (rev 11203)
+++ packages/alot/trunk/debian/changelog 2014-08-22 10:59:59 UTC (rev 11204)
@@ -1,3 +1,12 @@
+alot (0.3.6-1) unstable; urgency=medium
+
+ * New upstream release
+ + Drop the GPG encoding patch, merged upstream.
+ * d/copyright: update copyright years.
+ * d/control: Bump Standard-Version to 3.9.5, no changes required
+
+ -- Simon Chopin <chopin.simon at gmail.com> Fri, 22 Aug 2014 12:58:24 +0200
+
alot (0.3.5-2) unstable; urgency=low
* Drop outdated Lintian overrides for alot-doc
Modified: packages/alot/trunk/debian/control
===================================================================
--- packages/alot/trunk/debian/control 2014-08-22 10:35:59 UTC (rev 11203)
+++ packages/alot/trunk/debian/control 2014-08-22 10:59:59 UTC (rev 11204)
@@ -10,7 +10,7 @@
python-doc,
python-configobj
X-Python-Version: >= 2.7
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
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 2014-08-22 10:35:59 UTC (rev 11203)
+++ packages/alot/trunk/debian/copyright 2014-08-22 10:59:59 UTC (rev 11204)
@@ -4,7 +4,7 @@
Source: http://github.com/pazz/alot
Files: *
-Copyright: 2011-2013, Patrick Totzke <patricktotzke at gmail.com>
+Copyright: 2011-2014, 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-2013, Simon Chopin <chopin.simon at gmail.com>
+Copyright: 2012-2014, Simon Chopin <chopin.simon at gmail.com>
License: GPL-3+
License: GPL-3+
Deleted: packages/alot/trunk/debian/patches/0008-unicode-GPG-fix
===================================================================
--- packages/alot/trunk/debian/patches/0008-unicode-GPG-fix 2014-08-22 10:35:59 UTC (rev 11203)
+++ packages/alot/trunk/debian/patches/0008-unicode-GPG-fix 2014-08-22 10:59:59 UTC (rev 11204)
@@ -1,73 +0,0 @@
-From: Simon Chopin <chopin.simon at gmail.com>
-Date: Wed, 24 Jul 2013 15:13:20 +0200
-Subject: Use Unicode strings when dealing with GPG
- This delays the encoding of special chars, if any, to the actual display
- which is supposed to know into what it should be encoded.
-Forwarded: https://github.com/pazz/alot/pull/642
-diff --git a/alot/db/utils.py b/alot/db/utils.py
-index ba6d466..7fb2deb 100644
---- a/alot/db/utils.py
-+++ b/alot/db/utils.py
-@@ -51,9 +51,9 @@ def add_signature_headers(mail, sigs, error_msg):
- )
- mail.add_header(
- X_SIGNATURE_MESSAGE_HEADER,
-- 'Invalid: {0}'.format(error_msg)
-+ u'Invalid: {0}'.format(error_msg)
- if error_msg else
-- 'Valid: {0}'.format(sig_from),
-+ u'Valid: {0}'.format(sig_from),
- )
-
-
-@@ -104,19 +104,19 @@ def message_from_file(handle):
-
- malformed = False
- if len(m.get_payload()) != 2:
-- malformed = 'expected exactly two messages, got {0}'.format(
-+ malformed = u'expected exactly two messages, got {0}'.format(
- len(m.get_payload()))
-
- ct = m.get_payload(1).get_content_type()
- if ct != app_pgp_sig:
-- malformed = 'expected Content-Type: {0}, got: {1}'.format(
-+ malformed = u'expected Content-Type: {0}, got: {1}'.format(
- app_pgp_sig, ct)
-
- # TODO: RFC 3156 says the alg has to be lower case, but I've
- # seen a message with 'PGP-'. maybe we should be more
- # permissive here, or maybe not, this is crypto stuff...
- if not p.get('micalg', 'nothing').startswith('pgp-'):
-- malformed = 'expected micalg=pgp-..., got: {0}'.format(
-+ malformed = u'expected micalg=pgp-..., got: {0}'.format(
- p.get('micalg', 'nothing'))
-
- sigs = []
-@@ -144,13 +144,13 @@ def message_from_file(handle):
-
- ct = m.get_payload(0).get_content_type()
- if ct != app_pgp_enc:
-- malformed = 'expected Content-Type: {0}, got: {1}'.format(
-+ malformed = u'expected Content-Type: {0}, got: {1}'.format(
- app_pgp_enc, ct)
-
- want = 'application/octet-stream'
- ct = m.get_payload(1).get_content_type()
- if ct != want:
-- malformed = 'expected Content-Type: {0}, got: {1}'.format(want, ct)
-+ malformed = u'expected Content-Type: {0}, got: {1}'.format(want, ct)
-
- if not malformed:
- try:
-@@ -199,7 +199,7 @@ def message_from_file(handle):
- add_signature_headers(m, sigs, '')
-
- if malformed:
-- msg = 'Malformed OpenPGP message: {0}'.format(malformed)
-+ msg = u'Malformed OpenPGP message: {0}'.format(malformed)
- m.attach(email.message_from_string(msg))
-
- return m
---
-1.8.3.2
-
Modified: packages/alot/trunk/debian/patches/series
===================================================================
--- packages/alot/trunk/debian/patches/series 2014-08-22 10:35:59 UTC (rev 11203)
+++ packages/alot/trunk/debian/patches/series 2014-08-22 10:59:59 UTC (rev 11204)
@@ -1,2 +1 @@
0007-use-local-intersphinx-links
-0008-unicode-GPG-fix
More information about the Python-apps-commits
mailing list