[freeorion] 08/10: Update d/copyright. log4cpp is no longer included.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository freeorion.

commit f39d10baa541eeee40201c3e034f30a9912cab6e
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat Aug 8 22:30:31 2015 +0200

    Update d/copyright. log4cpp is no longer included.
---
 debian/README.source |  6 ------
 debian/changelog     |  2 ++
 debian/copyright     | 54 ----------------------------------------------------
 3 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 9105390..1a1b3f9 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -22,9 +22,3 @@ Bundled GG (libgigi) library:
   * GG is not a proper library (more like a plugin) and therefore
     not suitable for packaging as a standalone libgigi(-dev) package.
 
-log4cpp:
-
-This is a modified version of log4cpp. It is better maintained than Debian's
-package and uses some modifications which are not upstreamable and cannot be
-incorporated in Debian's package. It is therefore more reasonable to use
-FreeOrion's log4cpp version.
diff --git a/debian/changelog b/debian/changelog
index 3e2ec62..3972407 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ freeorion (0.4.5~20150803~af01c2f-1) unstable; urgency=medium
   * d/watch: Improve uversionmangle for test releases.
   * Drop GG-verbose-makefile.patch. Fixed upstream.
   * Update README.source how to retrieve the original sources.
+  * Update debian/copyright for new release.
+    - log4cpp is no longer included.
 
  -- Markus Koschany <apo at gambaru.de>  Sat, 08 Aug 2015 20:41:36 +0200
 
diff --git a/debian/copyright b/debian/copyright
index b0bc961..2ebb610 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -70,30 +70,6 @@ Copyright: 2001, Daniel C. Nuffer
            2006, T. Zachary Laine
 License: LGPL-2.1+
 
-Files: log4cpp/*
-Copyright:  2000-2001, LifeLine Networks BV (www.lifeline.nl)
-            2000-2001, Bastiaan Bakker
-            2000,      Marc Welz
-            2001,      Glen Scott
-            2001,      Walter Stroebel
-            2002,      Log4cpp Project
-            2002,      Bastiaan Bakker
-            2002,      Emiliano Martin <emilianomc at terra.es>
-            2005,      Francis ANDRE.
-License: GPL-2
-Comment:
- The FreeOrion project decided to relicense the original LGPL-2.1+ license to
- GPL-2 which is legally correct. Please refer for more information to
- http://www.freeorion.org/forum/viewtopic.php?f=25&t=7544
-
-Files: log4cpp/src/snprintf.c
-Copyright: 1999, Mark Martinec <mark.martinec at ijs.si>
-License: GPL-2
-Comment:
- This file is dual-licensed under the Frontier Artistic License or the GNU
- General Public License 2 and upstream uses GPL-2. See also
- http://www.ijs.si/software/snprintf/.
-
 Files: cmake/FindFreetype.cmake
 Copyright: 2000-2011, Kitware, Inc
 License: BSD-3-clause
@@ -103,14 +79,6 @@ Copyright: 2013-2014, Dmitry Smirnov <onlyjob at debian.org>
            2013-2015, Markus Koschany <apo at gambaru.de>
 License: LGPL-2.1+
 
-Files: debian/patches/*
-Copyright: 2013,      Dmitry Smirnov <onlyjob at debian.org>
-           2013-2015, Markus Koschany <apo at gambaru.de>
-License: LGPL-2.1+ or Expat
-Comment:
- Expat may be used when LGPL-2.1+ is incompatible with the upstream
- license of the patched file(s).
-
 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 2 as published by
@@ -169,28 +137,6 @@ License: LGPL-2.1+
  The complete text of the GNU Library General Public License
  can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
 
-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.
-Comment:
- This license is also known as "MIT" however FSF considers "MIT" labelling
- ambiguous and copyright-format specification recommend to label such a license
- as "Expat".
-
 License: BSL-1.0
  Boost Software License - Version 1.0 - August 17th, 2003
  .

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