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

[Jérémy Lal]

The following commit has been merged in the master branch:
commit cbbb44b0d9c24351eeaf0f9007cc4c4174cfff85
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue Aug 27 15:56:13 2013 +0200

    Transition to libmapnik, python-mapnik, fix dh files and paths

diff --git a/debian/control b/debian/control
index 371de47..37bb22c 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Homepage: http://www.mapnik.org/
 Vcs-Git: git://anonscm.debian.org/pkg-grass/mapnik.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/mapnik.git
 
-Package: libmapnik-2.2
+Package: libmapnik2.2
 Architecture: any
 Depends:
  ${shlibs:Depends}
@@ -95,7 +95,7 @@ Breaks: libmapnik2-dev (<< 2.2.0+ds1-1~)
 Replaces: libmapnik2-dev (<< 2.2.0+ds1-1~)
 Depends:
  ${misc:Depends}
- , libmapnik-2.2 (= ${binary:Version})
+ , libmapnik2.2 (= ${binary:Version})
  , libc6-dev | libc-dev
  , libboost-thread-dev
  , libboost-filesystem-dev
@@ -198,7 +198,6 @@ Architecture: all
 Depends:
  ${misc:Depends}
  , python-mapnik
-Provides: ${python:Provides}
 Description: C++/Python toolkit for developing GIS applications (dummy)
  Mapnik is an OpenSource C++/Python toolkit for developing GIS
  (Geographic Information Systems) applications. At the core is a C++
diff --git a/debian/libmapnik2-dev.dirs b/debian/libmapnik-dev.dirs
similarity index 100%
rename from debian/libmapnik2-dev.dirs
rename to debian/libmapnik-dev.dirs
diff --git a/debian/libmapnik2-dev.install b/debian/libmapnik-dev.install
similarity index 100%
rename from debian/libmapnik2-dev.install
rename to debian/libmapnik-dev.install
diff --git a/debian/libmapnik2-dev.manpages b/debian/libmapnik-dev.manpages
similarity index 100%
rename from debian/libmapnik2-dev.manpages
rename to debian/libmapnik-dev.manpages
diff --git a/debian/libmapnik2-2.2.install b/debian/libmapnik2.2.install
similarity index 100%
rename from debian/libmapnik2-2.2.install
rename to debian/libmapnik2.2.install
diff --git a/debian/python-mapnik2.examples b/debian/python-mapnik.examples
similarity index 100%
rename from debian/python-mapnik2.examples
rename to debian/python-mapnik.examples
diff --git a/debian/python-mapnik2.install b/debian/python-mapnik.install
similarity index 100%
rename from debian/python-mapnik2.install
rename to debian/python-mapnik.install
diff --git a/debian/rules b/debian/rules
index 86d5d8a..ff0d668 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,7 @@ override_dh_install:
 
 	# build Python API documentation
 	# and trick epydoc into loading the shlib too
-	LD_LIBRARY_PATH=$(CURDIR)/debian/libmapnik2-2.2/usr/lib/ epydoc --no-private \
+	LD_LIBRARY_PATH=$(CURDIR)/debian/libmapnik2.2/usr/lib/ epydoc --no-private \
     --no-frames \
     --no-sourcecode \
     --name mapnik \

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