[pyresample] 04/10: 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 pyresample.

commit 90b7166b95cfbc53dfaedb717b5ca77a875f8896
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Jul 2 11:15:20 2016 +0000

    Refresh all patches
---
 debian/changelog                                   |  1 +
 debian/patches/0002-fix-doc-build.patch            | 14 +++++++-------
 debian/patches/0003-fix-proj4-initialization.patch | 16 ++++++++--------
 debian/patches/0003-skip-nearest-resize-test.patch | 20 ++++++++++----------
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 781452a..6d4fbd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ pyresample (1.2.4-1) UNRELEASED; urgency=medium
 
   [ Antonio Valentino ]
   * New upstream release
+  * Refresh all patches
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 28 Mar 2016 17:05:20 +0200
 
diff --git a/debian/patches/0002-fix-doc-build.patch b/debian/patches/0002-fix-doc-build.patch
index 329b5f9..14c8e57 100644
--- a/debian/patches/0002-fix-doc-build.patch
+++ b/debian/patches/0002-fix-doc-build.patch
@@ -6,10 +6,10 @@ Subject: fix doc build
  docs/source/API.rst | 15 +++++++--------
  1 file changed, 7 insertions(+), 8 deletions(-)
 
-diff --git a/docs/source/API.rst b/docs/source/API.rst
-index c9dc533..90e7561 100644
---- a/docs/source/API.rst
-+++ b/docs/source/API.rst
+Index: pyresample/docs/source/API.rst
+===================================================================
+--- pyresample.orig/docs/source/API.rst
++++ pyresample/docs/source/API.rst
 @@ -3,32 +3,32 @@ pyresample API
  
  pyresample.geometry
@@ -50,9 +50,9 @@ index c9dc533..90e7561 100644
  	:members:
  
  pyresample.plot
-@@ -36,4 +36,3 @@ pyresample.plot
- .. automodule:: plot
- 	:members:
+@@ -41,4 +41,3 @@ pyresample.ewa
+ .. automodule:: ewa
+     :members:
  
 -	
 \ No newline at end of file
diff --git a/debian/patches/0003-fix-proj4-initialization.patch b/debian/patches/0003-fix-proj4-initialization.patch
index 362ab1b..da16f9f 100644
--- a/debian/patches/0003-fix-proj4-initialization.patch
+++ b/debian/patches/0003-fix-proj4-initialization.patch
@@ -7,10 +7,10 @@ Subject: fix proj4 initialization
  pyresample/test/test_geometry.py     | 8 ++++----
  2 files changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/pyresample/test/test_files/areas.cfg b/pyresample/test/test_files/areas.cfg
-index 3c6ef3c..5346cb4 100644
---- a/pyresample/test/test_files/areas.cfg
-+++ b/pyresample/test/test_files/areas.cfg
+Index: pyresample/pyresample/test/test_files/areas.cfg
+===================================================================
+--- pyresample.orig/pyresample/test/test_files/areas.cfg
++++ pyresample/pyresample/test/test_files/areas.cfg
 @@ -19,7 +19,7 @@ REGION: ease_nh {
  REGION: pc_world {
    NAME:    Plate Carree world map
@@ -20,10 +20,10 @@ index 3c6ef3c..5346cb4 100644
    XSIZE: 640
    YSIZE: 480
    AREA_EXTENT:  (-20037508.342789244, -10018754.171394622, 20037508.342789244, 10018754.171394622)
-diff --git a/pyresample/test/test_geometry.py b/pyresample/test/test_geometry.py
-index bba33ee..f2d8897 100644
---- a/pyresample/test/test_geometry.py
-+++ b/pyresample/test/test_geometry.py
+Index: pyresample/pyresample/test/test_geometry.py
+===================================================================
+--- pyresample.orig/pyresample/test/test_geometry.py
++++ pyresample/pyresample/test/test_geometry.py
 @@ -414,7 +414,7 @@ class Test(unittest.TestCase):
          swath_def = geometry.SwathDefinition(lons, lats)
          filter_area = geometry.AreaDefinition('test', 'test', 'test',
diff --git a/debian/patches/0003-skip-nearest-resize-test.patch b/debian/patches/0003-skip-nearest-resize-test.patch
index a6c191a..9a8b457 100644
--- a/debian/patches/0003-skip-nearest-resize-test.patch
+++ b/debian/patches/0003-skip-nearest-resize-test.patch
@@ -7,10 +7,10 @@ Subject: skip python3 offending tests
  pyresample/test/test_kd_tree.py | 6 ++++++
  2 files changed, 8 insertions(+)
 
-diff --git a/pyresample/test/test_image.py b/pyresample/test/test_image.py
-index 8342583..4959291 100644
---- a/pyresample/test/test_image.py
-+++ b/pyresample/test/test_image.py
+Index: pyresample/pyresample/test/test_image.py
+===================================================================
+--- pyresample.orig/pyresample/test/test_image.py
++++ pyresample/pyresample/test/test_image.py
 @@ -1,4 +1,5 @@
  import os
 +import sys
@@ -25,10 +25,10 @@ index 8342583..4959291 100644
      def test_nearest_resize(self):
          data = numpy.fromfunction(lambda y, x: y * x * 10 ** -6, (3712, 3712))
          msg_con = image.ImageContainerNearest(
-diff --git a/pyresample/test/test_kd_tree.py b/pyresample/test/test_kd_tree.py
-index 59c240c..fe6c255 100644
---- a/pyresample/test/test_kd_tree.py
-+++ b/pyresample/test/test_kd_tree.py
+Index: pyresample/pyresample/test/test_kd_tree.py
+===================================================================
+--- pyresample.orig/pyresample/test/test_kd_tree.py
++++ pyresample/pyresample/test/test_kd_tree.py
 @@ -257,6 +257,8 @@ class Test(unittest.TestCase):
          self.assertEqual(cross_sum, expected,
                           msg='Grid remapping nearest failed')
@@ -38,7 +38,7 @@ index 59c240c..fe6c255 100644
      def test_nearest_mp(self):
          data = numpy.fromfunction(lambda y, x: y * x, (50, 10))
          lons = numpy.fromfunction(lambda y, x: 3 + x, (50, 10))
-@@ -430,6 +432,8 @@ class Test(unittest.TestCase):
+@@ -436,6 +438,8 @@ class Test(unittest.TestCase):
          self.assertAlmostEqual(cross_sum_counts, expected_counts,
                                 msg='Swath multi channel resampling gauss failed on counts')
  
@@ -47,7 +47,7 @@ index 59c240c..fe6c255 100644
      def test_gauss_multi_mp(self):
          data = numpy.fromfunction(lambda y, x: (y + x) * 10 ** -6, (5000, 100))
          lons = numpy.fromfunction(
-@@ -460,6 +464,8 @@ class Test(unittest.TestCase):
+@@ -466,6 +470,8 @@ class Test(unittest.TestCase):
          self.assertAlmostEqual(cross_sum, expected,
                                 msg='Swath multi channel resampling gauss failed')
  

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