[mkgmap] 11/14: Update copyright file.
Bas Couwenberg
sebastic at xs4all.nl
Sun Dec 14 15:39:47 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository mkgmap.
commit df5f05d474e3fe91d9d455a298953f52d4cb592d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Dec 14 15:47:18 2014 +0100
Update copyright file.
Changes:
- Include additional author in general Files section
- Add Files section for scripts/gmapi-builder.py and BSD-3-Clause License
---
debian/changelog | 3 +++
debian/copyright | 45 +++++++++++++++++++++++++++++++++++----------
2 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f946b33..3d78e00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ mkgmap (0.0.0+svn3366-1) UNRELEASED; urgency=medium
* Add Upstream-Contact header to copyright file.
* Add patch to fix 'completely' typo in man page.
* Add patch to fix hyphen-used-as-minus-sign in man page.
+ * Update copyright file, changes:
+ - Include additional author in general Files section
+ - Add Files section for scripts/gmapi-builder.py and BSD-3-Clause License
-- Bas Couwenberg <sebastic at xs4all.nl> Sun, 14 Dec 2014 00:44:16 +0100
diff --git a/debian/copyright b/debian/copyright
index 7357de0..738296f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,20 +4,22 @@ Upstream-Name: mkgmap
Source: http://www.mkgmap.org.uk/download/
Files: *
-Copyright: © 2007-2014 Steve Ratcliffe <sr at parabola.me.uk>
+Copyright: 2006-2014, Steve Ratcliffe <sr at parabola.me.uk>
+ 2009, Bernhard Heibler
+ 2009, Christian Gawron
+ 2009, Clinton Gladstone
+ 2009, Toby Speight
+ 2010, Jeffrey C. Ollie
License: GPL-2+
-Files: src/uk/me/parabola/mkgmap/general/MapPointMultimap.java
- src/uk/me/parabola/mkgmap/general/MapPointFastFindMap.java
- src/uk/me/parabola/mkgmap/build/LocatorConfig.java
- src/uk/me/parabola/mkgmap/build/Locator.java
-Copyright: 2009 Bernhard Heibler
-License: GPL-2+
+Files: scripts/gmapi-builder.py
+Copyright: 2009, Berteun Damman
+License: BSD-3-Clause
Files: debian/*
-Copyright: 2008 Andreas Putzo <andreas at putzo.net>
- 2009 Francesco Paolo Lovergine <frankie at debian.org>
- 2014 Andreas Tille <tille at debian.org>
+Copyright: 2008, Andreas Putzo <andreas at putzo.net>
+ 2009, Francesco Paolo Lovergine <frankie at debian.org>
+ 2014, Andreas Tille <tille at debian.org>
License: GPL-2+
License: GPL-2+
@@ -37,3 +39,26 @@ License: GPL-2+
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the OpenStreetMap Project nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git
More information about the Pkg-grass-devel
mailing list