[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.7.1-2-1-g6507e3f

[David Paleino]

The following commit has been merged in the master branch:
commit 6507e3fd9683fbc829c8381fe17bf0f8b5250391
Author: David Paleino <dapal at debian.org>
Date:   Fri Nov 19 12:14:14 2010 +0100

    Compile using internal copy of libagg. (Closes: #603470)

diff --git a/debian/changelog b/debian/changelog
index 119090b..019f990 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapnik (0.7.1-3) UNRELEASED; urgency=low
+
+  * Compile using internal copy of libagg. (Closes: #603470)
+
+ -- David Paleino <dapal at debian.org>  Mon, 15 Nov 2010 16:05:05 +0100
+
 mapnik (0.7.1-2) unstable; urgency=low
 
   * debian/patches/03-fix_ImportError_mips.patch added, fixes
diff --git a/debian/control b/debian/control
index 678646c..dcd8651 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,6 @@ Build-Depends:
  libfribidi-dev,
  libgdal1-dev,
  libxml2-dev,
- libagg-dev,
  libicu-dev,
  libcairo2-dev,
  libcairomm-1.0-dev,
diff --git a/debian/rules b/debian/rules
index a19bd94..067d3c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,12 @@
 #export DH_VERBOSE=1
 
 # scons flags
-SCONS_FLAGS=INPUT_PLUGINS=raster,sqlite,postgis,ogr,shape,osm,gdal,kismet PROJ_INCLUDES=/usr/include PROJ_LIBS=/usr/lib INTERNAL_LIBAGG=no SYSTEM_FONTS=/usr/share/fonts/truetype/ttf-dejavu XMLPARSER=libxml2 DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr LIB_DIR_NAME=/mapnik/0.7
+SCONS_FLAGS := INPUT_PLUGINS=raster,sqlite,postgis,ogr,shape,osm,gdal,kismet
+SCONS_FLAGS += PROJ_INCLUDES=/usr/include PROJ_LIBS=/usr/lib
+SCONS_FLAGS += SYSTEM_FONTS=/usr/share/fonts/truetype/ttf-dejavu
+SCONS_FLAGS += XMLPARSER=libxml2
+SCONS_FLAGS += DESTDIR=$(CURDIR)/debian/tmp
+SCONS_FLAGS += PREFIX=/usr LIB_DIR_NAME=/mapnik/0.7
 
 CFLAGS = -Wall -g
 

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