[SCM] projectm/master: Make debian/copyright DEP-5 compliant

ximion-guest at users.alioth.debian.org ximion-guest at users.alioth.debian.org
Mon May 21 12:07:34 UTC 2012


The following commit has been merged in the master branch:
commit ea25cc2ae3dc00ec2cb095c42b20ed4b721ba5e6
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Mon May 21 13:39:49 2012 +0200

    Make debian/copyright DEP-5 compliant

diff --git a/debian/control b/debian/control
index 8c2ee6a..621df17 100644
--- a/debian/control
+++ b/debian/control
@@ -65,7 +65,6 @@ Description: Advanced Milkdrop-compatible music visualization library - data
 
 Package: libvisual-projectm
 Architecture: any
-Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: libvisual module for projectM
  projectM is an iterative music visualization library which uses
diff --git a/debian/copyright b/debian/copyright
index 2805ed4..9561c68 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,99 +1,99 @@
-This package was debianized by Matthias Klumpp <matthias at tenstral.net> on
-Mon, 08 Feb 2009 19:36:41 +0100.
+Format-Specification: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: projectM
+Source: http://projectm.sf.net
 
-It was downloaded from http://projectm.sf.net
-
-Copyright:
-
-    Copyright (C) 2009-2010 projectM Team
-
-    Carmelo Piccione <Carmelo.Piccione+projectM at gmail.com>
-     Parser
-     Evaluator
-     Pulse Audio support (projectM-pulseaudio)
-     Qt GUI (projectM-qt)
-
-    Peter Sperl <peter at sperl.com>
-     Beat Detection
-     Rendering
-     XMMS Support (projectM-xmms)
-     libvisual Support (projectM-libvisual)
+Comment:
+ Removed components:
+    The following modules were removed from the Debian version of projectM:
+        src/WinLibs - Binary modules for Windows
+        src/macos - MacOS components
+        src/win32
+    (Source code was not available/up-to-date, binaries were just useless.)
 
-    Alligator Descartes
-     Media Player Support (iTunes, Winamp, Windows Media Player)
-     Test application frameworks (projectM-wxvis, projectM-sdlvis)
-     DVD application (projectM-movie)
-     Win32 screensaver (projectM-screensaver)
 
-    Roger Dannenburg
-     Advice & Support
+Files: debian/*
+Copyright: (c) 2009-2012 Matthias Klumpp <matthias at tenstral.net>
+License: LGPL-2.1+
 
-Removed components:
-    The following modules were removed from the Debian version of projectM:
-     	src/WinLibs - Binary modules for Windows
-	src/macos - MacOS components
-	src/win32
-	src/projectM-sdlvis/a.out - Useless binary
-
-Licenses:
-
-    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.
-
-    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.
-
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-.
-
-    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
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-    See 'LICENSE.txt' included within this release
-
-The Debian packaging is copyright 2009, Matthias Klumpp <matthias at tenstral.net> and
-is licensed under the LGPLv2.1+, see `/usr/share/common-licenses/LGPL-2.1'.
-
-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
+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
 Copyright: 2003-2004 projectM Team
 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
+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/*
+ 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+
 
 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: 2002-2008, Marcelo E. Magallon <mmagallo at debian org>
+ 2002-2008, Milan Ikits <milan ikits at 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
+License: MIT
+
+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
+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+
 
@@ -101,19 +101,30 @@ Files: src/libprojectM/MilkdropPresetFactory/PerFrameEqn.hpp
 Copyright: 2003-2007 projectM Team
 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
-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
+Files: src/libprojectM/glxew.h
+ src/libprojectM/glew.h
+Copyright: 2007 The Khronos Group Inc
+ 2002-2008, Marcelo E. Magallon <mmagallo at debian org>
+ 1999-2007 Brian Paul
+ 2002-2008, Milan Ikits <milan ikits at ieee org>
+ 2002, Lev Povalahev
+License: MIT
+ BSD-2-clause
+
+Files: src/projectM-qt/*
+ src/projectM-pulseaudio/*
+ src/projectM-jack/*
 Copyright: 2003-2004 projectM Team
 License: GPL-2+
 
 Files: src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
 Copyright: 2003-2004 projectM Team
-License: LGPL-2.1+ | GPL-2+
+License: LGPL-2.1+
+ GPL-2+
 
-Files: src/projectM-test/projectM-test-memleak.cpp, src/projectM-test/projectM-test-texture.cpp, src/projectM-test/projectM-test.cpp
+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+
 
@@ -124,3 +135,43 @@ 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+
+
+License: GPL-2+
+ 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.
+ .
+ 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ 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: LGPL-2.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
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ See 'LICENSE.txt' included within this release
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2.1".

-- 
projectm packaging



More information about the pkg-multimedia-commits mailing list