[routino] 04/13: Update copyright file.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository routino.

commit f45dd1426eaba5beaa40dbd93370adb82f6e5461
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 13 11:32:36 2015 +0200

    Update copyright file.
    
    Changes:
    - Update copyright years for Andrew M. Bishop
    - Add license & copyright for mman-win32.{c,h}
---
 debian/changelog |  3 +++
 debian/copyright | 26 +++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 046aba7..488d8d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ routino (3.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
     Adds libroutino for QMapShack and other programs.
+  * Update copyright file, changes:
+    - Update copyright years for Andrew M. Bishop
+    - Add license & copyright for mman-win32.{c,h}
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 13 Sep 2015 10:47:14 +0200
 
diff --git a/debian/copyright b/debian/copyright
index b26846a..535247d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,9 +4,14 @@ Upstream-Contact: Andrew M. Bishop <amb at gedanken.demon.co.uk>
 Source: http://www.routino.org/download/
 
 Files: *
-Copyright: 2008-2014, Andrew M. Bishop <amb at gedanken.demon.co.uk>
+Copyright: 2008-2015, Andrew M. Bishop <amb at gedanken.demon.co.uk>
 License: AGPL-3+
 
+Files: src/mman-win32.c
+ src/mman-win32.h
+Copyright: 2010, 2012, Viktor Kutuzov
+License: Expat
+
 Files: debian/*
 Copyright: 2010, Thibaut Gridel <tgridel at free.fr>
 License: GPL-3+
@@ -26,6 +31,25 @@ License: GPL-3+
  version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
 
+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
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
 License: AGPL-3+
                      GNU AFFERO GENERAL PUBLIC LICENSE
                         Version 3, 19 November 2007

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/routino.git