[python-shapely] 69/148: Now using gbp-pq to manage patches.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository python-shapely.

commit 3efcf37c9bec661e038b9c09203a19b89f2b63bc
Author: Pietro Battiston <me at pietrobattiston.it>
Date:   Wed Dec 21 15:31:35 2011 +0100

    Now using gbp-pq to manage patches.
---
 ...e-test => 0001-disable-broken-locale-test.patch} | 17 ++++++++++++++---
 .../{rerun-cython => 0002-rerun-cython.patch}       | 21 ++++++++++++---------
 debian/patches/series                               |  4 ++--
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/debian/patches/disable-broken-locale-test b/debian/patches/0001-disable-broken-locale-test.patch
similarity index 67%
rename from debian/patches/disable-broken-locale-test
rename to debian/patches/0001-disable-broken-locale-test.patch
index 8e0e7ab..c233c36 100644
--- a/debian/patches/disable-broken-locale-test
+++ b/debian/patches/0001-disable-broken-locale-test.patch
@@ -1,12 +1,22 @@
-Description: The following test assumes that the locale "pt_BR.UTF-8" is
+From: Pietro Battiston <me at pietrobattiston.it>
+Date: Wed, 21 Dec 2011 15:29:24 +0100
+Subject: disable-broken-locale-test
+
 installed, and fails otherwise. Since there is no "non-trivial" locale which we
 can assume is installed, the only way to fix this seems to disable it.
 Forwarded, but upstream seems willing to not drop the test.
 Author: Pietro Battiston <me at pietrobattiston.it>
 Forwarded: yes
+---
+ shapely/tests/wkt_locale.txt |   28 ----------------------------
+ 1 files changed, 0 insertions(+), 28 deletions(-)
+ delete mode 100644 shapely/tests/wkt_locale.txt
 
---- python-shapely.orig/shapely/tests/wkt_locale.txt	2010-09-14 11:43:00.000000000 +0200
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+diff --git a/shapely/tests/wkt_locale.txt b/shapely/tests/wkt_locale.txt
+deleted file mode 100644
+index ebbc024..0000000
+--- a/shapely/tests/wkt_locale.txt
++++ /dev/null
 @@ -1,28 +0,0 @@
 -Test locale independence of WKT
 -===============================
@@ -36,3 +46,4 @@ Forwarded: yes
 -Reset locale
 -
 -  >>> _ = locale.setlocale(locale.LC_ALL, '')
+-- 
diff --git a/debian/patches/rerun-cython b/debian/patches/0002-rerun-cython.patch
similarity index 58%
rename from debian/patches/rerun-cython
rename to debian/patches/0002-rerun-cython.patch
index 937b095..eb246f7 100644
--- a/debian/patches/rerun-cython
+++ b/debian/patches/0002-rerun-cython.patch
@@ -1,13 +1,15 @@
-Description: Generate .pyx at compile time.
- Shapely is distributed with the .pyx Cython file already transformed into a .c
- file. This patch imports the modified "build_ext" from the Cython Distutils,
- and then feeds it the .pyx (rather than .c) file.
-Author: Pietro Battiston <me at pietrobattiston.it>
-Forwarded: not-needed
-Last-Update: <2011-07-04>
+From: Pietro Battiston <me at pietrobattiston.it>
+Date: Wed, 21 Dec 2011 15:29:24 +0100
+Subject: rerun-cython
 
---- python-shapely-1.2.10.orig/setup.py
-+++ python-shapely-1.2.10/setup.py
+---
+ setup.py |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 9d30ac1..0684d30 100644
+--- a/setup.py
++++ b/setup.py
 @@ -12,7 +12,7 @@ except:
  from distutils.errors import CCompilerError, DistutilsExecError, \
      DistutilsPlatformError
@@ -26,3 +28,4 @@ Last-Update: <2011-07-04>
      ]
  
  try:
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 439fd12..061fed7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-disable-broken-locale-test
-rerun-cython
+0001-disable-broken-locale-test.patch
+0002-rerun-cython.patch

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