[Pkg-osm-commits] [SCM] monav branch, master, updated. debian/0.3-5-5-g7335b21

[David Paleino]

The following commit has been merged in the master branch:
commit ba151b5e14ed6ecb29d3b1367ca5de857f108c04
Author: David Paleino <dapal at debian.org>
Date:   Tue Oct 25 23:46:09 2011 +0200

    Make debian/copyright conformant to latest DEP-5

diff --git a/debian/changelog b/debian/changelog
index 4f25cf0..1dfcb2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monav (0.3-7) UNRELEASED; urgency=low
+
+  * Make debian/copyright conformant to latest DEP-5
+
+ -- David Paleino <dapal at debian.org>  Tue, 25 Oct 2011 23:45:59 +0200
+
 monav (0.3-6) unstable; urgency=low
 
   * Port code to Mapnik2 (Closes: #646452)
diff --git a/debian/copyright b/debian/copyright
index 5e7bc96..96bb502 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format-Specification: http://dep.debian.net/deps/dep5
+Format: http://dep.debian.net/deps/dep5
 Upstream-Name: MoNav
 
 Files: *
@@ -11,14 +11,21 @@ License: LGPL-2.1 + Nokia Qt LGPL Exception 1.1
 
 Files: client/gpsdpositioninfosource.{cpp,h}
 Author: Till Harbaum <till at harbaum.org>
-License: PD
-
-Files: client/json.{cpp,h}
+License: public-domain
+ /****************************************************************************
+ ** GpsdPositionInfoSource
+ ** (c) 2011 by Till Harbaum <till at harbaum.org>
+ ** This code is public domain, do what you want with it
+ ****************************************************************************/
+
+Files: client/json.cpp
+ client/json.h
 Copyright: © 2010, Eeli Reilin <eeli at nilier.org>
  © 2010, Mikko Ahonen <mikko.j.ahonen at jyu.fi>
 License: MIT
 
-Files: client/logger.{cpp,h}
+Files: client/logger.cpp
+ client/logger.h
 Copyright: © 2010, Christoph Eckert <ce at christeck.de>
 License: GPL-3+
 
@@ -37,7 +44,8 @@ License: LGPL-3+
 
 Files: images/world/*
 Author: Natural Earth <http://www.naturalearthdata.com/>
-License: PD
+License: public-domain
+ These images are derived from "Natural Earth" and placed in public domain
 
 Files: plugins/osmrenderer/agg2/*
 Copyright: © 2002-2006, Maxim Shemanarev <mcseem at antigrain.com>
@@ -45,11 +53,13 @@ License: GPL-2+
 
 Files: routingdaemon/qtservice-2.6_1-opensource/*
 Copyright: © 2009, Nokia Corporation and/or its subsidiary(-ies) <qt-info at nokia.com>
-License: LGPL-2.1 + Nokia Qt LGPL Exception 1.1 | GPL-3+
+License: LGPL-2.1 + Nokia Qt LGPL Exception 1.1 or GPL-3+
 
 Files: utils/lzma/*
 Author: Igor Pavlov
-License: PD
+License: public-domain
+ [..]
+ 2009-04-22 : Igor Pavlov : Public domain */
 
 License: LGPL-2.1 + Nokia Qt LGPL Exception 1.1
  This library is free software; you can redistribute it and/or

-- 
fast navigation system featuring exact routing