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 416445dab10984baaf8fad685298efe182823816 Author: Antonio Valentino <[email protected]> Date: Sat Jul 9 10:26:53 2016 +0000 Use the cmath header instead of math.h --- debian/changelog | 9 +++++++++ debian/patches/0002-fix-doc-build.patch | 8 ++++---- debian/patches/0003-fix-proj4-initialization.patch | 16 ++++++++-------- debian/patches/0003-skip-nearest-resize-test.patch | 16 ++++++++-------- debian/patches/0004-Use-cmath.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 50 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index a83e2f4..99cb11a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +pyresample (1.2.4-2) UNRELEASED; urgency=medium + + * debian/parches + - New 0004-Use-cmath.patch to use the cmath header instead of math.h + (Closes: #830447) + * Refresh all patches + + -- Antonio Valentino <[email protected]> Sat, 09 Jul 2016 10:22:56 +0000 + pyresample (1.2.4-1) unstable; urgency=medium * Team upload. diff --git a/debian/patches/0002-fix-doc-build.patch b/debian/patches/0002-fix-doc-build.patch index 14c8e57..b56017c 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(-) -Index: pyresample/docs/source/API.rst -=================================================================== ---- pyresample.orig/docs/source/API.rst -+++ pyresample/docs/source/API.rst +diff --git a/docs/source/API.rst b/docs/source/API.rst +index 234b086..8c0b96a 100644 +--- a/docs/source/API.rst ++++ b/docs/source/API.rst @@ -3,32 +3,32 @@ pyresample API pyresample.geometry diff --git a/debian/patches/0003-fix-proj4-initialization.patch b/debian/patches/0003-fix-proj4-initialization.patch index da16f9f..3bab779 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(-) -Index: pyresample/pyresample/test/test_files/areas.cfg -=================================================================== ---- pyresample.orig/pyresample/test/test_files/areas.cfg -+++ pyresample/pyresample/test/test_files/areas.cfg +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 @@ -19,7 +19,7 @@ REGION: ease_nh { REGION: pc_world { NAME: Plate Carree world map @@ -20,10 +20,10 @@ Index: pyresample/pyresample/test/test_files/areas.cfg XSIZE: 640 YSIZE: 480 AREA_EXTENT: (-20037508.342789244, -10018754.171394622, 20037508.342789244, 10018754.171394622) -Index: pyresample/pyresample/test/test_geometry.py -=================================================================== ---- pyresample.orig/pyresample/test/test_geometry.py -+++ pyresample/pyresample/test/test_geometry.py +diff --git a/pyresample/test/test_geometry.py b/pyresample/test/test_geometry.py +index b8c2d8f..faac575 100644 +--- a/pyresample/test/test_geometry.py ++++ b/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 9a8b457..73df7c9 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(+) -Index: pyresample/pyresample/test/test_image.py -=================================================================== ---- pyresample.orig/pyresample/test/test_image.py -+++ pyresample/pyresample/test/test_image.py +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 @@ -1,4 +1,5 @@ import os +import sys @@ -25,10 +25,10 @@ Index: pyresample/pyresample/test/test_image.py def test_nearest_resize(self): data = numpy.fromfunction(lambda y, x: y * x * 10 ** -6, (3712, 3712)) msg_con = image.ImageContainerNearest( -Index: pyresample/pyresample/test/test_kd_tree.py -=================================================================== ---- pyresample.orig/pyresample/test/test_kd_tree.py -+++ pyresample/pyresample/test/test_kd_tree.py +diff --git a/pyresample/test/test_kd_tree.py b/pyresample/test/test_kd_tree.py +index bb0da0f..8cbe9c4 100644 +--- a/pyresample/test/test_kd_tree.py ++++ b/pyresample/test/test_kd_tree.py @@ -257,6 +257,8 @@ class Test(unittest.TestCase): self.assertEqual(cross_sum, expected, msg='Grid remapping nearest failed') diff --git a/debian/patches/0004-Use-cmath.patch b/debian/patches/0004-Use-cmath.patch new file mode 100644 index 0000000..feccc99 --- /dev/null +++ b/debian/patches/0004-Use-cmath.patch @@ -0,0 +1,20 @@ +From: Antonio Valentino <[email protected]> +Date: Sat, 9 Jul 2016 10:17:26 +0000 +Subject: Use cmath instead of math.h (closes: #830447) + +--- + pyresample/ewa/_fornav_templates.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyresample/ewa/_fornav_templates.cpp b/pyresample/ewa/_fornav_templates.cpp +index b727379..4fce839 100644 +--- a/pyresample/ewa/_fornav_templates.cpp ++++ b/pyresample/ewa/_fornav_templates.cpp +@@ -1,6 +1,6 @@ + #include "Python.h" + #include <stddef.h> +-#include "math.h" ++#include "cmath" + #include "numpy/arrayobject.h" + #include "_fornav_templates.h" + diff --git a/debian/patches/series b/debian/patches/series index 8767648..1c9ec7c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0002-fix-doc-build.patch 0003-fix-proj4-initialization.patch 0003-skip-nearest-resize-test.patch +0004-Use-cmath.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyresample.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
