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

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

    Date: Monday, April 24, 2017 @ 04:47:19
  Author: jljusten-guest
Revision: 13961

debian: Add new patch for python-magic=>file-magic rename

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

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

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-04-24 04:47:10 UTC (rev 13960)
+++ packages/alot/trunk/debian/patches/0001-Description-Use-local-intersphinx-inventories.patch	2017-04-24 04:47:19 UTC (rev 13961)
@@ -1,10 +1,10 @@
 From 69160e3e58693d2e5bf03160dfde24062bdf5493 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] 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 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.
  Author: Simon Chopin <chopin.simon at gmail.com> Forwarded: not-needed --- This
  patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 

Added: 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	                        (rev 0)
+++ packages/alot/trunk/debian/patches/0002-debian-Use-file-magic-instead-of-python-magic-in-set.patch	2017-04-24 04:47:19 UTC (rev 13961)
@@ -0,0 +1,27 @@
+From d6b555e248acf3708e2b9215f9a03bb04e88c685 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
+
+Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index a3f6f90..1224d74 100755
+--- a/setup.py
++++ b/setup.py
+@@ -30,7 +30,7 @@ setup(name='alot',
+         'urwid>=1.1.0',
+         'urwidtrees>=1.0',
+         'twisted>=10.2.0',
+-        'python-magic',
++        'file-magic',
+         'configobj>=4.7.0',
+         'pygpgme>=0.2'],
+       tests_require=[
+-- 
+2.11.0
+

Modified: packages/alot/trunk/debian/patches/series
===================================================================
--- packages/alot/trunk/debian/patches/series	2017-04-24 04:47:10 UTC (rev 13960)
+++ packages/alot/trunk/debian/patches/series	2017-04-24 04:47:19 UTC (rev 13961)
@@ -1 +1,2 @@
 0001-Description-Use-local-intersphinx-inventories.patch
+0002-debian-Use-file-magic-instead-of-python-magic-in-set.patch