The following commit has been merged in the master branch: commit 48aefe8c979fede76e0fed23a055552efe34cf5a Author: David Paleino <da...@debian.org> Date: Thu Mar 25 19:00:27 2010 +0100
03-fix_typo.patch removed, merged upstream diff --git a/debian/changelog b/debian/changelog index 1586fe0..2904e8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ mapnik (0.7.1-1) UNRELEASED; urgency=low added in upstream code - 02-fix_FTBFS_binutils-gold.patch refreshed to apply to the new code + - 03-fix_typo.patch removed, merged upstream - -- David Paleino <da...@debian.org> Thu, 25 Mar 2010 18:59:32 +0100 + -- David Paleino <da...@debian.org> Thu, 25 Mar 2010 19:00:09 +0100 mapnik (0.7.0-2) unstable; urgency=low diff --git a/debian/patches/03-fix_typo.patch b/debian/patches/03-fix_typo.patch deleted file mode 100644 index 7006289..0000000 --- a/debian/patches/03-fix_typo.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 bb8bf61..29bb7a5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 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