[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-8-gbec5544

[David Paleino]

The following commit has been merged in the master branch:
commit 6d19d5479d3df371f48433512d6846c6e43950d1
Author: David Paleino <dapal at debian.org>
Date:   Tue Nov 10 18:13:51 2009 +0100

    02-fix_FTBFS_binutils-gold.patch added (Closes: #555586)

diff --git a/debian/changelog b/debian/changelog
index 2a42b0b..9e988fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,12 +16,14 @@ mapnik (0.6.1-2) UNRELEASED; urgency=low
   * debian/rules:
     - added quilt infrastructure
     - rewritten to use dh7
-  * debian/patches/01-fix_deprecated_includes.patch added
+  * debian/patches/:
+    - 01-fix_deprecated_includes.patch added
+    - 02-fix_FTBFS_binutils-gold.patch added (Closes: #555586)
   * debian/copyright, substitute (C) with © to make lintian happy
   * debian/mapnik-doc.doc-base added
   * debian/libmapnik-dev.dirs added
 
- -- David Paleino <dapal at debian.org>  Tue, 10 Nov 2009 13:30:41 +0100
+ -- David Paleino <dapal at debian.org>  Tue, 10 Nov 2009 18:12:57 +0100
 
 mapnik (0.6.1-1) unstable; urgency=low
 
diff --git a/debian/patches/02-fix_FTBFS_binutils-gold.patch b/debian/patches/02-fix_FTBFS_binutils-gold.patch
new file mode 100644
index 0000000..46887b4
--- /dev/null
+++ b/debian/patches/02-fix_FTBFS_binutils-gold.patch
@@ -0,0 +1,16 @@
+---
+ utils/shapeindex/SConscript |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- mapnik-new.orig/utils/shapeindex/SConscript
++++ mapnik-new/utils/shapeindex/SConscript
+@@ -39,7 +39,8 @@ headers = ['#plugins/input/shape'] + env
+ boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND']
+ boost_iostreams  = 'boost_iostreams%s' % env['BOOST_APPEND']
+ boost_filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
+-libraries =  [boost_program_options,boost_iostreams,boost_filesystem]
++boost_system = 'boost_system%s' % env['BOOST_APPEND']
++libraries =  [boost_program_options,boost_iostreams,boost_filesystem,boost_system]
+ 
+ if env['PLATFORM'] == 'Darwin' and env['BOOST_SYSTEM_REQUIRED']:
+     boost_system = 'boost_system%s' % env['BOOST_APPEND']
diff --git a/debian/patches/series b/debian/patches/series
index e296e02..bb1e95b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-fix_deprecated_includes.patch
+02-fix_FTBFS_binutils-gold.patch

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