[SCM] mapnik branch, master, updated. debian/0.7.1-5-5-g91228ff

[David Paleino]

The following commit has been merged in the master branch:
commit 91228ff5a8a62c8b2e6f1bf247eea8b8e6f652e9
Merge: 898a1dcf199f57b9b12b12e52b326636f7e2ecb4 3c93065173c0175c31f75f8c3692c88fde9e2ef7
Author: David Paleino <dapal at debian.org>
Date:   Mon Sep 26 22:25:02 2011 +0200

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index da10480,b00a3b3..59e4cef
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
 +mapnik (2.0.0-1) UNRELEASED; urgency=low
 +
 +  * New upstream version
 +
 + -- David Paleino <dapal at debian.org>  Mon, 26 Sep 2011 22:20:38 +0200
 +
+ mapnik (0.7.1-6) unstable; urgency=low
+ 
+   * Get rid of obsolete libjpeg62 dependencies.
+     (closes: #629970)
+   * Added me to Uploaders to avoid inappropriate NMUing.
+ 
+  -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 25 Jul 2011 14:14:28 +0200
+ 
  mapnik (0.7.1-5) unstable; urgency=low
  
    * Correctly trap errors in debian/rules, thanks to Jakub Wilk

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