The following commit has been merged in the master branch:
commit bb2bb6118f123fe4ffaabfe4d32916196975f61a
Author: David Paleino <da...@debian.org>
Date: Mon Sep 26 22:55:12 2011 +0200
Patches refreshed
diff --git a/debian/patches/01-generate_local_docs.patch
b/debian/patches/01-generate_local_docs.patch
index aad5274..624e466 100644
--- a/debian/patches/01-generate_local_docs.patch
+++ b/debian/patches/01-generate_local_docs.patch
@@ -10,9 +10,9 @@ Forwarded: no
+++ mapnik/docs/epydoc_config/build_epydoc.sh
@@ -13,7 +13,8 @@ epydoc --no-private \
--no-sourcecode \
- --name mapnik \
+ --name mapnik2 \
--url http://mapnik.org \
-- --css mapnik_epydoc.css mapnik \
+- --css mapnik_epydoc.css mapnik2 \
+ --css mapnik_epydoc.css \
+ ../../bindings/python/mapnik \
-o $API_DOCS_DIR
diff --git a/debian/patches/02-fix_FTBFS_binutils-gold.patch
b/debian/patches/02-fix_FTBFS_binutils-gold.patch
index 3dc894a..fd2be1e 100644
--- a/debian/patches/02-fix_FTBFS_binutils-gold.patch
+++ b/debian/patches/02-fix_FTBFS_binutils-gold.patch
@@ -4,23 +4,29 @@ Bug-Debian:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555586
Forwarded: no
---
- utils/shapeindex/SConscript | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
+ utils/shapeindex/build.py | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
---- mapnik.orig/utils/shapeindex/SConscript
-+++ mapnik/utils/shapeindex/SConscript
-@@ -39,13 +39,9 @@ headers = ['#plugins/input/shape'] + env
+--- 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_iostreams = 'boost_iostreams%s' % env['BOOST_APPEND']
boost_filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
--libraries = [boost_program_options,boost_iostreams,boost_filesystem]
+-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_iostreams,boost_filesystem,boost_system]
++libraries = [boost_program_options, boost_filesystem, boost_system]
+
+ shapeindex = program_env.Program('shapeindex', source, CPPPATH=headers,
LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS'])
- shapeindex = env.Program('shapeindex', source, CPPPATH=headers,
LIBS=libraries)
+@@ -53,4 +50,4 @@ if 'uninstall' not in COMMAND_LINE_TARGE
+ env.Install(os.path.join(env['INSTALL_PREFIX'],'bin'), shapeindex)
+ env.Alias('install', os.path.join(env['INSTALL_PREFIX'],'bin'))
+-env['create_uninstall_target'](env,
os.path.join(env['INSTALL_PREFIX'],'bin','shapeindex'))
+\ No newline at end of file
++env['create_uninstall_target'](env,
os.path.join(env['INSTALL_PREFIX'],'bin','shapeindex'))
diff --git a/debian/patches/series b/debian/patches/series
index cade5c7..b3e18ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
01-generate_local_docs.patch
02-fix_FTBFS_binutils-gold.patch
-03-fix_ImportError_mips.patch
-04-port_to_new_boost.patch
+#03-fix_ImportError_mips.patch
+#04-port_to_new_boost.patch
--
C++/Python toolkit for developing GIS applications
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
