diff -u mapnik-0.5.1/debian/control mapnik-0.5.1/debian/control --- mapnik-0.5.1/debian/control +++ mapnik-0.5.1/debian/control @@ -1,10 +1,12 @@ Source: mapnik Priority: optional -Maintainer: Dominic Hargreaves -Build-Depends: libboost-thread-dev (>= 1.34.0), libboost-filesystem-dev (>= 1.34.0), libboost-regex-dev (>= 1.34.0), libboost-program-options-dev (>= 1.34.0), libboost-python-dev (>= 1.34.1-9), libpng12-dev, libjpeg62-dev, libtiff4-dev, zlib1g-dev, libfreetype6-dev, libpq-dev, proj, libltdl3-dev, libfribidi-dev, python, debhelper (>= 5.0.38), python2.5-dev, python-central (>= 0.5.6), libgdal1-dev, libxml2-dev, libagg-dev, libboost-iostreams-dev (>= 1.34.0), libagg-dev +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Dominic Hargreaves +Build-Depends: libboost-thread-dev (>= 1.34.0), libboost-filesystem-dev (>= 1.34.0), libboost-regex-dev (>= 1.34.0), libboost-program-options-dev (>= 1.34.0), libboost-python-dev (>= 1.34.1-9), libpng12-dev, libjpeg62-dev, libtiff4-dev, zlib1g-dev, libfreetype6-dev, libpq-dev, proj, libltdl7-dev, libfribidi-dev, python, debhelper (>= 5.0.38), python2.5-dev, python-central (>= 0.5.6), libgdal1-dev, libxml2-dev, libagg-dev, libboost-iostreams-dev (>= 1.34.0), quilt Standards-Version: 3.8.0 Section: libs XS-Python-Version: 2.5 +Homepage: http://www.mapnik.org/ Package: libmapnik0.5 Section: libs @@ -37,7 +39,7 @@ Package: libmapnik-dev Section: libdevel Architecture: all -Depends: libmapnik0.5 (>= ${source:Version}), libmapnik0.5 (<< ${source:Version}.1~), libboost-thread-dev, libboost-filesystem-dev, libboost-regex-dev, libboost-program-options-dev, libboost-python-dev, libpng12-dev, libjpeg62-dev, libtiff4-dev, zlib1g-dev, libfreetype6-dev, libpq-dev, proj, libltdl3-dev, libfribidi-dev, libc6-dev | libc-dev +Depends: libmapnik0.5 (>= ${source:Version}), libmapnik0.5 (<< ${source:Version}.1~), libboost-thread-dev, libboost-filesystem-dev, libboost-regex-dev, libboost-program-options-dev, libboost-python-dev, libpng12-dev, libjpeg62-dev, libtiff4-dev, zlib1g-dev, libfreetype6-dev, libpq-dev, proj, libltdl7-dev, libfribidi-dev, libc6-dev | libc-dev Description: C++/Python toolkit for developing GIS applications (devel) Mapnik is an OpenSource C++/Python toolkit for developing GIS (Geographic Information Systems) applications. At the core is a C++ diff -u mapnik-0.5.1/debian/rules mapnik-0.5.1/debian/rules --- mapnik-0.5.1/debian/rules +++ mapnik-0.5.1/debian/rules @@ -9,6 +9,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/quilt/quilt.make + GDAL_LIBNAME=$(subst -l,,$(filter -lgdal%,$(shell gdal-config --libs))) # scons flags @@ -31,14 +33,14 @@ build: build-stamp -build-stamp: configure-stamp +build-stamp: patch configure-stamp dh_testdir # Add here commands to compile the package. python scons/scons.py $(SCONS_FLAGS) touch $@ -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp configure-stamp diff -u mapnik-0.5.1/debian/changelog mapnik-0.5.1/debian/changelog --- mapnik-0.5.1/debian/changelog +++ mapnik-0.5.1/debian/changelog @@ -1,3 +1,18 @@ +mapnik (0.5.1-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #295573), remaining changes: + + debian/control: + - build-dep on libltdl7-dev instead of libltdl3-dev. + - change libltdl3-dev to libltdl7-dev in libmapnik-dev Depends field. + + Add quilt support. + + Add libtool2_2.diff patch, fix FTBFS (LP: #270686). + * New Ubuntu change: + + debian/control: + - add Homepage field + - remove libagg-dev from Build-Depends because it was added twice + + -- Iulian Udrea Wed, 05 Nov 2008 04:33:35 +0000 + mapnik (0.5.1-3) unstable; urgency=low * Link against system agg library (closes: #493786) required for... @@ -6,6 +21,16 @@ -- Dominic Hargreaves Sat, 9 Aug 2008 18:13:25 +0100 +mapnik (0.5.1-2ubuntu1) intrepid; urgency=low + + * debian/control: build-dep on libltdl7-dev instead of libltdl3-dev. + * debian/control: change libltdl3-dev to libltdl7-dev in libmapnik-dev Depends + field. + * Add quilt support. + * Add libtool2_2.diff patch, fix FTBFS (LP: #270686). + + -- Devid Antonio Filoni Wed, 17 Sep 2008 20:39:09 +0200 + mapnik (0.5.1-2) unstable; urgency=low * Update mapnik-utils extended description to fix formatting problem only in patch2: unchanged: --- mapnik-0.5.1.orig/debian/patches/libtool2_2.diff +++ mapnik-0.5.1/debian/patches/libtool2_2.diff @@ -0,0 +1,14 @@ +Index: mapnik-0.5.1/include/mapnik/plugin.hpp +=================================================================== +--- mapnik-0.5.1.orig/include/mapnik/plugin.hpp 2008-09-17 20:46:56.598535454 +0200 ++++ mapnik-0.5.1/include/mapnik/plugin.hpp 2008-09-17 20:47:29.278542547 +0200 +@@ -29,7 +29,8 @@ + // stl + #include + +-typedef struct lt_dlhandle_struct * lt_dlhandle; ++#include ++ + namespace mapnik + { + class PluginInfo : boost::noncopyable only in patch2: unchanged: --- mapnik-0.5.1.orig/debian/patches/series +++ mapnik-0.5.1/debian/patches/series @@ -0,0 +1 @@ +libtool2_2.diff