[DebianGIS-dev] [SCM] mapnik branch, master, updated. ac62402140210fc80f564a5cdcbaa50242fbf947

[David Paleino]

The following commit has been merged in the master branch:
commit 2ad9374ee7b1cd7345f340a70868aa4420dee95b
Author: David Paleino <d.paleino at gmail.com>
Date:   Mon Nov 2 19:51:45 2009 +0100

    debian/control: added quilt Build-Dependency, debian/rules: added quilt infrastructure

diff --git a/debian/changelog b/debian/changelog
index 107fdf8..5c70676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,9 +10,11 @@ mapnik (0.6.1-2) UNRELEASED; urgency=low
   * debian/control:
     - added myself to Uploaders
     - wrapped dependency fields (eases reading diffs in commits)
+    - added quilt Build-Dependency
   * debian/watch updated to use new url
+  * debian/rules: added quilt infrastructure
 
- -- David Paleino <d.paleino at gmail.com>  Mon, 02 Nov 2009 12:11:03 +0100
+ -- David Paleino <d.paleino at gmail.com>  Mon, 02 Nov 2009 19:51:03 +0100
 
 mapnik (0.6.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 94d8cd2..306047b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Uploaders: Dominic Hargreaves <dom at earth.li>,
  David Paleino <d.paleino at gmail.com>
 Build-Depends: python,
  debhelper (>= 5.0.38),
+ quilt,
  python2.5-dev,
  python-central (>= 0.5.6),
  libboost-thread-dev,
diff --git a/debian/rules b/debian/rules
index 60c04f4..959d170 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 # 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 PYTHON=/usr/bin/python2.5 XMLPARSER=libxml2 DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr LIB_DIR_NAME=/mapnik/0.6
 
@@ -29,7 +31,7 @@ configure-stamp:
 
 
 build: build-stamp
-build-stamp: configure-stamp 
+build-stamp: configure-stamp $(QUILT_STAMPFN)
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -39,7 +41,7 @@ build-stamp: configure-stamp
 	rm -f demo/c++/Makefile
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp

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