This is an automated email from the git hooks/post-receive script. arand-guest pushed a commit to branch master in repository lierolibre.
commit 82cb6e52342db40a6f709cb06d10be1a82aed56f Author: Martin Erik Werner <[email protected]> Date: Tue Aug 18 23:37:15 2015 +0200 Sync debian/copyright with upstream COPYING Update debian/copyright based on upstream COPYING as of commit cd18e05. --- debian/copyright | 54 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/debian/copyright b/debian/copyright index 60dc416..ff55917 100644 --- a/debian/copyright +++ b/debian/copyright @@ -19,17 +19,30 @@ Copyright: 2007-2010, Erik Lindroos <[email protected]> 2010, Mario Carbajal "basro" License: BSD-2-Clause -Files: src/boostTesting.cpp src/configHelper.* src/configInit.* src/dataPath.* - src/to_string.* +Files: src/argParse.* src/boostTesting.cpp src/configCompat.cpp + src/configHelper.* src/configInit.* src/dataPath.* src/to_string.* Copyright: 2012, Martin Erik Werner <[email protected]> License: BSD-2-Clause -Files: src/console.* src/exactObjectList.hpp src/fastObjectList.hpp src/lfs.hpp - src/rand.* src/rect.hpp src/sdlmain.cpp src/sfx.* src/sobject.* src/sys.* - src/text.* src/_build/* +Files: src/console.* src/exactObjectList.hpp src/fastObjectList.hpp src/rand.* + src/rect.hpp src/sdlmain.cpp src/sfx.* src/sobject.* src/sys.* + src/text.* Copyright: 2007-2010, Erik Lindroos <[email protected]> License: BSD-2-Clause +Files: src/filesystem.hpp +Copyright: 2001, Dietmar Kühl + 2002, Jan Langer + 2002-2003, Beman Dawes + 2007-2010, Erik Lindroos + 2010, "basro" +License: BSL-1.0 and BSD-2-Clause + +Files: src/filesystem.cpp +Copyright: 2002, Jens Maurer + 2007-2010, Erik Lindroos +License: BSL-1.0 and BSD-2-Clause + Files: src/binReader.* src/constants.* src/main.cpp src/math.* src/reader.* Copyright: 2007-2010, Erik Lindroos <[email protected]> 2012, Martin Erik Werner <[email protected]> @@ -45,10 +58,11 @@ License: BSD-2-Clause Files: data/* Copyright: 1998-1999 Joosa Reikkinen "MetsnElimet" License: WTFPL -Comment: Note that the old freeware license in data/LIERO(ENG).TXT no longer - applies. +Comment: Note that the old freeware license in data/LIERO(ENG).TXT and the + information about the old LIERO.EXE and LIERO.SND in data/LICENSE.TXT + no longer applies. -Files: data/sounds/*.wav +Files: data/sounds/*.wav data/LIERO.SND Copyright: 2012, "sea" License: WTFPL @@ -71,23 +85,25 @@ Files: src/gvl/support/type_info.hpp Copyright: 2002 David Abrahams License: BSL-1.0 -Files: aclocal.m4 src/config.h.in build-aux/* +Files: aclocal.m4 src/config.h.in src/build-aux/* Copyright: 1992-2011, Free Software Foundation, Inc. -License: GPL-2+ or BSD-2-Clause -Comment: Autotools content is distributed under the lierolibre license, if it - is used outside of lierolibre the GPL-2+ license applies instead. +License: GPL-2+ with Autoconf exception + As a special exception to the GNU General Public License, if you + distribute this file as part of a program that contains a + configuration script generated by Autoconf, you may include it under + the same distribution terms that you use for the rest of that program. Files: configure Copyright: 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. -License: +License: FSFUL This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Files: INSTALL Copyright: 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, Inc. -License: +License: FSF-all-permissive Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. This file is offered as-is, @@ -97,7 +113,7 @@ Files: Makefile.in Copyright: 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -License: +License: FSFULLR This Makefile.in is free software; the Free Software Foundation gives unlimited permission to copy and/or distribute it, with or without modifications, as long as this notice is preserved. @@ -110,7 +126,7 @@ License: Files: src/build-aux/install-sh Copyright: 1994 X Consortium FSF -License: +License: X11 and public-domain 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 @@ -137,15 +153,11 @@ License: Files: src/m4/* Copyright: 1996-2011 Free Software Foundation, Inc. -License: +License: FSFULLR This file is free software; the Free Software Foundation gives unlimited permission to copy and/or distribute it, with or without modifications, as long as this notice is preserved. -Files: src/m4/sdl.m4 -Copyright: 1997-2012 Sam Lantinga -License: LGPL-2.1+ - License: BSD-2-Clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lierolibre.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
