[Pkg-osm-commits] [SCM] monav branch, master, updated. debian/0.3-6-12-g852bf54

[Jérémy Lal]

The following commit has been merged in the master branch:
commit 7208fdb79be340f028c9dabe0eef92c8737a3c8b
Author: Jérémy Lal <kapouer at melix.org>
Date:   Wed Aug 28 23:39:57 2013 +0200

    Some copyright-1.0 fixes

diff --git a/debian/copyright b/debian/copyright
index 96bb502..70c3f77 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: MoNav
 
 Files: *
@@ -9,20 +9,16 @@ Files: client/fullscreenexitbutton.h
 Copyright: © 2009, Nokia Corporation and/or its subsidiary(-ies) <qt-info at nokia.com>
 License: LGPL-2.1 + Nokia Qt LGPL Exception 1.1
 
-Files: client/gpsdpositioninfosource.{cpp,h}
-Author: Till Harbaum <till at harbaum.org>
+Files: client/gpsdpositioninfosource.*
+Copyright: 2011 Till Harbaum <till at harbaum.org>
 License: public-domain
- /****************************************************************************
- ** GpsdPositionInfoSource
- ** (c) 2011 by Till Harbaum <till at harbaum.org>
- ** This code is public domain, do what you want with it
- ****************************************************************************/
+ 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
+License: Expat
 
 Files: client/logger.cpp
  client/logger.h
@@ -43,7 +39,7 @@ Copyright: © 2007, David Vignoni <david at icon-king.com>
 License: LGPL-3+
 
 Files: images/world/*
-Author: Natural Earth <http://www.naturalearthdata.com/>
+Copyright: none, Made with Natural Earth
 License: public-domain
  These images are derived from "Natural Earth" and placed in public domain
 
@@ -56,10 +52,9 @@ Copyright: © 2009, Nokia Corporation and/or its subsidiary(-ies) <qt-info at nokia
 License: LGPL-2.1 + Nokia Qt LGPL Exception 1.1 or GPL-3+
 
 Files: utils/lzma/*
-Author: Igor Pavlov
+Copyright: 1999-2011 Igor Pavlov
 License: public-domain
- [..]
- 2009-04-22 : Igor Pavlov : Public domain */
+ As expressed in the headers of the files.
 
 License: LGPL-2.1 + Nokia Qt LGPL Exception 1.1
  This library is free software; you can redistribute it and/or
@@ -152,7 +147,7 @@ X-Comment: on Debian systems, the complete text of the GNU Lesser
  General Public License version 3 can be found in
  "/usr/share/common-licenses/LGPL-3".
 
-License: MIT
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights

-- 
fast navigation system featuring exact routing