[fiona] 08/09: Clean cython build results

Johan Van de Wauw johanvdw-guest at moszumanska.debian.org
Wed Oct 29 23:09:48 UTC 2014


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

johanvdw-guest pushed a commit to branch master
in repository fiona.

commit e5a8c378ebcff5c640ec365a77b34d0b7b46a713
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Wed Oct 29 21:26:55 2014 +0100

    Clean cython build results
    
    update patch
---
 debian/patches/0002-Fix-cython-compilation-error.patch | 16 ++++++++--------
 debian/rules                                           |  3 +--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0002-Fix-cython-compilation-error.patch b/debian/patches/0002-Fix-cython-compilation-error.patch
index 274dba6..d837614 100644
--- a/debian/patches/0002-Fix-cython-compilation-error.patch
+++ b/debian/patches/0002-Fix-cython-compilation-error.patch
@@ -1,14 +1,16 @@
 From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Wed, 29 Oct 2014 20:58:35 +0100
+Date: Wed, 29 Oct 2014 22:34:31 +0100
 Subject: Fix cython compilation error
 
 ---
- fiona/_transform.pyx | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
+ 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,16 +115,17 @@ def _transform_geom(
+@@ -115,6 +115,7 @@ def _transform_geom(
      cdef void *src_ogr_geom
      cdef void *dst_ogr_geom
      cdef int i
@@ -16,11 +18,9 @@ Subject: Fix cython compilation error
  
      if src_crs and dst_crs:
          src = _osr_from_crs(src_crs)
-         dst = _osr_from_crs(dst_crs)
-         transform = ograpi.OCTNewCoordinateTransformation(src, dst)
+@@ -123,8 +124,8 @@ def _transform_geom(
  
--        # Transform options.
-+        # Transform options
+         # Transform options.
          options = ograpi.CSLSetNameValue(
 -                    options, "DATELINEOFFSET", 
 -                    str(antimeridian_offset).encode('utf-8'))
diff --git a/debian/rules b/debian/rules
index fd3c515..573832e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 export PYBUILD_TEST_PYTEST=1
 export PYBUILD_NAME=fiona
@@ -9,7 +8,7 @@ export PYBUILD_NAME=fiona
 
 override_dh_clean:
 	dh_clean
-	rm -rf fiona/*.so docs/data/test_uk.json docs/data/test_uk.tar docs/data/test_uk.zip gdal-config.txt
+	rm -rf fiona/*.so docs/data/test_uk.json docs/data/test_uk.tar docs/data/test_uk.zip gdal-config.txt fiona/*.c VERSION.txt fiona/*.cpp
 
 override_dh_install:
 	dh_install

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



More information about the Pkg-grass-devel mailing list