This is an automated email from the git hooks/post-receive script.
kapouer pushed a commit to branch master
in repository mapnik.
commit 76ff8745365f8485a9ac0059aa7d83cf3a456927
Author: Jérémy Lal <kapo...@melix.org>
Date: Tue May 26 22:11:17 2015 +0200
python bindings have another upstream source now
Signed-off-by: Jérémy Lal <kapo...@melix.org>
---
debian/clean | 1 -
debian/control | 94 +++++--------------------------------------
debian/mapnik-doc.doc-base | 8 ----
debian/python-mapnik.examples | 1 -
debian/python-mapnik.install | 2 -
debian/rules | 49 ++--------------------
6 files changed, 13 insertions(+), 142 deletions(-)
diff --git a/debian/clean b/debian/clean
index c348f70..aa9a2ae 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,2 @@
demo/viewer/viewer.ini
utils/mapnik-config/mapnik-config
-bindings/python/mapnik/__init__.pyc
diff --git a/debian/control b/debian/control
index 0ac7e7b..503350e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends:
scons
, debhelper (>= 9~)
, libtool
- , python-all-dev (>= 2.6.6-3~)
, libboost-filesystem-dev
, libboost-system-dev
, libboost-thread-dev
@@ -24,20 +23,16 @@ Build-Depends:
, libfreetype6-dev
, libxml2-dev
, libproj-dev
- , libboost-python-dev
, libcairo-dev
, pkg-config
- , python-cairo-dev
, libpq-dev
, libgdal-dev
, libsqlite3-dev
, libcurl4-gnutls-dev
, librasterlite-dev
, libwebp-dev
- , python-epydoc
Standards-Version: 3.9.6
Section: libs
-X-Python-Version: >= 2.5
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
@@ -49,8 +44,8 @@ Depends:
, ${misc:Depends}
, ttf-dejavu
Suggests: postgis
-Description: C++/Python toolkit for developing GIS applications (libraries)
- Mapnik is an OpenSource C++/Python toolkit for developing GIS
+Description: C++ toolkit for developing GIS applications (libraries)
+ Mapnik is an OpenSource C++ toolkit for developing GIS
(Geographic Information Systems) applications. At the core is a C++
shared library providing algorithms/patterns for spatial data access and
visualization.
@@ -59,9 +54,6 @@ Description: C++/Python toolkit for developing GIS
applications (libraries)
feature, geometry), the library doesn't rely on "windowing systems" and
is intended to work in multi-threaded environments
.
- High-level Python bindings (boost.python) facilitate rapid application
- development, targeting zope3, django, etc.
- .
This package contains the shared library and input plugins.
Package: libmapnik2-dev
@@ -71,8 +63,8 @@ Architecture: all
Depends:
libmapnik-dev
, ${misc:Depends}
-Description: C++/Python toolkit for developing GIS applications (dummy)
- Mapnik is an OpenSource C++/Python toolkit for developing GIS
+Description: C++ toolkit for developing GIS applications (dummy)
+ Mapnik is an OpenSource C++ toolkit for developing GIS
(Geographic Information Systems) applications. At the core is a C++
shared library providing algorithms/patterns for spatial data access and
visualization.
@@ -81,9 +73,6 @@ Description: C++/Python toolkit for developing GIS
applications (dummy)
feature, geometry), the library doesn't rely on "windowing systems" and
is intended to work in multi-threaded environments
.
- High-level Python bindings (boost.python) facilitate rapid application
- development, targeting zope3, django, etc.
- .
This package is a transitional package, and can be safely removed if
nobody depends on it.
@@ -109,18 +98,16 @@ Depends:
, libfreetype6-dev
, libxml2-dev
, libproj-dev
- , libboost-python-dev
, libcairo2-dev
, pkg-config
- , python-cairo-dev
, libpq-dev
, libgdal-dev
, libsqlite3-dev
, libcurl4-gnutls-dev
, librasterlite-dev
Recommends: mapnik-doc
-Description: C++/Python toolkit for developing GIS applications (devel)
- Mapnik is an OpenSource C++/Python toolkit for developing GIS
+Description: C++ toolkit for developing GIS applications (devel)
+ Mapnik is an OpenSource C++ toolkit for developing GIS
(Geographic Information Systems) applications. At the core is a C++
shared library providing algorithms/patterns for spatial data access and
visualization.
@@ -129,9 +116,6 @@ Description: C++/Python toolkit for developing GIS
applications (devel)
feature, geometry), the library doesn't rely on "windowing systems" and
is intended to work in multi-threaded environments
.
- High-level Python bindings (boost.python) facilitate rapid application
- development, targeting zope3, django, etc.
- .
This package contains the development headers, API documentation, and
build utilities.
@@ -141,11 +125,8 @@ Architecture: any
Depends:
${shlibs:Depends}
, ${misc:Depends}
- , ${python:Depends}
- , python-mapnik
- , python-lxml
-Description: C++/Python toolkit for developing GIS applications (utilities)
- Mapnik is an OpenSource C++/Python toolkit for developing GIS
+Description: C++ toolkit for developing GIS applications (utilities)
+ Mapnik is an OpenSource C++ toolkit for developing GIS
(Geographic Information Systems) applications. At the core is a C++
shared library providing algorithms/patterns for spatial data access and
visualization.
@@ -154,69 +135,17 @@ Description: C++/Python toolkit for developing GIS
applications (utilities)
feature, geometry), the library doesn't rely on "windowing systems" and
is intended to work in multi-threaded environments
.
- High-level Python bindings (boost.python) facilitate rapid application
- development, targeting zope3, django, etc.
- .
This package contains miscellaneous utilities distributed with mapnik:
.
shapeindex: program to creates file system based index for ESRI shape-files
-Package: python-mapnik
-Section: python
-Architecture: any
-Depends:
- ${shlibs:Depends}
- , ${misc:Depends}
- , ${python:Depends}
- , python-cairo
-Breaks: python-mapnik2 (<< 2.2.0+ds1-1~)
-Replaces: python-mapnik2 (<< 2.2.0+ds1-1~)
-Provides: ${python:Provides}
-Description: C++/Python toolkit for developing GIS applications (Python)
- Mapnik is an OpenSource C++/Python toolkit for developing GIS
- (Geographic Information Systems) applications. At the core is a C++
- shared library providing algorithms/patterns for spatial data access and
- visualization.
- .
- Essentially a collection of geographic objects (map, layer, datasource,
- feature, geometry), the library doesn't rely on "windowing systems" and
- is intended to work in multi-threaded environments
- .
- High-level Python bindings (boost.python) facilitate rapid application
- development, targeting zope3, django, etc.
- .
- This package contains the Python bindings.
-
-Package: python-mapnik2
-Priority: extra
-Section: oldlibs
-Architecture: all
-Depends:
- ${misc:Depends}
- , python-mapnik
-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++
- shared library providing algorithms/patterns for spatial data access and
- visualization.
- .
- Essentially a collection of geographic objects (map, layer, datasource,
- feature, geometry), the library doesn't rely on "windowing systems" and
- is intended to work in multi-threaded environments
- .
- High-level Python bindings (boost.python) facilitate rapid application
- development, targeting zope3, django, etc.
- .
- This package is a transitional package, and can be safely removed if
- nobody depends on it.
-
Package: mapnik-doc
Section: doc
Architecture: all
Recommends: libmapnik-dev
Depends: ${misc:Depends}
-Description: C++/Python toolkit for developing GIS applications (doc)
- Mapnik is an OpenSource C++/Python toolkit for developing GIS
+Description: C++ toolkit for developing GIS applications (doc)
+ Mapnik is an OpenSource C++ toolkit for developing GIS
(Geographic Information Systems) applications. At the core is a C++
shared library providing algorithms/patterns for spatial data access and
visualization.
@@ -225,7 +154,4 @@ Description: C++/Python toolkit for developing GIS
applications (doc)
feature, geometry), the library doesn't rely on "windowing systems" and
is intended to work in multi-threaded environments
.
- High-level Python bindings (boost.python) facilitate rapid application
- development, targeting zope3, django, etc.
- .
This package contains developer documentation.
diff --git a/debian/mapnik-doc.doc-base b/debian/mapnik-doc.doc-base
deleted file mode 100644
index a711eae..0000000
--- a/debian/mapnik-doc.doc-base
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: mapnik
-Title: Mapnik Python API Reference
-Abstract: This manual describes the Python API provided by Mapnik.
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/mapnik-doc/python/index.html
-Files: /usr/share/doc/mapnik-doc/python/*.html
diff --git a/debian/python-mapnik.examples b/debian/python-mapnik.examples
deleted file mode 100644
index 7d62e28..0000000
--- a/debian/python-mapnik.examples
+++ /dev/null
@@ -1 +0,0 @@
-utils/ogcserver/*
diff --git a/debian/python-mapnik.install b/debian/python-mapnik.install
deleted file mode 100644
index dce7586..0000000
--- a/debian/python-mapnik.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/python*/*-packages/mapnik/*
-usr/lib/python*/*-packages/mapnik2/*
diff --git a/debian/rules b/debian/rules
index 6ebe326..f582498 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ SCONS_FLAGS := -j1
# -O2
SCONS_FLAGS += OPTIMIZATION=2
SCONS_FLAGS += FULL_LIB_PATH=False
-SCONS_FLAGS +=
INPUT_PLUGINS=csv,gdal,geojson,ogr,osm,pgraster,postgis,python,raster,rasterlite,shape,sqlite,topojson
+SCONS_FLAGS +=
INPUT_PLUGINS=csv,gdal,geojson,ogr,osm,pgraster,postgis,raster,rasterlite,shape,sqlite,topojson
SCONS_FLAGS += PROJ_INCLUDES=/usr/include PROJ_LIBS=/usr/lib
SCONS_FLAGS += SYSTEM_FONTS=/usr/share/fonts
SCONS_FLAGS += XMLPARSER=libxml2
@@ -23,57 +23,14 @@ SCONS_FLAGS += CUSTOM_CFLAGS="$(shell dpkg-buildflags --get
CFLAGS) -g0"
SCONS_FLAGS += CUSTOM_LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS) -g0"
SCONS_FLAGS += CUSTOM_DEFINES="$(shell dpkg-buildflags --get CPPFLAGS) -g0"
-PYVERS = $(shell pyversions -r -v)
-
-override_dh_auto_configure: $(PYVERS:%=debian/stamps/configure-python%)
-debian/stamps/configure-python%:
- -mkdir build-python$*
- -mkdir debian/stamps
- cp -r bindings demo deps fonts include plugins src tests utils
SConstruct build-python$*
- touch $@
- python$* $(SCONS) -C build-python$* configure \
- $(SCONS_FLAGS) \
- CCFLAGS="$(CFLAGS)" \
- BOOST_PYTHON_LIB=boost_python-py$$(echo $* | sed 's@\.@@') \
- DESTDIR=$(CURDIR)/debian/tmp
-
-override_dh_auto_build: $(PYVERS:%=debian/stamps/build-python%)
-debian/stamps/build-python%:
- python$* $(SCONS) -C build-python$*
-
-override_dh_prep:
- dh_prep -Xdebian/tmp
-
-override_dh_auto_install: $(PYVERS:%=debian/stamps/install-python%)
-debian/stamps/install-python%:
- python$* $(SCONS) -C build-python$* install
-
override_dh_install-arch:
dh_install
mv $(CURDIR)/debian/mapnik-utils/usr/bin/upgrade_map_xml.py \
$(CURDIR)/debian/mapnik-utils/usr/bin/upgrade-map-xml
-override_dh_install-indep:
- # build Python API documentation
- # and trick epydoc into loading the shlib too
- LD_LIBRARY_PATH=$(CURDIR)/debian/libmapnik3.0/usr/lib/ epydoc
--no-private \
- --no-frames \
- --no-sourcecode \
- --name mapnik \
- --url http://mapnik.org \
- --css $(CURDIR)/utils/epydoc_config/mapnik_epydoc.css \
- $(CURDIR)/bindings/python/mapnik \
- -o $(CURDIR)/debian/mapnik-doc/usr/share/doc/mapnik-doc/python
-
-override_dh_auto_clean:
- rm -rf build-python*
- rm -rf debian/stamps
- dh_clean
-
-override_dh_auto_test: $(PYVERS:%=debian/stamps/test-python%)
-debian/stamps/test-python%:
+override_dh_auto_test:
# nothing yet
%:
- dh $@ --with python2
+ dh $@
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/mapnik.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
