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

ximion-guest at users.alioth.debian.org ximion-guest at users.alioth.debian.org
Sun Jul 25 17:15:55 UTC 2010


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

    GPL-2.1+ renamed to GPL-2+
    
    * GPLv2.1 does not exists. Upstream needs to
      fix the file headers.
    * Renamed in debian/changelog to indicate the right
      licenses.

diff --git a/debian/copyright b/debian/copyright
index f779902..2b96f82 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -107,11 +107,11 @@ 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+
+License: GPL-2+
 
 Files: src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
 Copyright: 2003-2004 projectM Team
-License: LGPL-2.1+ | GPL-2.1+
+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
 Copyright: 2003-2008 projectM Team

-- 
projectm packaging



More information about the pkg-multimedia-commits mailing list