[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.7.0-2-8-g46fb3c8

[David Paleino]

The following commit has been merged in the master branch:
commit 46fb3c8762dbd45e18737edf93414ad82c3d3865
Author: David Paleino <dapal at debian.org>
Date:   Sat Oct 9 16:24:56 2010 +0200

    debian/patches/03-fix_ImportError_mips.patch added, fixes un-importability on mips{,-el} due to a wrong import. Thanks Jakub Wilk (Closes: #599330)

diff --git a/debian/changelog b/debian/changelog
index d63fe50..db32e2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mapnik (0.7.1-2) UNRELEASED; urgency=low
+
+  * debian/patches/03-fix_ImportError_mips.patch added, fixes
+    un-importability on mips{,-el} due to a wrong import. Thanks
+    Jakub Wilk (Closes: #599330)
+
+ -- David Paleino <dapal at debian.org>  Sat, 09 Oct 2010 16:24:00 +0200
+
 mapnik (0.7.1-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/03-fix_ImportError_mips.patch b/debian/patches/03-fix_ImportError_mips.patch
new file mode 100644
index 0000000..92d2555
--- /dev/null
+++ b/debian/patches/03-fix_ImportError_mips.patch
@@ -0,0 +1,21 @@
+From: Jakub Wilk <jwilk at debian.org>
+Subject: fix import, so that it really works without guessing the values
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=599330
+Forwarded: no
+
+---
+ bindings/python/mapnik/__init__.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- mapnik.orig/bindings/python/mapnik/__init__.py
++++ mapnik/bindings/python/mapnik/__init__.py
+@@ -42,7 +42,7 @@ import os
+ 
+ from sys import getdlopenflags, setdlopenflags
+ try:
+-    from ctypes import RTLD_NOW, RTLD_GLOBAL
++    from DLFCN import RTLD_NOW, RTLD_GLOBAL
+ except ImportError:
+     RTLD_NOW = 2
+     RTLD_GLOBAL = 256
diff --git a/debian/patches/series b/debian/patches/series
index 29bb7a5..bb7c079 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-generate_local_docs.patch
 02-fix_FTBFS_binutils-gold.patch
+03-fix_ImportError_mips.patch

-- 
C++/Python toolkit for developing GIS applications