[SCM] jackd2/master: Tidy copyright file: Reorder some Files sections to better match copyright hints.

js at users.alioth.debian.org js at users.alioth.debian.org
Mon Dec 31 12:33:56 UTC 2012 

The following commit has been merged in the master branch:
commit fbe1a67e5bee100dba7cad6264196b55dbd6bc69
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Dec 31 12:38:38 2012 +0100

    Tidy copyright file: Reorder some Files sections to better match copyright hints.

diff --git a/debian/copyright b/debian/copyright
index 5c5bc85..d0cf4cc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -73,39 +73,6 @@ Files: common/JackAudioAdapter.cpp
 Copyright: 2004-2012, Grame <grame at grame.fr>
 License: GPL-2+
 
-Files: common/JackAPI.cpp
- common/JackAudioPort.cpp
- common/JackClient.cpp
- common/JackClient.h
- common/JackClientControl.h
- common/JackClientInterface.h
- common/JackEngineControl.cpp
- common/JackEngineControl.h
- common/JackFrameTimer.cpp
- common/JackFrameTimer.h
- common/JackGraphManager.cpp
- common/JackGraphManager.h
- common/JackLibAPI.cpp
- common/JackPort.cpp
- common/JackPort.h
- common/JackRequest.h
- common/JackServerLaunch.h
- common/JackThread.h
- common/JackTime.h
- common/JackTransportEngine.cpp
- common/JackTransportEngine.h
- common/shm.c
- common/shm.h
- macosx/JackMachThread.cpp
- macosx/JackMachTime.c
- posix/JackPosixServerLaunch.cpp
- posix/JackPosixThread.cpp
- posix/JackPosixThread.h
- solaris/JackSolarisTime.c
-Copyright: 2001-2003, Paul Davis
-  2004-2012, Grame <grame at grame.fr>
-License: LGPL-2.1+
-
 Files: linux/alsarawmidi/JackALSARawMidiDriver.cpp
  linux/alsarawmidi/JackALSARawMidiDriver.h
  linux/alsarawmidi/JackALSARawMidiInputPort.cpp
@@ -144,6 +111,40 @@ Files: linux/alsarawmidi/JackALSARawMidiDriver.cpp
 Copyright: 2011, Devin Anderson
 License: GPL-2+
 
+Files: common/JackMidiAsyncQueue.cpp
+ common/JackMidiAsyncQueue.h
+ common/JackMidiAsyncWaitQueue.cpp
+ common/JackMidiAsyncWaitQueue.h
+ common/JackMidiBufferReadQueue.cpp
+ common/JackMidiBufferReadQueue.h
+ common/JackMidiBufferWriteQueue.cpp
+ common/JackMidiBufferWriteQueue.h
+ common/JackMidiRawInputWriteQueue.cpp
+ common/JackMidiRawInputWriteQueue.h
+ common/JackMidiRawOutputWriteQueue.cpp
+ common/JackMidiRawOutputWriteQueue.h
+ common/JackMidiReadQueue.cpp
+ common/JackMidiReadQueue.h
+ common/JackMidiReceiveQueue.cpp
+ common/JackMidiReceiveQueue.h
+ common/JackMidiSendQueue.cpp
+ common/JackMidiSendQueue.h
+ common/JackMidiUtil.cpp
+ common/JackMidiUtil.h
+ common/JackMidiWriteQueue.cpp
+ common/JackMidiWriteQueue.h
+ example-clients/midi_latency_test.c
+ linux/firewire/JackFFADOMidiInputPort.cpp
+ linux/firewire/JackFFADOMidiInputPort.h
+ linux/firewire/JackFFADOMidiOutputPort.cpp
+ linux/firewire/JackFFADOMidiOutputPort.h
+ linux/firewire/JackFFADOMidiReceiveQueue.cpp
+ linux/firewire/JackFFADOMidiReceiveQueue.h
+ linux/firewire/JackFFADOMidiSendQueue.cpp
+ linux/firewire/JackFFADOMidiSendQueue.h
+Copyright: 2010, Devin Anderson
+License: LGPL-2.1+
+
 Files: common/JackAudioDriver.h
  common/JackDriver.cpp
  common/JackDriver.h
@@ -178,6 +179,39 @@ Copyright: 2001-2005, Paul Davis
   2004-2008, Grame <grame at grame.fr>
 License: GPL-2+
 
+Files: common/JackAPI.cpp
+ common/JackAudioPort.cpp
+ common/JackClient.cpp
+ common/JackClient.h
+ common/JackClientControl.h
+ common/JackClientInterface.h
+ common/JackEngineControl.cpp
+ common/JackEngineControl.h
+ common/JackFrameTimer.cpp
+ common/JackFrameTimer.h
+ common/JackGraphManager.cpp
+ common/JackGraphManager.h
+ common/JackLibAPI.cpp
+ common/JackPort.cpp
+ common/JackPort.h
+ common/JackRequest.h
+ common/JackServerLaunch.h
+ common/JackThread.h
+ common/JackTime.h
+ common/JackTransportEngine.cpp
+ common/JackTransportEngine.h
+ common/shm.c
+ common/shm.h
+ macosx/JackMachThread.cpp
+ macosx/JackMachTime.c
+ posix/JackPosixServerLaunch.cpp
+ posix/JackPosixThread.cpp
+ posix/JackPosixThread.h
+ solaris/JackSolarisTime.c
+Copyright: 2001-2003, Paul Davis
+  2004-2012, Grame <grame at grame.fr>
+License: LGPL-2.1+
+
 Files: common/memops.c
  common/memops.h
  example-clients/evmon.c
@@ -195,6 +229,18 @@ Files: common/memops.c
 Copyright: 1999-2001, 2003, 2007, Paul Davis
 License: GPL-2+
 
+Files: dbus/controller.h
+ dbus/controller_iface_session_manager.c
+ dbus/params.c
+ dbus/params.h
+ dbus/xml.c
+ dbus/xml.h
+ dbus/xml_expat.c
+ dbus/xml_nop.c
+ dbus/xml_write_raw.c
+Copyright: 2007-2008,,2011 Nedko Arnaudov
+License: other-GPL-2-either
+
 Files: common/JackNetAdapter.cpp
  common/JackNetAdapter.h
  common/JackNetDriver.cpp
@@ -225,40 +271,6 @@ Files: common/JackTypes.h
 Copyright: 2001-2004, 2010, Paul Davis
 License: LGPL-2.1+
 
-Files: common/JackMidiAsyncQueue.cpp
- common/JackMidiAsyncQueue.h
- common/JackMidiAsyncWaitQueue.cpp
- common/JackMidiAsyncWaitQueue.h
- common/JackMidiBufferReadQueue.cpp
- common/JackMidiBufferReadQueue.h
- common/JackMidiBufferWriteQueue.cpp
- common/JackMidiBufferWriteQueue.h
- common/JackMidiRawInputWriteQueue.cpp
- common/JackMidiRawInputWriteQueue.h
- common/JackMidiRawOutputWriteQueue.cpp
- common/JackMidiRawOutputWriteQueue.h
- common/JackMidiReadQueue.cpp
- common/JackMidiReadQueue.h
- common/JackMidiReceiveQueue.cpp
- common/JackMidiReceiveQueue.h
- common/JackMidiSendQueue.cpp
- common/JackMidiSendQueue.h
- common/JackMidiUtil.cpp
- common/JackMidiUtil.h
- common/JackMidiWriteQueue.cpp
- common/JackMidiWriteQueue.h
- example-clients/midi_latency_test.c
- linux/firewire/JackFFADOMidiInputPort.cpp
- linux/firewire/JackFFADOMidiInputPort.h
- linux/firewire/JackFFADOMidiOutputPort.cpp
- linux/firewire/JackFFADOMidiOutputPort.h
- linux/firewire/JackFFADOMidiReceiveQueue.cpp
- linux/firewire/JackFFADOMidiReceiveQueue.h
- linux/firewire/JackFFADOMidiSendQueue.cpp
- linux/firewire/JackFFADOMidiSendQueue.h
-Copyright: 2010, Devin Anderson
-License: LGPL-2.1+
-
 Files: dbus/controller.c
  dbus/controller_iface_configure.c
  dbus/controller_iface_control.c
@@ -270,23 +282,6 @@ Copyright: 2007-2008, Juuso Alasuutari
   2007-2008, 2011, Nedko Arnaudov
 License: other-GPL-2-either
 
-Files: dbus/controller.h
- dbus/controller_iface_session_manager.c
- dbus/params.c
- dbus/params.h
- dbus/xml.c
- dbus/xml.h
- dbus/xml_expat.c
- dbus/xml_nop.c
- dbus/xml_write_raw.c
-Copyright: 2007-2008,,2011 Nedko Arnaudov
-License: other-GPL-2-either
-
-Files: common/JackNetOneDriver.cpp
- common/JackNetOneDriver.h
-Copyright: 2008-2011, Torben Horn
-License: GPL-2+
-
 Files: linux/alsa/alsa_midi.h
  linux/alsa/alsa_midi_impl.h
  linux/alsa/alsa_rawmidi.c
@@ -329,13 +324,6 @@ Files: dbus/audio_reserve.c
 Copyright: 2009, Grame <grame at grame.fr>
 License: other-GPL-2-either
 
-Files: linux/firewire/JackFFADODriver.h
-Copyright: 2001, Paul Davis
-  2004, Grame <grame at grame.fr>
-  2007, Pieter Palmers
-  2012, Adrian Knoth
-License: GPL-2+
-
 Files: linux/freebob/JackFreebobDriver.cpp
  linux/freebob/JackFreebobDriver.h
 Copyright: 2001, Paul Davis
@@ -367,6 +355,15 @@ Files: windows/JackRouter/JackRouter.cpp
 Copyright: 2006-2011, Grame <grame at grame.fr>
 License: Expat
 
+Files: dbus/reserve.*
+Copyright: 2009, Lennart Poettering
+License: Expat
+
+Files: windows/portaudio/pa_asio.h
+ windows/portaudio/portaudio.h
+Copyright: 1999-2002, Ross Bencina and Phil Burk
+License: other-Expat-modrequest
+
 Files: dbus/jackdbus.c
  dbus/jackdbus.h
 Copyright: 2007-2008, Juuso Alasuutari
@@ -439,6 +436,11 @@ Copyright: 2006, Torben Hohn <torbenh at gmx.de>
   2008, Pieter Palmers <pieterpalmers at users.sourceforge.net>
 License: GPL-2+
 
+Files: common/JackNetOneDriver.cpp
+ common/JackNetOneDriver.h
+Copyright: 2008-2011, Torben Horn
+License: GPL-2+
+
 Files: common/JackPortType.cpp
  common/JackPortType.h
 Copyright: 2007, Dmitry Baikov
@@ -488,15 +490,6 @@ Copyright: 2000, Paul Davis
   2003, Rohan Drape
 License: LGPL-2.1+
 
-Files: dbus/reserve.*
-Copyright: 2009, Lennart Poettering
-License: Expat
-
-Files: windows/portaudio/pa_asio.h
- windows/portaudio/portaudio.h
-Copyright: 1999-2002, Ross Bencina and Phil Burk
-License: other-Expat-modrequest
-
 Files: debian/po/fi.po
  debian/po/sv.po
 Copyright: 2009
@@ -523,6 +516,13 @@ Files: dbus/list.h
 Copyright: unknown
 License: GPL-2
 
+Files: linux/firewire/JackFFADODriver.h
+Copyright: 2001, Paul Davis
+  2004, Grame <grame at grame.fr>
+  2007, Pieter Palmers
+  2012, Adrian Knoth
+License: GPL-2+
+
 Files: example-clients/internal_metro.cpp
 Copyright: 2002, Anthony Van Groningen
   2005, Grame <grame at grame.fr>

-- 
jackd2 packaging

More information about the pkg-multimedia-commits mailing list