[qmapshack] 01/02: Follow SPDX compatibility.

[Jaromír Mikeš]

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

mira-guest pushed a commit to branch master
in repository qmapshack.

commit fd6783f0765d7cf732f4a6e413f7602f544ffdea
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Aug 17 20:47:42 2014 +0200

    Follow SPDX compatibility.
---
 debian/copyright | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index dd3b891..38a75bb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,29 +1,29 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: QMapShack
 Upstream-Contact: Oliver Eichler <oliver.eichler at gmx.de>
-Source:  https://bitbucket.org/maproom/qmapshack/wiki/Home
+Source: https://bitbucket.org/maproom/qmapshack/wiki/Home
 Copyright: 2006-2014 Oliver Eichler <oliver.eichler at gmx.de>
 Files-Excluded: .hg/*
 
 Files: *
 Copyright:
  2006-2014 Oliver Eichler <oliver.eichler at gmx.de>
-License: GPL-3+
+License: GPL-3.0+
 
 Files: debian/*
 Copyright:
  2014 Jaromír Mikeš <mira.mikes at seznam.cz>
-License: GPL-3+
+License: GPL-3.0+
 
 Files:
  src/helpers/Platform.h
 Copyright:
  2009 Albrecht Dre <albrecht.dress at arcor.de>
-License: GPL-3+
+License: GPL-3.0+
 
 Files: src/helpers/CAppOpts.h
 Copyright: 2009, Joerg Wunsch <j at uriah.heep.sax.de>
-License: GPL-3+
+License: GPL-3.0+
 
 Files:
  src/GeoMath.cpp
@@ -38,14 +38,14 @@ Files:
  src/units/IUnit.h
 Copyright:
  2008-2009 Oliver Eichler <oliver.eichler at gmx.de>
-License: GPL-2+
+License: GPL-2.0+
 
 Files:
  3rdparty/getopt/CGetOpt.h
  3rdparty/getopt/CGetOpt.cpp
 Copyright:
  2003-2004 froglogic Porten & Stadlbauer GbR
-License: BSD (3 clause)
+License: BSD-3-Clause
 
 Files:
  src/icons/cache/*
@@ -57,14 +57,14 @@ Files:
  src/animation/*
 Copyright:
  *No copyright*
-License: WTFPL-2
+License: WTFPL
 
 Files: src/helpers/CTextEditWidget.cpp
  src/helpers/CTextEditWidget.h
 Copyright: 2012, Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+License: QT_COMMERICIAL or GPL-3 or LGPL-2.1 with Digia Qt LGPL Exception 1.1
 
-License: GPL-3+
+License: GPL-3.0+
  This program 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
@@ -80,7 +80,7 @@ Comment: You should have received a copy of the GNU General Public License
  On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-3'.
 
-License: GPL-2+
+License: GPL-2.0+
  This program 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
@@ -96,7 +96,7 @@ Comment: You should have received a copy of the GNU General Public License
  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)
+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:
@@ -140,7 +140,13 @@ Comment: You should have received a copy of the GNU General Public License
  On Debian systems, the full text of the e Apache License, Version 2.0
  can be found in the file `/usr/share/common-licenses/Apache-2.0'.
 
-License: WTFPL-2
+License: WTFPL
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ .
+ Version 2, December 2004
+ .
+ Copyright (C) 2004 Sam Hocevar <sam at hocevar.net>
+ .
  Everyone is permitted to copy and distribute verbatim or modified
  copies of this license document, and changing it is allowed as long
  as the name is changed.
@@ -152,7 +158,7 @@ License: WTFPL-2
  .
  see <http://www.wtfpl.net/>.
 
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+License: QT_COMMERICIAL or GPL-3 or LGPL-2.1 with Digia Qt LGPL Exception 1.1
  $QT_BEGIN_LICENSE:LGPL$
  Commercial License Usage
  Licensees holding valid commercial Qt licenses may use this file in

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