[python-shapely] 43/148: Merge "squeeze" in "master"

[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 c4f5a196729a1f5650242762b750dd87583ab000
Merge: ed340e0 c20c783
Author: Pietro Battiston <me at pietrobattiston.it>
Date:   Sun Sep 19 10:09:14 2010 +0200

    Merge "squeeze" in "master"

 debian/changelog                       |  9 +++---
 debian/control                         |  2 +-
 debian/patches/manual-backported-fixes | 56 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  2 ++
 shapely/tests/wkt_locale.txt           | 28 -----------------
 5 files changed, 63 insertions(+), 34 deletions(-)

diff --cc debian/patches/series
index 73be9e9,997cff1..0952ee5
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,3 +1,4 @@@
 +disable-broken-locale-test
  do-not-install-examples-as-scripts
+ manual-backported-fixes
+ disable-broken-locale-test

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