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

[David Paleino]

The following commit has been merged in the master branch:
commit 7cf929a2598ddabb4960de87b50b71d23c10b087
Author: David Paleino <dapal at debian.org>
Date:   Thu Mar 25 18:59:50 2010 +0100

    02-fix_FTBFS_binutils-gold.patch refreshed to apply to the new code

diff --git a/debian/changelog b/debian/changelog
index 173f450..1586fe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ mapnik (0.7.1-1) UNRELEASED; urgency=low
   * debian/patches/:
     - 00-fix_amd64_libdir.patch removed, exception for Debian/Ubuntu
       added in upstream code
+    - 02-fix_FTBFS_binutils-gold.patch refreshed to apply to the new
+      code
 
- -- David Paleino <dapal at debian.org>  Thu, 25 Mar 2010 18:55:56 +0100
+ -- David Paleino <dapal at debian.org>  Thu, 25 Mar 2010 18:59:32 +0100
 
 mapnik (0.7.0-2) unstable; urgency=low
 
diff --git a/debian/patches/02-fix_FTBFS_binutils-gold.patch b/debian/patches/02-fix_FTBFS_binutils-gold.patch
index a7e89d1..3dc894a 100644
--- a/debian/patches/02-fix_FTBFS_binutils-gold.patch
+++ b/debian/patches/02-fix_FTBFS_binutils-gold.patch
@@ -4,23 +4,20 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555586
 Forwarded: no
 
 ---
- utils/shapeindex/SConscript |   10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
+ utils/shapeindex/SConscript |    6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
 
---- mapnik-new.orig/utils/shapeindex/SConscript
-+++ mapnik-new/utils/shapeindex/SConscript
-@@ -39,16 +39,8 @@ headers = ['#plugins/input/shape'] + env
+--- mapnik.orig/utils/shapeindex/SConscript
++++ mapnik/utils/shapeindex/SConscript
+@@ -39,13 +39,9 @@ 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']
--
--if env['SUNCC']:
--    libraries.append(boost_system)
--
--if env['PLATFORM'] == 'Darwin' and env['BOOST_SYSTEM_REQUIRED']:
+ 
+-if env['HAS_BOOST_SYSTEM']:
 -    libraries.append(boost_system)
 -
 +libraries =  [boost_program_options,boost_iostreams,boost_filesystem,boost_system]

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