This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch master in repository fiona.
commit 8b1d5790cdbe28fce0a701ffdf84462a0af94626 Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Wed Feb 4 20:25:57 2015 +0100 Refresh/Remove old patches --- ...-fio-command-to-fiona-to-avoid-name-clash.patch | 4 +- .../0002-Fix-cython-compilation-error.patch | 31 --------- ...003-Update-test-to-changed-name-fio-fiona.patch | 74 ---------------------- ...outside-reference-possible-privacy-breach.patch | 22 ------- debian/patches/series | 3 - 5 files changed, 1 insertion(+), 133 deletions(-) diff --git a/debian/patches/0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch b/debian/patches/0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch index e7c2b6b..a7fa371 100644 --- a/debian/patches/0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch +++ b/debian/patches/0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch @@ -7,11 +7,9 @@ There is already another package providing a binary "fio" (fio). setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/setup.py b/setup.py -index 68c8241..54accc3 100644 --- a/setup.py +++ b/setup.py -@@ -129,7 +129,7 @@ setup( +@@ -150,7 +150,7 @@ setup_args = dict( packages=['fiona', 'fiona.fio'], entry_points=''' [console_scripts] diff --git a/debian/patches/0002-Fix-cython-compilation-error.patch b/debian/patches/0002-Fix-cython-compilation-error.patch deleted file mode 100644 index d837614..0000000 --- a/debian/patches/0002-Fix-cython-compilation-error.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Johan Van de Wauw <johan.vandew...@gmail.com> -Date: Wed, 29 Oct 2014 22:34:31 +0100 -Subject: Fix cython compilation error - ---- - fiona/_transform.pyx | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/fiona/_transform.pyx b/fiona/_transform.pyx -index 3d5dd69..a2d4abe 100644 ---- a/fiona/_transform.pyx -+++ b/fiona/_transform.pyx -@@ -115,6 +115,7 @@ def _transform_geom( - cdef void *src_ogr_geom - cdef void *dst_ogr_geom - cdef int i -+ antimeridian_offset_str = str(antimeridian_offset).encode('utf-8') - - if src_crs and dst_crs: - src = _osr_from_crs(src_crs) -@@ -123,8 +124,8 @@ def _transform_geom( - - # Transform options. - options = ograpi.CSLSetNameValue( -- options, "DATELINEOFFSET", -- str(antimeridian_offset).encode('utf-8')) -+ options, "DATELINEOFFSET", antimeridian_offset_str -+ ) - if antimeridian_cutting: - options = ograpi.CSLSetNameValue(options, "WRAPDATELINE", "YES") - diff --git a/debian/patches/0003-Update-test-to-changed-name-fio-fiona.patch b/debian/patches/0003-Update-test-to-changed-name-fio-fiona.patch deleted file mode 100644 index d15609c..0000000 --- a/debian/patches/0003-Update-test-to-changed-name-fio-fiona.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Johan Van de Wauw <johan.vandew...@gmail.com> -Date: Wed, 5 Nov 2014 18:22:07 +0100 -Subject: Update test to changed name fio -> fiona - ---- - tests/test_cli.py | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tests/test_cli.py b/tests/test_cli.py -index 682cd61..2d01451 100644 ---- a/tests/test_cli.py -+++ b/tests/test_cli.py -@@ -4,7 +4,7 @@ import subprocess - - def test_cli_info_json(): - result = subprocess.check_output( -- 'fio info docs/data/test_uk.shp', -+ 'fiona info docs/data/test_uk.shp', - shell=True) - text = result.decode('utf-8').strip() - assert json.loads(text)['count'] == 48 -@@ -12,14 +12,14 @@ def test_cli_info_json(): - - def test_cli_info_count(): - result = subprocess.check_output( -- 'fio info docs/data/test_uk.shp --count', -+ 'fiona info docs/data/test_uk.shp --count', - shell=True) - assert result.decode('utf-8').strip() == '48' - - - def test_cli_info_bounds(): - result = subprocess.check_output( -- 'fio info docs/data/test_uk.shp --bounds', -+ 'fiona info docs/data/test_uk.shp --bounds', - shell=True) - assert result.decode('utf-8').strip() == ( - '-8.621389 49.911659 1.749444 60.844444') -@@ -27,7 +27,7 @@ def test_cli_info_bounds(): - - def test_cli_cat(): - result = subprocess.check_output( -- 'fio cat docs/data/test_uk.shp docs/data/test_uk.shp', -+ 'fiona cat docs/data/test_uk.shp docs/data/test_uk.shp', - shell=True) - records = result.decode('utf-8').strip().split('\n') - assert len(records) == 96 -@@ -37,7 +37,7 @@ def test_cli_cat(): - - def test_cli_cat_rs(): - result = subprocess.check_output( -- 'fio cat docs/data/test_uk.shp docs/data/test_uk.shp ' -+ 'fiona cat docs/data/test_uk.shp docs/data/test_uk.shp ' - '--indent 2 --x-json-seq-rs', - shell=True) - texts = result.decode('utf-8').split(u'\x1e') -@@ -57,7 +57,7 @@ def test_cli_collect(): - 'type': 'Point', - 'coordinates': [0.0, 0.0] }} - result = subprocess.check_output( -- "echo '%s' | fio collect" % json.dumps(feature), -+ "echo '%s' | fiona collect" % json.dumps(feature), - shell=True) - collection = json.loads(result.decode('utf-8')) - assert len(collection['features']) == 1 -@@ -72,7 +72,7 @@ def test_cli_collect_rs(): - 'type': 'Point', - 'coordinates': [0.0, 0.0] }} - result = subprocess.check_output( -- "printf '\036%s\n\036%s' | fio collect" % ( -+ "printf '\036%s\n\036%s' | fiona collect" % ( - json.dumps(feature, indent=2), json.dumps(feature, indent=2)), - shell=True) - collection = json.loads(result.decode('utf-8')) diff --git a/debian/patches/0004-Remove-outside-reference-possible-privacy-breach.patch b/debian/patches/0004-Remove-outside-reference-possible-privacy-breach.patch deleted file mode 100644 index 065cfbc..0000000 --- a/debian/patches/0004-Remove-outside-reference-possible-privacy-breach.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Johan Van de Wauw <johan.vandew...@gmail.com> -Date: Thu, 13 Nov 2014 18:03:24 +0100 -Subject: Remove outside reference (possible privacy breach) - ---- - README.rst | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/README.rst b/README.rst -index 6690d32..a02c62a 100644 ---- a/README.rst -+++ b/README.rst -@@ -4,9 +4,6 @@ Fiona - - Fiona is OGR's neat, nimble, no-nonsense API for Python programmers. - --.. image:: https://travis-ci.org/Toblerity/Fiona.png?branch=master -- :target: https://travis-ci.org/Toblerity/Fiona -- - Fiona is designed to be simple and dependable. It focuses on reading and - writing data in standard Python IO style and relies upon familiar Python types - and protocols such as files, dictionaries, mappings, and iterators instead of diff --git a/debian/patches/series b/debian/patches/series index 404ff08..8811221 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ 0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch -0002-Fix-cython-compilation-error.patch -0003-Update-test-to-changed-name-fio-fiona.patch -0004-Remove-outside-reference-possible-privacy-breach.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/fiona.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel