[Python-apps-commits] r14328 - in packages/alot/trunk/debian (3 files)

[jljusten-guest at users.alioth.debian.org]

    Date: Tuesday, August 22, 2017 @ 07:56:05
  Author: jljusten-guest
Revision: 14328

debian: Update patches for 0.6 release

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>

Modified:
  packages/alot/trunk/debian/changelog
  packages/alot/trunk/debian/patches/0001-Description-Use-local-intersphinx-inventories.patch
  packages/alot/trunk/debian/patches/0002-debian-Use-file-magic-instead-of-python-magic-in-set.patch

Modified: packages/alot/trunk/debian/changelog
===================================================================
--- packages/alot/trunk/debian/changelog	2017-08-22 07:56:02 UTC (rev 14327)
+++ packages/alot/trunk/debian/changelog	2017-08-22 07:56:05 UTC (rev 14328)
@@ -4,6 +4,7 @@
   * Add PGP signature validation to watch file with pazz's signature
     with fingerprint B7838D65FEE80DED1DCA494D94340367D7D6C5AA.
   * Depend on python-gpg rather than pygpgme (Closes: #846314, #866027)
+  * Update debian patches for 0.6 release
 
  -- Jordan Justen <jordan.l.justen at intel.com>  Sun, 20 Aug 2017 15:40:54 -0700
 

Modified: packages/alot/trunk/debian/patches/0001-Description-Use-local-intersphinx-inventories.patch
===================================================================
--- packages/alot/trunk/debian/patches/0001-Description-Use-local-intersphinx-inventories.patch	2017-08-22 07:56:02 UTC (rev 14327)
+++ packages/alot/trunk/debian/patches/0001-Description-Use-local-intersphinx-inventories.patch	2017-08-22 07:56:05 UTC (rev 14328)
@@ -1,10 +1,10 @@
-From 69160e3e58693d2e5bf03160dfde24062bdf5493 Mon Sep 17 00:00:00 2001
+From 5c2825f5c0295268e1d3dc039e79635a7fb34f5e Mon Sep 17 00:00:00 2001
 From: Simon Chopin <chopin.simon at gmail.com>
 Date: Thu, 16 Feb 2017 16:30:46 -0800
-Subject: [PATCH 1/2] Description: Use local intersphinx inventories.  Fetching
- the inventories off the Internet made the build unreliable.  This patch turns
- off the intersphinx feature for notmuch and urwid since  they don't have a
- -doc sphinx package yet. This patch only makes sense in  the Debian context.
+Subject: [PATCH] Description: Use local intersphinx inventories.  Fetching the
+ inventories off the Internet made the build unreliable.  This patch turns off
+ the intersphinx feature for notmuch and urwid since  they don't have a -doc
+ sphinx package yet. This patch only makes sense in  the Debian context.
  Author: Simon Chopin <chopin.simon at gmail.com> Forwarded: not-needed --- This
  patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 
@@ -13,10 +13,10 @@
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/docs/source/conf.py b/docs/source/conf.py
-index 5ebab55..d928aba 100644
+index 6a822a7f..d8faf234 100644
 --- a/docs/source/conf.py
 +++ b/docs/source/conf.py
-@@ -260,7 +260,7 @@ man_pages = [
+@@ -261,7 +261,7 @@ man_pages = [
  
  # Example configuration for intersphinx: refer to the Python standard library.
  intersphinx_mapping = {
@@ -28,5 +28,5 @@
 +    #'http://urwid.readthedocs.org/en/latest/': None
  }
 -- 
-2.11.0
+2.14.0
 

Modified: packages/alot/trunk/debian/patches/0002-debian-Use-file-magic-instead-of-python-magic-in-set.patch
===================================================================
--- packages/alot/trunk/debian/patches/0002-debian-Use-file-magic-instead-of-python-magic-in-set.patch	2017-08-22 07:56:02 UTC (rev 14327)
+++ packages/alot/trunk/debian/patches/0002-debian-Use-file-magic-instead-of-python-magic-in-set.patch	2017-08-22 07:56:05 UTC (rev 14328)
@@ -1,8 +1,7 @@
-From d6b555e248acf3708e2b9215f9a03bb04e88c685 Mon Sep 17 00:00:00 2001
+From c8e3b0d9fce9b95b52f5f9c42ba35a3a1c631d18 Mon Sep 17 00:00:00 2001
 From: Jordan Justen <jordan.l.justen at intel.com>
 Date: Thu, 16 Feb 2017 17:35:32 -0800
-Subject: [PATCH 2/2] debian: Use file-magic instead of python-magic in
- setup.py
+Subject: [PATCH] debian: Use file-magic instead of python-magic in setup.py
 
 Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
 ---
@@ -10,18 +9,18 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index a3f6f90..1224d74 100755
+index f20c5cba..03a1969e 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -30,7 +30,7 @@ setup(name='alot',
+@@ -45,7 +45,7 @@ setup(
          'urwid>=1.1.0',
          'urwidtrees>=1.0',
          'twisted>=10.2.0',
 -        'python-magic',
 +        'file-magic',
          'configobj>=4.7.0',
-         'pygpgme>=0.2'],
-       tests_require=[
+         'gpg'
+     ],
 -- 
-2.11.0
+2.14.0