[blobby] 02/03: Remove obsolete/duplicate sections from the copyright file.

Felix Geyer fgeyer at moszumanska.debian.org
Sun Apr 26 17:46:56 UTC 2015


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

fgeyer pushed a commit to branch master
in repository blobby.

commit 369efb47fc6243977ee44fc265f9d7c0ee80352f
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Apr 26 19:44:47 2015 +0200

    Remove obsolete/duplicate sections from the copyright file.
---
 debian/changelog |  1 +
 debian/copyright | 46 ++--------------------------------------------
 2 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e35641..9061ad9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ blobby (1.0-2) UNRELEASED; urgency=medium
     - d/patches/09_reproducible_build.patch: Don't store the atime of files
       in zip archives.
     - d/rules: Don't store mtime in png files.
+  * Remove obsolete/duplicate sections from the copyright file.
 
  -- Felix Geyer <fgeyer at debian.org>  Sun, 26 Apr 2015 19:26:58 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 5c90546..9a90c63 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,8 +7,6 @@ Files: *
 Copyright: 2006, Jonathan Sieber <jonathan_sieber at yahoo.de>
            2006, Daniel Knobe <daniel-knobe at web.de>
 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'.
 
 Files: src/lua/*
 Copyright: 1994-2008, Lua.org, PUC-Rio.
@@ -55,48 +53,6 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: src/raknet/Rand.*
-Copyright: 1997, Makoto Matsumoto and Takuji Nishimura
-License: LGPL-2+
- On Debian systems, the complete text of the GNU Library General
- Public License can be found in `/usr/share/common-licenses/LGPL-2'.
-
-Files: src/raknet/SHA1.*
-Copyright: Public domain
-License: public-domain
- No license as the code is in public domain.
-
-Files: src/raknet/rijndael*
-Copyright: 1999-2000, Enhanced Software Technologies Inc.
-License: BSD-4-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. 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.
- 3. All advertising materials mentioning features or use of this software
-    must display the following acknowledgement:
-    This product includes software developed by Enhanced Software
-    Technologies Inc. and its contributors.
- 4. Neither the name of the Company 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 COMPANY AND CONTRIBUTORS ``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 COMPANY OR CONTRIBUTORS 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.
-
 Files: src/tinyxml/*
 Copyright: 2000-2007, Lee Thomason <leethomason at mindspring.com>
            2002-2004, Yves Berquin <yvesb at users.sourceforge.net>
@@ -111,6 +67,8 @@ License: Zlib
 Files: debian/*
 Copyright: 2009-2012, Felix Geyer <debfx-pkg at fobos.de>
 License: GPL-2+
+
+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'.
 

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



More information about the Pkg-games-commits mailing list