The following commit has been merged in the master branch: commit 8dd7835c18ae502637063ed58444a9112bd6b1d6 Author: David Paleino <da...@debian.org> Date: Sun Feb 21 09:27:13 2010 +0100
03-fix_typo.patch added diff --git a/debian/changelog b/debian/changelog index d5b2876..2d1765d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ mapnik (0.7.0-1) UNRELEASED; urgency=low - 01-generate_local_docs.patch added, tell epydoc to generate docs from local code, don't look for a system-wide module. - 02-fix_FTBFS_binutils-gold.patch added (Closes: #555586) + - 03-fix_typo.patch added * debian/copyright, substitute (C) with © to make lintian happy * debian/mapnik-doc.doc-base added * debian/libmapnik-dev.dirs added @@ -38,7 +39,7 @@ mapnik (0.7.0-1) UNRELEASED; urgency=low * debian/compat bumped to 7 * debian/copyright updated to be DEP-5-compliant - -- David Paleino <da...@debian.org> Sun, 21 Feb 2010 00:04:41 +0100 + -- David Paleino <da...@debian.org> Sun, 21 Feb 2010 09:26:40 +0100 mapnik (0.6.1-1) unstable; urgency=low diff --git a/debian/patches/03-fix_typo.patch b/debian/patches/03-fix_typo.patch new file mode 100644 index 0000000..7006289 --- /dev/null +++ b/debian/patches/03-fix_typo.patch @@ -0,0 +1,23 @@ +From: David Paleino <da...@debian.org> +Subject: fix typo in sourcecode, thanks to lintian +Forwarded: no + +--- + plugins/input/kismet/kismet_datasource.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- mapnik.orig/plugins/input/kismet/kismet_datasource.cpp ++++ mapnik/plugins/input/kismet/kismet_datasource.cpp +@@ -82,10 +82,10 @@ kismet_datasource::kismet_datasource(par + //cout << "kismet_datasource::kismet_datasource()" << endl; + + boost::optional<std::string> host = params.get<std::string>("host"); +- if (!host) throw datasource_exception("missing <host> paramater"); ++ if (!host) throw datasource_exception("missing <host> parameter"); + + boost::optional<std::string> port = params.get<std::string>("port"); +- if (!port) throw datasource_exception("missing <port> paramater"); ++ if (!port) throw datasource_exception("missing <port> parameter"); + + unsigned int portnr = atoi ((*port).c_str () ); + kismet_thread.reset (new boost::thread (boost::bind (&kismet_datasource::run, this, *host, portnr))); diff --git a/debian/patches/series b/debian/patches/series index 29bb7a5..bb8bf61 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 01-generate_local_docs.patch 02-fix_FTBFS_binutils-gold.patch +03-fix_typo.patch -- C++/Python toolkit for developing GIS applications _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel