The following commit has been merged in the master branch: commit f23a75d767783b963451e4d670f07aa3d34db4cf Author: David Paleino <da...@debian.org> Date: Mon Feb 22 00:07:07 2010 +0100
debian/patches/00-fix_amd64_libdir.patch added, install the shared library in /usr/lib/ also on amd64. diff --git a/debian/changelog b/debian/changelog index 9d57278..6cd80d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mapnik (0.7.0-2) UNRELEASED; urgency=low + + * debian/patches/: + - 00-fix_amd64_libdir.patch added, install the shared library + in /usr/lib/ also on amd64. + + -- David Paleino <da...@debian.org> Mon, 22 Feb 2010 00:06:15 +0100 + mapnik (0.7.0-1) unstable; urgency=low [ Dominic Hargreaves ] diff --git a/debian/patches/00-fix_amd64_libdir.patch b/debian/patches/00-fix_amd64_libdir.patch new file mode 100644 index 0000000..e3b5afb --- /dev/null +++ b/debian/patches/00-fix_amd64_libdir.patch @@ -0,0 +1,21 @@ +From: David Paleino <da...@debian.org> +Subject: install the shared library in /usr/lib/ also on amd64 +Forwarded: no + +--- + SConstruct | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +--- mapnik.orig/SConstruct ++++ mapnik/SConstruct +@@ -68,9 +68,7 @@ def shortest_name(libs): + name = lib + return name + +-if platform.uname()[4] == 'x86_64' and platform.system() == 'Linux': +- LIBDIR_SCHEMA='lib64' +-elif platform.uname()[4] == 'ppc64': ++if platform.uname()[4] == 'ppc64': + LIBDIR_SCHEMA='lib64' + else: + LIBDIR_SCHEMA='lib' diff --git a/debian/patches/series b/debian/patches/series index bb8bf61..4383e9e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +00-fix_amd64_libdir.patch 01-generate_local_docs.patch 02-fix_FTBFS_binutils-gold.patch 03-fix_typo.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/mailman/listinfo/pkg-grass-devel