[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-1-1-g3f7a271

[David Paleino]

The following commit has been merged in the master branch:
commit 3f7a2719ecf656e2d6aadb614d178673ee8956be
Author: David Paleino <dapal at debian.org>
Date:   Sat Oct 8 22:12:38 2011 +0200

    03-fix_big-endian.patch added: the variable for big-endian architectures was wrongly named (Closes: #644704)

diff --git a/debian/changelog b/debian/changelog
index 35530a5..dcd91a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mapnik (2.0.0+ds1-2) UNRELEASED; urgency=low
+
+  * 03-fix_big-endian.patch added: the variable for big-endian
+    architectures was wrongly named (Closes: #644704)
+
+ -- David Paleino <dapal at debian.org>  Sat, 08 Oct 2011 22:12:16 +0200
+
 mapnik (2.0.0+ds1-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/03-fix_big-endian.patch b/debian/patches/03-fix_big-endian.patch
new file mode 100644
index 0000000..37c5eb4
--- /dev/null
+++ b/debian/patches/03-fix_big-endian.patch
@@ -0,0 +1,21 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix variable name when the architecture is big endian
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644704
+Forwarded: no
+
+---
+ include/mapnik/grid/grid.hpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- mapnik.orig/include/mapnik/grid/grid.hpp
++++ mapnik/include/mapnik/grid/grid.hpp
+@@ -284,7 +284,7 @@ public:
+         {
+ 
+ #ifdef MAPNIK_BIG_ENDIAN
+-            unsigned a1 = (int)((rgba1 & 0xff) * opacity) & 0xff; // adjust for desired opacity
++            unsigned a = (int)((rgba1 & 0xff) * opacity) & 0xff; // adjust for desired opacity
+ #else
+             unsigned a = (int)(((rgba1 >> 24) & 0xff) * opacity) & 0xff; // adjust for desired opacity
+ #endif                    
diff --git a/debian/patches/series b/debian/patches/series
index b3e18ef..d4cc89e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02-fix_FTBFS_binutils-gold.patch
 #03-fix_ImportError_mips.patch
 #04-port_to_new_boost.patch
+03-fix_big-endian.patch

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