[SCM] projectm packaging branch, master, updated. upstream/2.0.1+dfsg-50-gbece46c

[ximion-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ccc4aa29e5250d3a32d7a1b6614889b9a9248c18
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Tue Jul 20 15:46:26 2010 +0200

    Updated license info

diff --git a/debian/copyright b/debian/copyright
index eb81433..c808dbe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -71,3 +71,75 @@ Licenses:
 
 The Debian packaging is copyright 2009, Matthias Klumpp <matthias at nlinux.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'.
+
+Files: src/projectM-jack/*
+Copyright: 2003-2004 projectM Team
+License: LGPL-2.1+ (with incorrect FSF address)
+
+Files: src/projectM-sdlvis/*
+Copyright: 2003-2004 projectM Team
+License: LGPL-2.1+ (with incorrect FSF address)
+
+Files: src/projectM-wxvis/*
+Copyright: 2003-2004 projectM Team
+License: LGPL-2.1+ (with incorrect FSF address)
+
+Files: src/libprojectM/*
+Copyright: 2003-2007 projectM Team
+License: LGPL-2.1+ (with incorrect FSF address)
+
+Files: src/projectM-libvisual/*
+Copyright: 2003-2007 projectM Team
+License: LGPL-2.1+ (with incorrect FSF address)
+
+Files: src/libprojectM/glew.c
+Copyright: HOLDERS AND CONTRIBUTORS "AS IS" / 2002-2008, Marcelo E. Magallon <mmagallo[]debian org> / OWNER OR CONTRIBUTORS BE / 2002-2008, Milan Ikits <milan ikits[]ieee org> / 2002, Lev Povalahev
+License: BSD (2 clause)
+
+Files: src/libprojectM/ConfigFile.h, src/projectM-libvisual/ConfigFile.h, src/projectM-qt/configfile.hpp, src/projectM-pulseaudio/ConfigFile.h, src/projectM-pulseaudio/ConfigFile.cpp, src/projectM-test/ConfigFile.h, src/projectM-xmms/ConfigFile.h, src/projectM-jack/ConfigFile.h, src/projectM-jack/ConfigFile.cpp
+Copyright: 2004 Richard J. Wagner / HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+License: other (MIT) (check exact wording)
+
+Files: src/libprojectM/omptl/omptl_numeric_extentions_par.h, src/libprojectM/omptl/omptl_numeric_extentions.h, src/libprojectM/omptl/omptl_numeric_extentions_ser.h
+Copyright: 2007 Fokko Beekhof
+License: LGPL-2.1+
+
+Files: src/libprojectM/omptl/omptl_algorithm_ser.h, src/libprojectM/omptl/omptl_algorithm_par.h, src/libprojectM/omptl/omptl_numeric_ser.h, src/libprojectM/omptl/omptl_numeric_par.h, src/libprojectM/omptl/omptl_tools.h
+Copyright: 2006 Fokko Beekhof
+License: LGPL-2.1+
+
+Files: src/libprojectM/MilkdropPresetFactory/PerFrameEqn.hpp
+Copyright: 2003-2007 projectM Team
+License: GENERATED FILE | LGPL-2.1+ (with incorrect FSF address)
+
+Files: src/libprojectM/glxew.h, src/libprojectM/glew.h
+Copyright: 2007 The Khronos Group Inc / HOLDERS AND CONTRIBUTORS "AS IS" / 2002-2008, Marcelo E. Magallon <mmagallo[]debian org> / 1999-2007 Brian Paul All Rights Reserved / OWNER OR CONTRIBUTORS BE / 2002-2008, Milan Ikits <milan ikits[]ieee org> / 2002, Lev Povalahev
+License: other (MIT) (check exact wording) | BSD (2 clause)
+
+Files: src/projectM-qt/qplaylisttableview.hpp, src/projectM-qt/qprojectm_mainwindow.hpp, src/projectM-qt/qpresetfiledialog.hpp, src/projectM-qt/qplaylistfiledialog.hpp, src/projectM-qt/qpresettextedit.hpp, src/projectM-qt/qpresettextedit.cpp, src/projectM-qt/qprojectmconfigdialog.hpp, src/projectM-qt/qpreseteditordialog.cpp, src/projectM-qt/qprojectmconfigdialog.cpp, src/projectM-qt/qplaylistmodel.hpp, src/projectM-qt/qprojectmwidget.hpp, src/projectM-qt/qxmlplaylisthandler.hpp, src/projectM-qt/qprojectm_mainwindow.cpp, src/projectM-qt/configfile.cpp, src/projectM-qt/qplaylistfiledialog.cpp, src/projectM-qt/qpreseteditordialog.hpp, src/projectM-qt/nullable.hpp, src/projectM-qt/qplaylistmodel.cpp, src/projectM-qt/qprojectm.hpp, src/projectM-pulseaudio/QPulseAudioDeviceChooser.cpp, src/projectM-pulseaudio/QPulseAudioDeviceChooser.hpp, src/projectM-pulseaudio/QPulseAudioDeviceModel.cpp, src/projectM-pulseaudio/QPulseAudioThread.hpp, src/projectM-pulseaudio/QPulseAudioDeviceModel.hpp, src/projectM-jack/video_init.h, src/projectM-jack/qprojectM-jack.cpp, src/projectM-jack/sdltoprojectM.h, src/projectM-jack/video_init.cpp
+Copyright: 2003-2004 projectM Team
+License: GPL-2.1+ (with incorrect FSF address)
+
+Files: src/projectM-pulseaudio/qprojectM-pulseaudio.cpp, .pc/03_pulseaudio_stat.patch/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
+Copyright: 2003-2004 projectM Team
+License: LGPL-2.1+ (with incorrect FSF address) | GPL-2.1+ (with incorrect FSF address)
+
+Files: src/projectM-pulseaudio/QPulseAudioThread.cpp
+Copyright: 2006 Pierre Ossman <ossman at cendio.se> for Cendio AB / 2004-2006 Lennart Poettering
+License: UNKNOWN
+
+Files: src/projectM-test/projectM-test-memleak.cpp, src/projectM-test/projectM-test-texture.cpp, src/projectM-test/projectM-test.cpp
+Copyright: 2003-2008 projectM Team
+License: LGPL-2.1+ (with incorrect FSF address)
+
+Files: src/projectM-moviegen/mov123.c
+Copyright: 2003-2004 Sean Adams, Slim Devices Inc
+License: GPL-
+
+Files: src/projectM-libvisual-alsa/lv_x11_key.c
+Copyright: 1997-2004 Sam Lantinga
+License: LGPL-2+ (with incorrect FSF address)
+
+Files: src/projectM-libvisual-alsa/lv_x11_key.h
+Copyright: 2004, 2005, 2006 Dennis Smit <ds at nerds-incorporated.org>
+License: LGPL-2.1+ (with incorrect FSF address)

-- 
projectm packaging