[SCM] sonic-visualiser/master: Group files by license, apply new rules about multi-line copyright statements.

Tue Dec 4 10:52:36 UTC 2012

The following commit has been merged in the master branch:
commit 9734f1c84b64379a36833b60a62ba5f5ff0f6e88
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Dec 4 10:52:09 2012 +0000

    Group files by license, apply new rules about multi-line copyright statements.

diff --git a/debian/copyright b/debian/copyright
index cb157cf..3e72740 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,70 +5,42 @@ Source: http://www.sonicvisualiser.org/download.html
 
 Files: *
 Copyright:
- 2005-2009 Chris Cannam
- 2006-2009 Queen Mary, University of London,
-License: GPL-2+
-
-Files: svcore/base/Profiler.*
-Copyright: 2000-2006 Chris Cannam, Guillaume Laurent
-License: GPL-2+
-
-Files: svcore/data/midi/MIDIEvent.h
- svcore/plugin/LADSPAPluginFactory.h
- svcore/plugin/LADSPAPluginInstance.h
- svcore/data/fileio/MIDIFileReader.cpp
- svcore/data/fileio/MIDIFileWriter.h
-Copyright: 2000-2006 Richard Bown and Chris Cannam
-License: GPL-2+
-
-Files: svcore/plugin/LADSPAPluginInstance.cpp
-Copyright: 2000-2006 Chris Cannam, Richard Bown, and QMUL
-License: GPL-2+
-
-Files: svgui/widgets/AudioDial.*
-Copyright:
- 2003-2006 Chris Cannam
- 2005 Pedro Lopez-Cabanillas
- 2006 Queen Mary, University of London
-License: GPL-2+
-
-Files: svgui/widgets/Fader.*
-Copyright: 2002-2005 by Alex >Comix< Cominu <comix at users.sourceforge.net>
+  2000-2009 Chris Cannam
+  2000-2006 Chris Cannam, Richard Bown, and QMUL
+  2006 Queen Mary, University of London
+  2006-2009 Queen Mary, University of London,
+  2000-2006 Richard Bown and Chris Cannam
+  2000-2006 Chris Cannam, Guillaume Laurent
+  2005 Pedro Lopez-Cabanillas
+  2002-2005 by Alex >Comix< Cominu <comix at users.sourceforge.net>
+  2000 Werner Trobin and David Faure
 License: GPL-2+
 
 Files: svgui/widgets/CommandHistory.*
 Copyright:
- 2000 Werner Trobin and David Faure
  2000-2006 Chris Cannam
-License: GPL-2+
-X-Comment: These files contain traces of the KCommandHistory
+License: GPL-2+ and LGPL-2.1+
+Comment: These files contain traces of the KCommandHistory
  class from the KDE project, copyright 2000 Werner Trobin and David Faure
  and distributed under the GNU Lesser General Public License.
 
 Files: svgui/widgets/LEDButton.*
 Copyright: 1998-2004 Jörg Habenicht, Richard J Moore, Chris Cannam and others
-License: GPL-2+
-X-Comment: These are modified versions of the source files from the KDE
+License: GPL-2+ and LGPL-2.1+
+Comment: These are modified versions of the source files from the KDE
  libraries.  Copyright (c) 1998-2004 Jörg Habenicht, Richard J
  Moore and others, distributed under the GNU Lesser General Public
  License.
 
 Files: svcore/plugin/api/dssi.h
-Copyright: 2004,2005 Chris Cannam, Steve Harris and Sean Bolton
-License: LGPL-2.1+
-
-Files: svcore/plugin/api/dssi_alsa_compat.c
-Copyright: 1998,99,2000 Takashi Iwai <tiwai at suse.de>,
- Jaroslav Kysela <perex at suse.cz>
-License: LGPL-2.1+
-
-Files: svcore/plugin/api/ladspa.h
-Copyright: 2000-2002 Richard W.E. Furse, Paul Barton-Davis,
- Stefan Westerfeld
-License: LGPL-2.1+
-
-Files: svcore/plugin/api/alsa/*.h
-Copyright: 1998-2001 Jaroslav Kysela <perex at suse.cz>,
+ svcore/plugin/api/dssi_alsa_compat.c
+ svcore/plugin/api/ladspa.h
+ svcore/plugin/api/alsa/*.h
+Copyright:
+  2004,2005 Chris Cannam, Steve Harris and Sean Bolton
+  1998,99,2000 Takashi Iwai <tiwai at suse.de>, Jaroslav Kysela <perex at suse.cz>
+  2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan Westerfeld
+  1998-2001 Jaroslav Kysela <perex at suse.cz>,
  Abramo Bagnara <abramo at alsa-project.org>, Takashi Iwai <tiwai at suse.de>
 License: LGPL-2.1+
 
@@ -101,8 +73,9 @@ License: MIT
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Files: debian/*
-Copyright: 2010 Alessio Treglia <alessio at debian.org>
+Copyright:
   2012 Jaromír Mikeš <mira.mikes at seznam.cz>
+  2010 Alessio Treglia <alessio at debian.org>
 License: GPL-2+
 
 License: GPL-2+
@@ -116,11 +89,11 @@ License: GPL-2+
  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 program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-X-Comment: On Debian systems, the complete text of the GNU General
+ On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
@@ -133,8 +106,8 @@ License: LGPL-2.1+
  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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-X-Comment: On Debian systems, the complete text of the GNU Lesser General
+ On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.

-- 
sonic-visualiser packaging

