[freeorion] 30/33: Update copyright file and fix COMMIT variable

Fri Mar 27 22:27:31 UTC 2015

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

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

commit 3d60a4a44f324f15144558fac1f9f656b7b12dfd
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Mar 27 17:25:31 2015 +0100

    Update copyright file and fix COMMIT variable
---
 debian/copyright | 68 --------------------------------------------------------
 debian/rules     |  2 +-
 2 files changed, 1 insertion(+), 69 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index cb582c0..9a76d7d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -59,40 +59,17 @@ Copyright: 2005-2007, Adobe Systems Incorporated
            2008,      T. Zachary Laine
 License: BSL-1.0
 
-Files: UI/EntityRenderer.cpp
-       PagedGeometry/*
-Copyright: 2006, John Judnich
-License: Zlib
-
-Files: OpenSteer/*
-Copyright: 2002-2005, Sony Computer Entertainment America
-License: Expat
-
 Files: GG/GG/utf8/checked.h
        GG/GG/utf8/core.h
        GG/GG/utf8/unchecked.h
 Copyright: 2006, Nemanja Trifunovic
 License: BSL-1.0
 
-Files: UI/CollisionMeshConverter.cpp
-       UI/CollisionMeshConverter.h
-Copyright: 2007, Tuan Kuranes <tuan.kuranes at gmail.com>
-License: LGPL-2.1+
-
 Files: util/XMLDoc.cpp
 Copyright: 2001, Daniel C. Nuffer
            2006, T. Zachary Laine
 License: LGPL-2.1+
 
-Files: PagedGeometry/include/MersenneTwister.h
-Copyright: 1997-2002, Makoto Matsumoto and Takuji Nishimura
-           2000-2009, Richard J. Wagner
-License: BSD-3-clause
-Comment:
- Please see also http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/eack.html for
- a clarification of the original authors' intent about their request to send a
- reference for this work.
-
 Files: log4cpp/*
 Copyright:  2000-2001, LifeLine Networks BV (www.lifeline.nl)
             2000-2001, Bastiaan Bakker
@@ -146,35 +123,6 @@ License: GPL-2
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-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:
- .
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- 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.
- .
- Neither the name of the original author; nor the names of any contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER
- 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.
-
-
 License: SGI-Free-Software-License-B-2.0
  SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  Copyright (C) [dates of first publication] Silicon Graphics, Inc. All Rights
@@ -264,22 +212,6 @@ License: BSL-1.0
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
-License: Zlib
- This software is provided 'as-is', without any express or implied warranty.
- In no event will the authors be held liable for any damages arising from
- the use of this software.
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software in
-    a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
 License: CC-BY-SA-3.0
  Creative Commons Attribution-ShareAlike 3.0 Unported
  ․
diff --git a/debian/rules b/debian/rules
index 1ca8949..95c76fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ WEAK_HOSTS := armel armhf mips mipsel
 UURL := https://github.com/freeorion/freeorion.git
 PKG := freeorion
 COMMIT := cab4aa243552328e71de55f45bc11fc189930494
-REV := $(shell echo $(FCOMMIT) | cut -c1-6)
+REV := $(shell echo $(COMMIT) | cut -c1-6)
 
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(WEAK_HOSTS)))
 	MAX  := 1

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

