[python-mpop] 05/06: Refresh all patches

[Antonio Valentino]

This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository python-mpop.

commit 8a343064be2afc8dfe324fa62c3b8b07562870b2
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Mar 12 08:29:39 2017 +0000

    Refresh all patches
---
 debian/changelog                                     |  4 ++++
 ...age.patch => 0004-Include-test-sub-package.patch} |  0
 ...tempararily-disable-TestProjector.test_init.patch | 20 --------------------
 ...0005-Disable-TestEmptyImage.test_pil_image.patch} |  2 ++
 debian/patches/series                                |  5 ++---
 5 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a5a4dfe..35b0a63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ python-mpop (1.4.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * Update copyright file
+  * debian/patches
+    - refresh all patches
+    - drop 0004-tempararily-disable-TestProjector.test_init.patch,
+      no longer necessary
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 12 Mar 2017 08:20:35 +0000
 
diff --git a/debian/patches/0005-Include-test-sub-package.patch b/debian/patches/0004-Include-test-sub-package.patch
similarity index 100%
rename from debian/patches/0005-Include-test-sub-package.patch
rename to debian/patches/0004-Include-test-sub-package.patch
diff --git a/debian/patches/0004-tempararily-disable-TestProjector.test_init.patch b/debian/patches/0004-tempararily-disable-TestProjector.test_init.patch
deleted file mode 100644
index 398bb96..0000000
--- a/debian/patches/0004-tempararily-disable-TestProjector.test_init.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sat, 27 Feb 2016 18:44:06 +0100
-Subject: tempararily disable TestProjector.test_init
-
----
- mpop/tests/test_projector.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mpop/tests/test_projector.py b/mpop/tests/test_projector.py
-index bd27611..9f11e55 100644
---- a/mpop/tests/test_projector.py
-+++ b/mpop/tests/test_projector.py
-@@ -50,6 +50,7 @@ class TestProjector(unittest.TestCase):
-     """
- 
-     proj = None
-+    @unittest.skip('temporarily disabled')
-     @patch.object(utils, 'generate_quick_linesample_arrays')
-     @patch.object(mpop.projector.kd_tree, 'get_neighbour_info')
-     @patch.object(mpop.projector, '_get_area_hash')
diff --git a/debian/patches/0006-Disable-TestEmptyImage.test_pil_image.patch b/debian/patches/0005-Disable-TestEmptyImage.test_pil_image.patch
similarity index 86%
rename from debian/patches/0006-Disable-TestEmptyImage.test_pil_image.patch
rename to debian/patches/0005-Disable-TestEmptyImage.test_pil_image.patch
index ee82729..079f74b 100644
--- a/debian/patches/0006-Disable-TestEmptyImage.test_pil_image.patch
+++ b/debian/patches/0005-Disable-TestEmptyImage.test_pil_image.patch
@@ -7,6 +7,8 @@ Incompatibility with Pillow 3.4.2
  mpop/tests/test_image.py | 1 +
  1 file changed, 1 insertion(+)
 
+diff --git a/mpop/tests/test_image.py b/mpop/tests/test_image.py
+index a129b4b..037708f 100644
 --- a/mpop/tests/test_image.py
 +++ b/mpop/tests/test_image.py
 @@ -170,6 +170,7 @@ class TestEmptyImage(unittest.TestCase):
diff --git a/debian/patches/series b/debian/patches/series
index f9582b1..5148ea4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0001-fix-config-path.patch
 0002-fix-intersphinx-inventory-path.patch
 0003-fix-missing-trollsift.patch
-0004-tempararily-disable-TestProjector.test_init.patch
-0005-Include-test-sub-package.patch
-0006-Disable-TestEmptyImage.test_pil_image.patch
+0004-Include-test-sub-package.patch
+0005-Disable-TestEmptyImage.test_pil_image.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-mpop.git