diff -Nru python-shapely-1.2.1/debian/changelog python-shapely-1.2.1/debian/changelog --- python-shapely-1.2.1/debian/changelog 2010-09-14 18:43:37.000000000 +0200 +++ python-shapely-1.2.1/debian/changelog 2011-02-19 14:58:12.000000000 +0200 @@ -1,3 +1,11 @@ +python-shapely (1.2.1-2ubuntu1) natty; urgency=low + + * debian/patches/python-2.7-testfixes.patch: Update test results to account + for changes to conversions from long integers and regular integers to + floating points in python 2.7. (LP: #721756) + + -- Sameer Morar Sat, 19 Feb 2011 14:57:46 +0200 + python-shapely (1.2.1-2) unstable; urgency=low * Fixes to manual from upstream version 1.2.3 diff -Nru python-shapely-1.2.1/debian/control python-shapely-1.2.1/debian/control --- python-shapely-1.2.1/debian/control 2010-09-16 23:15:04.000000000 +0200 +++ python-shapely-1.2.1/debian/control 2011-02-19 14:55:04.000000000 +0200 @@ -1,7 +1,8 @@ Source: python-shapely Section: python Priority: optional -Maintainer: Pietro Battiston +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Pietro Battiston Build-Depends: debhelper (>= 7.0.50) Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6), libgeos-c1 (>= 3.1.0), python-numpy, python (>=2.5) | python-ctypes Standards-Version: 3.9.1 diff -Nru python-shapely-1.2.1/debian/patches/python-2.7-testfixes.patch python-shapely-1.2.1/debian/patches/python-2.7-testfixes.patch --- python-shapely-1.2.1/debian/patches/python-2.7-testfixes.patch 1970-01-01 02:00:00.000000000 +0200 +++ python-shapely-1.2.1/debian/patches/python-2.7-testfixes.patch 2011-02-19 14:52:12.000000000 +0200 @@ -0,0 +1,45 @@ +Description: Updates test results to account for changes to conversions from + long integers and regular integers to floating points referred to here: + http://docs.python.org/dev/whatsnew/2.7.html +Author: Sameer Morar +Forwarded: http://trac.gispython.org/lab/ticket/248 + +Index: python-shapely-1.2.1/shapely/tests/MultiPolygon.txt +=================================================================== +--- python-shapely-1.2.1.orig/shapely/tests/MultiPolygon.txt 2011-02-19 14:29:14.242080761 +0200 ++++ python-shapely-1.2.1/shapely/tests/MultiPolygon.txt 2011-02-19 14:27:51.773671816 +0200 +@@ -51,7 +51,7 @@ + ------------- + + >>> geom.__geo_interface__ +- {'type': 'MultiPolygon', 'coordinates': [[((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (1.0, 0.0), (0.0, 0.0)), ((0.10000000000000001, 0.10000000000000001), (0.10000000000000001, 0.20000000000000001), (0.20000000000000001, 0.20000000000000001), (0.20000000000000001, 0.10000000000000001), (0.10000000000000001, 0.10000000000000001))]]} ++ {'type': 'MultiPolygon', 'coordinates': [[((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (1.0, 0.0), (0.0, 0.0)), ((0.1, 0.1), (0.1, 0.2), (0.2, 0.2), (0.2, 0.1), (0.1, 0.1))]]} + + Adapter + ------- +Index: python-shapely-1.2.1/shapely/tests/Point.txt +=================================================================== +--- python-shapely-1.2.1.orig/shapely/tests/Point.txt 2011-02-19 14:29:14.322081151 +0200 ++++ python-shapely-1.2.1/shapely/tests/Point.txt 2011-02-19 14:26:19.909216292 +0200 +@@ -122,7 +122,7 @@ + >>> pa.wkt + 'POINT (1.0000000000000000 4.0000000000000000)' + >>> pa.distance(p) +- 4.1231056256176606 ++ 4.123105625617661 + + Now, the inverse + +Index: python-shapely-1.2.1/shapely/tests/Polygon.txt +=================================================================== +--- python-shapely-1.2.1.orig/shapely/tests/Polygon.txt 2011-02-19 14:29:14.126080178 +0200 ++++ python-shapely-1.2.1/shapely/tests/Polygon.txt 2011-02-19 14:29:00.606013130 +0200 +@@ -103,7 +103,7 @@ + ------------- + + >>> polygon.__geo_interface__ +- {'type': 'Polygon', 'coordinates': (((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (2.0, -1.0), (0.0, 0.0)), ((0.10000000000000001, 0.10000000000000001), (0.10000000000000001, 0.20000000000000001), (0.20000000000000001, 0.20000000000000001), (0.20000000000000001, 0.10000000000000001), (0.10000000000000001, 0.10000000000000001)))} ++ {'type': 'Polygon', 'coordinates': (((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (2.0, -1.0), (0.0, 0.0)), ((0.1, 0.1), (0.1, 0.2), (0.2, 0.2), (0.2, 0.1), (0.1, 0.1)))} + + + Adapter diff -Nru python-shapely-1.2.1/debian/patches/series python-shapely-1.2.1/debian/patches/series --- python-shapely-1.2.1/debian/patches/series 2010-09-16 23:16:20.000000000 +0200 +++ python-shapely-1.2.1/debian/patches/series 2011-02-19 14:30:24.000000000 +0200 @@ -1,3 +1,4 @@ do-not-install-examples-as-scripts manual-backported-fixes disable-broken-locale-test +python-2.7-testfixes.patch