The following commit has been merged in the master branch:
commit 864419bfb8a3e412b795d8edbf36854d4457d675
Author: David Paleino <da...@debian.org>
Date:   Tue Jan 11 09:57:05 2011 +0100

    Fix copyright file

diff --git a/debian/copyright b/debian/copyright
index f761f82..7291d90 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,53 +1,104 @@
-This work was packaged for Debian by:
-
-    David Paleino <da...@debian.org> on Wed, 01 Sep 2010 13:21:17 +0200
-
-It was downloaded from:
-
-    <url://example.com>
-
-Upstream Author(s):
-
-    <put author's name and email here>
-    <likewise for another author>
-
-Copyright:
-
-    <Copyright (C) YYYY Firstname Lastname>
-    <likewise for another author>
-
-License:
-
-### SELECT: ###
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-### OR ###
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
-##########
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-The Debian packaging is:
-
-    Copyright (C) 2010 David Paleino <da...@debian.org>
-
-you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
+Format-Specification: http://dep.debian.net/deps/dep5
+Upstream-Name: MoNav
+
+Files: client/fullscreenexitbutton.h
+Copyright: © 2009, Nokia Corporation and/or its subsidiary(-ies) 
<qt-i...@nokia.com>
+License: LGPL-2.1 + Nokia Qt LGPL Exception 1.1
+
+Files: client/logger.{cpp,h}
+Copyright: © 2010, Christoph Eckert <c...@christeck.de>
+License: GPL-3+
+
+Files: debian/*
+Copyright: © 2010-2011, David Paleino <da...@debian.org>
+License: GPL-3+
+
+Files: plugins/osmimporter/lzma/*
+Copyright: Igor Pavlov
+License: PD
+
+Files: plugins/osmrenderer/agg2/*
+Copyright: © 2002-2006, Maxim Shemanarev <mcs...@antigrain.com>
+License: GPL-2+
+
+Files: routingdaemon/qtservice-2.6_1-opensource/*
+Copyright: © 2009, Nokia Corporation and/or its subsidiary(-ies) 
<qt-i...@nokia.com>
+License: LGPL-2.1 + Nokia Qt LGPL Exception 1.1 | GPL-3+
+
+Files: *
+Copyright: © 2010, Christian Vetter <veaac.fdi...@gmail.com>
+License: GPL-3+
+
+License: LGPL-2.1 + Nokia Qt LGPL Exception 1.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; version
+ 2.1 of the License.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+Exception:
+ As an additional permission to the GNU Lesser General Public License version
+ 2.1, the object code form of a "work that uses the Library" may incorporate
+ material from a header file that is part of the Library.  You may distribute
+ such object code under terms of your choice, provided that:
+ .
+     (i)   the header files of the Library have not been modified; and 
+     (ii)  the incorporated material is limited to numerical parameters, data
+           structure layouts, accessors, macros, inline functions and
+           templates; and
+     (iii) you comply with the terms of Section 6 of the GNU Lesser General
+           Public License version 2.1.
+ .
+ Moreover, you may apply this exception to a modified version of the Library,
+ provided that such modification does not involve copying material from the
+ Library into the modified Library's header files unless such material is
+ limited to (i) numerical parameters; (ii) data structure layouts;
+ (iii) accessors; and (iv) small macros, templates and inline functions of
+ five lines or less in length.
+ .
+ .
+ Furthermore, you are not required to apply this additional permission to a
+ modified version of the Library.
+X-Comment: on Debian systems, the complete text of the GNU Lesser General
+ Public License version 2.1 can be found in 
"/usr/share/common-licenses/LGPL-2.1".
+ .
+ The exception was taken from
+ <http://qt.gitorious.org/qt/qt/blobs/4.6/LGPL_EXCEPTION.txt>.
+
+License: GPL-3+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+X-Comment: on Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+X-Comment: on Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

-- 
fast navigation system featuring exact routing

_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-osm-commits

Reply via email to