The following commit has been merged in the master branch: commit bda46c3e60e6d9b7a22782815e2041752d5466d3 Author: David Paleino <da...@debian.org> Date: Sun May 20 09:02:52 2012 +0200
debian/patches/ reworked * debian/patches/: - 02-fix_FTBFS_binutils-gold.patch refreshed - 03-fix_ImportError_mips.patc, 03-fix_big-endian.patch and 04-port_to_new_boost.patch removed diff --git a/debian/changelog b/debian/changelog index e5a97d4..929f01d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,12 @@ mapnik (2.0.1+ds1-1) UNRELEASED; urgency=low * New upstream version * Switch debian/watch to github tags + * debian/patches/: + - 02-fix_FTBFS_binutils-gold.patch refreshed + - 03-fix_ImportError_mips.patc, 03-fix_big-endian.patch and + 04-port_to_new_boost.patch removed - -- David Paleino <da...@debian.org> Sun, 20 May 2012 08:49:20 +0200 + -- David Paleino <da...@debian.org> Sun, 20 May 2012 09:02:04 +0200 mapnik (2.0.0+ds1-3) unstable; urgency=low diff --git a/debian/patches/01-generate_local_docs.patch b/debian/patches/01-generate_local_docs.patch deleted file mode 100644 index 624e466..0000000 --- a/debian/patches/01-generate_local_docs.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: David Paleino <da...@debian.org> -Subject: generate documentation for the locally built module -Forwarded: no - ---- - docs/epydoc_config/build_epydoc.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- mapnik.orig/docs/epydoc_config/build_epydoc.sh -+++ mapnik/docs/epydoc_config/build_epydoc.sh -@@ -13,7 +13,8 @@ epydoc --no-private \ - --no-sourcecode \ - --name mapnik2 \ - --url http://mapnik.org \ -- --css mapnik_epydoc.css mapnik2 \ -+ --css mapnik_epydoc.css \ -+ ../../bindings/python/mapnik \ - -o $API_DOCS_DIR - - exit $? diff --git a/debian/patches/02-fix_FTBFS_binutils-gold.patch b/debian/patches/02-fix_FTBFS_binutils-gold.patch index fd2be1e..bb3d2d7 100644 --- a/debian/patches/02-fix_FTBFS_binutils-gold.patch +++ b/debian/patches/02-fix_FTBFS_binutils-gold.patch @@ -4,8 +4,8 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555586 Forwarded: no --- - utils/shapeindex/build.py | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) + utils/shapeindex/build.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) --- mapnik.orig/utils/shapeindex/build.py +++ mapnik/utils/shapeindex/build.py @@ -21,12 +21,5 @@ Forwarded: no - libraries.append(boost_system) +libraries = [boost_program_options, boost_filesystem, boost_system] - shapeindex = program_env.Program('shapeindex', source, CPPPATH=headers, LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) - -@@ -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')) + if env.get('BOOST_LIB_VERSION_FROM_HEADER'): + boost_version_from_header = int(env['BOOST_LIB_VERSION_FROM_HEADER'].split('_')[1]) diff --git a/debian/patches/03-fix_ImportError_mips.patch b/debian/patches/03-fix_ImportError_mips.patch deleted file mode 100644 index 92d2555..0000000 --- a/debian/patches/03-fix_ImportError_mips.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Jakub Wilk <jw...@debian.org> -Subject: fix import, so that it really works without guessing the values -Origin: vendor -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=599330 -Forwarded: no - ---- - bindings/python/mapnik/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- mapnik.orig/bindings/python/mapnik/__init__.py -+++ mapnik/bindings/python/mapnik/__init__.py -@@ -42,7 +42,7 @@ import os - - from sys import getdlopenflags, setdlopenflags - try: -- from ctypes import RTLD_NOW, RTLD_GLOBAL -+ from DLFCN import RTLD_NOW, RTLD_GLOBAL - except ImportError: - RTLD_NOW = 2 - RTLD_GLOBAL = 256 diff --git a/debian/patches/03-fix_big-endian.patch b/debian/patches/03-fix_big-endian.patch deleted file mode 100644 index 37c5eb4..0000000 --- a/debian/patches/03-fix_big-endian.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: David Paleino <da...@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/04-port_to_new_boost.patch b/debian/patches/04-port_to_new_boost.patch deleted file mode 100644 index c4c9b14..0000000 --- a/debian/patches/04-port_to_new_boost.patch +++ /dev/null @@ -1,99 +0,0 @@ -From: Dane Springmeyer <dbs...@gmail.com> -Origin: upstream, http://trac.mapnik.org/changeset/2506/branches/0.7.2-dev -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624934 -Forwarded: not-needed - ---- - src/datasource_cache.cpp | 28 +++++++++++++++++++++------- - src/load_map.cpp | 5 +++++ - 2 files changed, 26 insertions(+), 7 deletions(-) - ---- mapnik.orig/src/datasource_cache.cpp -+++ mapnik/src/datasource_cache.cpp -@@ -40,8 +40,8 @@ - - namespace mapnik - { -- using namespace std; -- using namespace boost; -+// using namespace std; -+// using namespace boost; - - bool is_input_plugin (std::string const& filename) - { -@@ -72,7 +72,7 @@ namespace mapnik - } - - datasource_ptr ds; -- map<string,boost::shared_ptr<PluginInfo> >::iterator itr=plugins_.find(*type); -+ std::map<string,boost::shared_ptr<PluginInfo> >::iterator itr=plugins_.find(*type); - if ( itr == plugins_.end() ) - { - throw config_error(string("Could not create datasource. No plugin ") + -@@ -131,25 +131,33 @@ namespace mapnik - mutex::scoped_lock lock(mapnik::singleton<mapnik::datasource_cache, - mapnik::CreateStatic>::mutex_); - #endif -- filesystem::path path(str); -- filesystem::directory_iterator end_itr; -+ boost::filesystem::path path(str); -+ boost::filesystem::directory_iterator end_itr; - - - if (exists(path) && is_directory(path)) - { -- for (filesystem::directory_iterator itr(path);itr!=end_itr;++itr ) -+ for (boost::filesystem::directory_iterator itr(path);itr!=end_itr;++itr ) - { - - #if BOOST_VERSION < 103400 - if (!is_directory( *itr ) && is_input_plugin(itr->leaf())) - #else -+#if (BOOST_FILESYSTEM_VERSION == 3) -+ if (!is_directory( *itr ) && is_input_plugin(itr->path().filename().string())) -+#else // v2 - if (!is_directory( *itr ) && is_input_plugin(itr->path().leaf())) - #endif -+#endif - - { - try - { -+#if (BOOST_FILESYSTEM_VERSION == 3) -+ lt_dlhandle module = lt_dlopen(itr->path().string().c_str()); -+#else // v2 - lt_dlhandle module=lt_dlopen(itr->string().c_str()); -+#endif - if (module) - { - datasource_name* ds_name = -@@ -164,7 +172,13 @@ namespace mapnik - } - else - { -- std::clog << "Problem loading plugin library: " << itr->string().c_str() << " (libtool error: " << lt_dlerror() << ")" << std::endl; -+#if (BOOST_FILESYSTEM_VERSION == 3) -+ std::clog << "Problem loading plugin library: " << itr->path().string() -+ << " (dlopen failed - plugin likely has an unsatisfied dependency or incompatible ABI)" << std::endl; -+#else // v2 -+ std::clog << "Problem loading plugin library: " << itr->string() -+ << " (dlopen failed - plugin likely has an unsatisfied dependency or incompatible ABI)" << std::endl; -+#endif - } - } - catch (...) {} ---- mapnik.orig/src/load_map.cpp -+++ mapnik/src/load_map.cpp -@@ -1590,7 +1590,12 @@ std::string map_parser::ensure_relative_ - boost::filesystem::path xml_path = filename_; - boost::filesystem::path rel_path = *opt_path; - if ( !rel_path.has_root_path() ) { -+#if (BOOST_FILESYSTEM_VERSION == 3) -+ boost::filesystem::path full = boost::filesystem::absolute(xml_path.branch_path()/rel_path).normalize(); -+#else // v2 - boost::filesystem::path full = boost::filesystem::complete(xml_path.branch_path()/rel_path).normalize(); -+#endif -+ - #ifdef MAPNIK_DEBUG - std::clog << "\nModifying relative paths to be relative to xml...\n"; - std::clog << "original base path: " << *opt_path << "\n"; diff --git a/debian/patches/series b/debian/patches/series index d4cc89e..1af0a45 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1 @@ -01-generate_local_docs.patch 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 _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel