[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-73-g3e1dbee
Jérémy Lal
kapouer at melix.org
Wed Aug 28 15:07:22 UTC 2013
The following commit has been merged in the master branch:
commit ca72da06fd20d2f0eb4206d883174f21138c5526
Author: Jérémy Lal <kapouer at melix.org>
Date: Fri Aug 23 22:28:23 2013 +0200
Remove 02 patch
diff --git a/debian/patches/02-fix_FTBFS_binutils-gold.patch b/debian/patches/02-fix_FTBFS_binutils-gold.patch
deleted file mode 100644
index bb3d2d7..0000000
--- a/debian/patches/02-fix_FTBFS_binutils-gold.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: unconditionally add boost-system to linked libraries
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555586
-Forwarded: no
-
----
- utils/shapeindex/build.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
---- mapnik.orig/utils/shapeindex/build.py
-+++ mapnik/utils/shapeindex/build.py
-@@ -38,12 +38,9 @@ headers = ['#plugins/input/shape'] + env
-
- boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND']
- boost_filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
--libraries = [boost_program_options, boost_filesystem]
--
- boost_system = 'boost_system%s' % env['BOOST_APPEND']
-
--if env['HAS_BOOST_SYSTEM']:
-- libraries.append(boost_system)
-+libraries = [boost_program_options, boost_filesystem, boost_system]
-
- if env.get('BOOST_LIB_VERSION_FROM_HEADER'):
- boost_version_from_header = int(env['BOOST_LIB_VERSION_FROM_HEADER'].split('_')[1])
--
C++/Python toolkit for developing GIS applications
More information about the Pkg-grass-devel
mailing list