[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-9-gdf98083

[Andrew Harvey]

The following commit has been merged in the master branch:
commit df98083d654000aa3194bca0c1ee7ea6cc729a48
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Sat Aug 4 16:09:17 2012 +1000

    change build to use top level font directory (Closes: 665798)

diff --git a/debian/changelog b/debian/changelog
index 41990ad..bdae036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 mapnik (2.0.1+ds1-1) UNRELEASED; urgency=low
 
+  [ David Paleino ]
   * New upstream version
   * Switch debian/watch to github tags
   * debian/patches/:
@@ -8,7 +9,10 @@ mapnik (2.0.1+ds1-1) UNRELEASED; urgency=low
       04-port_to_new_boost.patch removed
   * Python bindings testsuite temporarily disabled
 
- -- David Paleino <dapal at debian.org>  Fri, 25 May 2012 19:00:10 +0200
+  [ Andrew Harvey ]
+  * Change debian/rules to use top level font directory (Closes: 665798)
+
+ -- Andrew Harvey <andrew.harvey4 at gmail.com>  Sat, 04 Aug 2012 16:05:42 +1000
 
 mapnik (2.0.0+ds1-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 82e9dcb..98703bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ TARNAME := mapnik_$(UPVER)+ds1.orig.tar
 # scons flags
 SCONS_FLAGS := INPUT_PLUGINS=gdal,geos,kismet,ogr,osm,postgis,raster,rasterlite,shape,sqlite
 SCONS_FLAGS += PROJ_INCLUDES=/usr/include PROJ_LIBS=/usr/lib
-SCONS_FLAGS += SYSTEM_FONTS=/usr/share/fonts/truetype/ttf-dejavu
+SCONS_FLAGS += SYSTEM_FONTS=/usr/share/fonts
 SCONS_FLAGS += XMLPARSER=libxml2
 SCONS_FLAGS += PREFIX=/usr LIB_DIR_NAME=/mapnik/2.0
 

-- 
C++/Python toolkit for developing GIS applications