[SCM] mapnik branch, master, updated. debian/2.2.0+ds1-1-2-g1a39768
The following commit has been merged in the master branch: commit 1a3976896b4e2b57fdb14cc07c317fc0b6baf1e1 Author: Jérémy Lal kapo...@melix.org Date: Sun Sep 8 02:19:16 2013 +0200 Update changelog diff --git a/debian/changelog b/debian/changelog index afa82b5..fa98878 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mapnik (2.2.0+ds1-2) unstable; urgency=low + + * Build documentation in -indep target. (Closes: #721579) + + -- Jérémy Lal kapo...@melix.org Sun, 08 Sep 2013 13:34:41 +0200 + mapnik (2.2.0+ds1-1) unstable; urgency=low [ Andrew Harvey ] -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.2.0+ds1-1-2-g1a39768
The following commit has been merged in the master branch: commit 1d06abf8c4c39e804e7740fbd31e8a2cfab4117b Author: Jérémy Lal kapo...@melix.org Date: Sun Sep 8 02:14:24 2013 +0200 Build documentation in override_dh_install-indep diff --git a/debian/rules b/debian/rules index ff0d668..9688e55 100755 --- a/debian/rules +++ b/debian/rules @@ -49,22 +49,22 @@ override_dh_auto_install: install ; \ done -override_dh_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/libmapnik2.2/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 + --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: scons --clean $(SCONS_FLAGS) -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
