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

[David Paleino]

The following commit has been merged in the master branch:
commit c6bb047f16fe0ca43b4b582de624a78745fb505d
Author: David Paleino <dapal at debian.org>
Date:   Tue Sep 27 12:27:02 2011 +0200

    Package renamed from libmapnik0.7 to libmapnik2-2.0

diff --git a/debian/changelog b/debian/changelog
index c5988c1..e77944d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ mapnik (2.0.0+ds1-1) UNRELEASED; urgency=low
   * Debhelper compatibility bumped to 8
   * New input plugins compiled: geos, rasterlite
   * Package switch from pysupport to dh_python2
+  * Package renamed from libmapnik0.7 to libmapnik2-2.0
 
- -- David Paleino <dapal at debian.org>  Mon, 26 Sep 2011 23:52:10 +0200
+ -- David Paleino <dapal at debian.org>  Tue, 27 Sep 2011 12:25:30 +0200
 
 mapnik (0.7.1-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a3b21ff..8ff29ea 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Homepage: http://www.mapnik.org/
 Vcs-Git: git://git.debian.org/pkg-grass/mapnik.git
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapnik.git
 
-Package: libmapnik0.7
+Package: libmapnik2-2.0
 Architecture: any
 Depends:
  ${shlibs:Depends}
@@ -67,12 +67,12 @@ Description: C++/Python toolkit for developing GIS applications (libraries)
  .
  This package contains the shared library and input plugins.
 
-Package: libmapnik-dev
+Package: libmapnik2-dev
 Section: libdevel
 Architecture: any
 Depends:
  ${misc:Depends}
- , libmapnik0.7 (= ${binary:Version})
+ , libmapnik2-2.0 (= ${binary:Version})
  , libc6-dev | libc-dev
  , libboost-thread-dev
  , libboost-filesystem-dev
@@ -166,7 +166,7 @@ Description: C++/Python toolkit for developing GIS applications (Python)
 Package: mapnik-doc
 Section: doc
 Architecture: all
-Recommends: libmapnik-dev
+Recommends: libmapnik2-dev
 Depends: ${misc:Depends}
 Description: C++/Python toolkit for developing GIS applications (doc)
  Mapnik is an OpenSource C++/Python toolkit for developing GIS
diff --git a/debian/libmapnik0.7.install b/debian/libmapnik2-2.0.install
similarity index 100%
rename from debian/libmapnik0.7.install
rename to debian/libmapnik2-2.0.install
diff --git a/debian/libmapnik-dev.dirs b/debian/libmapnik2-dev.dirs
similarity index 100%
rename from debian/libmapnik-dev.dirs
rename to debian/libmapnik2-dev.dirs
diff --git a/debian/libmapnik-dev.install b/debian/libmapnik2-dev.install
similarity index 100%
rename from debian/libmapnik-dev.install
rename to debian/libmapnik2-dev.install
diff --git a/debian/libmapnik-dev.manpages b/debian/libmapnik2-dev.manpages
similarity index 100%
rename from debian/libmapnik-dev.manpages
rename to debian/libmapnik2-dev.manpages
diff --git a/debian/rules b/debian/rules
index 81b0f75..61f2278 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ 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
+SCONS_FLAGS += PREFIX=/usr LIB_DIR_NAME=/mapnik/2.0
 
 CFLAGS = -Wall -g
 
@@ -46,7 +46,7 @@ override_dh_install:
 	# and trick epydoc into loading the shlib too
 	-ln -s ../_mapnik.so bindings/python/mapnik/
 	-( cd docs/epydoc_config ; \
-	LD_LIBRARY_PATH=$(CURDIR)/debian/libmapnik0.7/usr/lib/ ./build_epydoc.sh )
+	LD_LIBRARY_PATH=$(CURDIR)/debian/libmapnik2-2.0/usr/lib/ ./build_epydoc.sh )
 	rm -rf bindings/python/mapnik/_mapnik.so
 	dh_install -pmapnik-doc docs/api_docs/python /usr/share/doc/mapnik-doc/
 

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