[qmapshack] 16/18: Restructure copyright file.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat Mar 7 14:36:19 UTC 2015 

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

sebastic pushed a commit to branch master
in repository qmapshack.

commit 3863779684819d4ce6631043786a12d4a07184e0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 7 14:01:40 2015 +0100

    Restructure copyright file.
---
 debian/copyright | 117 +++++++++++++++++++++++++------------------------------
 1 file changed, 53 insertions(+), 64 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e4d0997..6d08e64 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,26 +2,21 @@ 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/downloads
-Copyright: 2006-2014, Oliver Eichler <oliver.eichler at gmx.de>
 Files-Excluded: .hg/*
 
 Files: *
-Copyright:
- 2006-2009, 2012, 2014, Oliver Eichler <oliver.eichler at gmx.de>
-License: GPL-3.0+
+Copyright: 2006-2009, 2012, 2014, Oliver Eichler <oliver.eichler at gmx.de>
+License: GPL-3+
 
-Files:
- src/helpers/Platform.h
-Copyright:
- 2009, Albrecht Dre <albrecht.dress at arcor.de>
-License: GPL-3.0+
+Files: src/helpers/Platform.h
+Copyright: 2009, Albrecht Dreß <albrecht.dress at arcor.de>
+License: GPL-3+
 
 Files: src/helpers/CAppOpts.h
 Copyright: 2009, Joerg Wunsch <j at uriah.heep.sax.de>
-License: GPL-3.0+
+License: GPL-3+
 
-Files:
- src/GeoMath.cpp
+Files: src/GeoMath.cpp
  src/GeoMath.h
  src/units/CUnitImperial.cpp
  src/units/CUnitImperial.h
@@ -31,33 +26,28 @@ Files:
  src/units/CUnitNautic.h
  src/units/IUnit.cpp
  src/units/IUnit.h
-Copyright:
- 2008-2009, Oliver Eichler <oliver.eichler at gmx.de>
-License: GPL-2.0+
+Copyright: 2008-2009, Oliver Eichler <oliver.eichler at gmx.de>
+License: GPL-2+
 
-Files:
- 3rdparty/CGetOpt/CGetOpt.h
+Files: 3rdparty/CGetOpt/CGetOpt.h
  3rdparty/CGetOpt/CGetOpt.cpp
-Copyright:
- 2003-2004, froglogic Porten & Stadlbauer GbR
+Copyright: 2003-2004, froglogic Porten & Stadlbauer GbR
 License: BSD-3-Clause
 
-Files:
- src/icons/cache/*
-Copyright:
- *No copyright*
+Files: src/icons/cache/*
+Copyright: *No copyright*
+Comment: All icons in this directory are from the Open Cache Manager project
+ http://opencachemanage.sourceforge.net/
 License: Apache-2.0
 
-Files:
- src/animation/*
-Copyright:
- *No copyright*
+Files: src/animation/*
+Copyright: *No copyright*
+Comment: Loading indicators are from:
+ http://ajaxload.info/
 License: WTFPL-2
 
-Files:
- src/cursors/*
-Copyright:
- *No copyright*
+Files: src/cursors/*
+Copyright: disclaimed
 License: public-domain
  Released to Public Domain
  .
@@ -70,14 +60,13 @@ License: public-domain
 Files: src/helpers/CTextEditWidget.cpp
  src/helpers/CTextEditWidget.h
 Copyright: 2012, Digia Plc and/or its subsidiary(-ies)
-License: QT-Commercial or GPL-3.0 or LGPL-2.1 with Digia Qt LGPL Exception 1.1
+License: QT-Commercial or GPL-3 or LGPL-2.1 with Digia Qt LGPL Exception 1.1
 
 Files: debian/*
-Copyright:
- 2014, Jaromír Mikeš <mira.mikes at seznam.cz>
-License: GPL-3.0+
+Copyright: 2014, Jaromír Mikeš <mira.mikes at seznam.cz>
+License: GPL-3+
 
-License: GPL-3.0+
+License: GPL-3+
  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
@@ -87,27 +76,41 @@ License: GPL-3.0+
  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.
-Comment: You should have received a copy of the GNU General Public License
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+ .
+ This program 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 can be found in `/usr/share/common-licenses/GPL-3'.
 
-License: GPL-2.0+
- This program is free software: you can redistribute it and/or modify
+License: GPL-2+
+ 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
+ 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,
+ This program 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.
-Comment: 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 can be found in `/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
 
 License: BSD-3-Clause
  Redistribution and use in source and binary forms, with or without
@@ -141,17 +144,17 @@ License: Apache-2.0
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
  .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ .
  See the License for the specific language governing permissions and
  limitations under the License.
  .
-Comment: You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.apache.org/licenses/LICENSE-2.0>.
- .
- 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'.
+ On Debian systems, the complete text of the Apache License version 2
+ an be found in the `/usr/share/common-licenses/Apache-2.0' file.
 
 License: WTFPL-2
  DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
@@ -214,17 +217,3 @@ License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
 
-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 version 3 as published
- by the Free Software Foundation.
- .
- This program 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.
-Comment: 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 can be found in `/usr/share/common-licenses/GPL-3'.

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

More information about the Pkg-grass-devel mailing list