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

Sun Jul 25 17:04:22 UTC 2010

The following commit has been merged in the master branch:
commit a8e14b40f07b8c1be83d34722775339afc6f9df7
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Sun Jul 25 19:01:36 2010 +0200

    Clearified some parts of debian/copying
    
    * Removed info about incorrect FSF address
    * Clearify licenses of packageing and projectM itself.

diff --git a/debian/copyright b/debian/copyright
index 27a9a93..f779902 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -37,12 +37,13 @@ Removed components:
 
 Licenses:
 
-    This package is free software; you can redistribute it and/or modify
+    All projectM tools are licensed under GPLv2+
+    ProjectM is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
  
-    This package is distributed in the hope that it will be useful,
+    ProjectM is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
@@ -52,8 +53,8 @@ Licenses:
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 .
     
-    The libprojectm library is licensed under LGPLv2.1:
-
+    The libprojectm library code is licensed under LGPLv2.1+:
+    
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
@@ -74,11 +75,11 @@ is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'.
 
 Files: src/projectM-sdlvis/projectMvis.cc, src/libprojectM/event.h, src/libprojectM/wipemalloc.cpp, src/libprojectM/projectM.cpp, src/libprojectM/Renderer/BeatDetect.cpp, src/libprojectM/Renderer/FBO.cpp, src/libprojectM/PCM.cpp, src/libprojectM/MilkdropPresetFactory/InitCond.cpp, src/libprojectM/MilkdropPresetFactory/PerPointEqn.cpp, src/libprojectM/MilkdropPresetFactory/Eval.cpp, src/libprojectM/MilkdropPresetFactory/CustomShape.cpp, src/libprojectM/MilkdropPresetFactory/PerPixelEqn.cpp, src/libprojectM/MilkdropPresetFactory/Param.cpp, src/libprojectM/MilkdropPresetFactory/Expr.cpp, src/libprojectM/MilkdropPresetFactory/PerFrameEqn.cpp, src/libprojectM/MilkdropPresetFactory/Func.cpp, src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp, src/libprojectM/MilkdropPresetFactory/CustomWave.cpp, src/libprojectM/timer.cpp, src/libprojectM/KeyHandler.cpp, src/projectM-wxvis/wxvisCanvas.cpp, src/projectM-wxvis/wxvisFrame.cpp, src/projectM-wxvis/wxvisCanvas.h, src/projectM-wxvis/wxvisApp.h, src/projectM-wxvis/wxvisApp.cpp, src/projectM-wxvis/wxvisFrame.h, src/projectM-jack/projectM-jack.cpp, lic.c
 Copyright: 2003-2004 projectM Team
-License: LGPL-2.1+ (with incorrect FSF address)
+License: LGPL-2.1+
 
 Files: src/projectM-sdlvis/sdltoprojectM.h, src/libprojectM/KeyHandler.hpp, src/libprojectM/fftsg.h, src/libprojectM/Renderer/BeatDetect.hpp, src/libprojectM/Renderer/FBO.hpp, src/libprojectM/dlldefs.h, src/libprojectM/wipemalloc.h, src/libprojectM/Common.hpp, src/libprojectM/timer.h, src/libprojectM/carbontoprojectM.h, src/libprojectM/lvtoprojectM.h, src/libprojectM/MilkdropPresetFactory/Parser.hpp, src/libprojectM/MilkdropPresetFactory/CustomWave.hpp, src/libprojectM/MilkdropPresetFactory/Func.hpp, src/libprojectM/MilkdropPresetFactory/PerPointEqn.hpp, src/libprojectM/MilkdropPresetFactory/CustomShape.hpp, src/libprojectM/MilkdropPresetFactory/Param.hpp, src/libprojectM/MilkdropPresetFactory/Eval.hpp, src/libprojectM/MilkdropPresetFactory/Expr.hpp, src/libprojectM/MilkdropPresetFactory/PerPixelEqn.hpp, src/libprojectM/MilkdropPresetFactory/MilkdropPreset.hpp, src/libprojectM/MilkdropPresetFactory/BuiltinParams.hpp, src/libprojectM/MilkdropPresetFactory/CValue.hpp, src/libprojectM/MilkdropPresetFactory/InitCond.hpp, src/libprojectM/projectM.hpp, src/libprojectM/sdltoprojectM.h, src/libprojectM/fatal.h, src/libprojectM/PCM.hpp, src/projectM-libvisual/lvtoprojectM.h
 Copyright: 2003-2007 projectM Team
-License: LGPL-2.1+ (with incorrect FSF address)
+License: LGPL-2.1+
 
 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
@@ -98,7 +99,7 @@ License: LGPL-2.1+
 
 Files: src/libprojectM/MilkdropPresetFactory/PerFrameEqn.hpp
 Copyright: 2003-2007 projectM Team
-License: LGPL-2.1+ (with incorrect FSF address)
+License: LGPL-2.1+
 
 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
@@ -106,20 +107,20 @@ 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)
+License: GPL-2.1+
 
 Files: 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)
+License: LGPL-2.1+ | GPL-2.1+
 
 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)
+License: LGPL-2.1+
 
 Files: src/projectM-libvisual-alsa/lv_x11_key.c
 Copyright: 1997-2004 Sam Lantinga
-License: LGPL-2+ (with incorrect FSF address)
+License: LGPL-2+
 
 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)
+License: LGPL-2.1+

-- 
projectm packaging

