[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 58ca8d943d56d42c2afd4bb75a8b8bb79cf0e924
Author: David Paleino <dapal at debian.org>
Date:   Thu Mar 25 18:56:28 2010 +0100

    debian/patches/00-fix_amd64_libdir.patch removed, exception for Debian/Ubuntu added in upstream code

diff --git a/debian/changelog b/debian/changelog
index c4fde39..173f450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 mapnik (0.7.1-1) UNRELEASED; urgency=low
 
   * New upstream version
+  * debian/patches/:
+    - 00-fix_amd64_libdir.patch removed, exception for Debian/Ubuntu
+      added in upstream code
 
- -- David Paleino <dapal at debian.org>  Thu, 25 Mar 2010 18:48:55 +0100
+ -- David Paleino <dapal at debian.org>  Thu, 25 Mar 2010 18:55:56 +0100
 
 mapnik (0.7.0-2) unstable; urgency=low
 
diff --git a/debian/patches/00-fix_amd64_libdir.patch b/debian/patches/00-fix_amd64_libdir.patch
deleted file mode 100644
index e3b5afb..0000000
--- a/debian/patches/00-fix_amd64_libdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: David Paleino <dapal at 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 4383e9e..bb8bf61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-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