[SCM] ardour3/master: Update copyright file.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Tue Sep 17 17:53:32 UTC 2013 

The following commit has been merged in the master branch:
commit 469823696d4ef801ddeecd8eb02b006e9702d225
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Sep 17 19:56:00 2013 +0200

    Update copyright file.

diff --git a/debian/copyright b/debian/copyright
index e11cd6c..a0a0db9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,7 +26,7 @@ Files: libs/vamp-*
 Copyright:
  2000-2008 Chris Cannam
  2006-2008 Queen Mary, University of London
-License: MIT/X11 (BSD like)
+License: Expat and other-nopromo-Chris
 
 Files:
  libs/rubberband/*
@@ -649,14 +649,14 @@ Files:
  gtk2_ardour/gtk_pianokeyboard.c
 Copyright:
  2007, 2008 Edward Tomasz Napiera <trasz at FreeBSD.org>
-License: BSD (2 clause)
+License: BSD-2-clause
 
 Files:
  libs/pbd/boost-debug/shared_ptr.hpp
 Copyright:
  2001, 2002, 2003 Peter Dimov
  1998, 1999 Greg Colvin and Beman Dawes
-License: BSL (v1.0)
+License: BSL-1.0
 
 Files:
  libs/gtkmm2ext/gtkmm2ext/sync-menu.h
@@ -679,13 +679,13 @@ Files:
  libs/rubberband/src/bsd-3rdparty/getopt/getopt_long.c
 Copyright:
  2000 The NetBSD Foundation, Inc
-License: BSD (4 clause)
+License: BSD-4-clause
 
 Files:
  libs/rubberband/src/bsd-3rdparty/getopt/getopt.c
 Copyright:
  1987, 1993, 1994 Regents of the University of California
-License: BSD (4 clause)
+License: BSD-4-clause
 
 Files:
  libs/evoral/evoral/Control.hpp
@@ -730,7 +730,7 @@ Files:
  libs/evoral/src/SMFReader.cpp
 Copyright:
  2000-2008 Paul Davis / 2008 David Robillard <http://drobilla.net>
-License: GPL
+License: GPL-2+
 
 Files:
  libs/evoral/evoral/midi_events.h
@@ -759,7 +759,7 @@ Files:
  libs/taglib/examples/tagwriter.cpp
 Copyright:
  2003 Scott Wheeler <wheeler at kde.org>
-License: BSD (2 clause)
+License: BSD-2-clause
 
 Files:
  libs/taglib/bindings/c/tag_c.h
@@ -776,13 +776,13 @@ Copyright:
  2006 Lukáš Lalinský
  2003 Ismael Orenstein
  2006 Urs Fleisch
-License: LGPL-2.1 MPL-1.1
+License: LGPL-2.1 or MPL-1.1
 
 Files:
  libs/qm-dsp/thread/BlockAllocator.h
 Copyright:
  2008 Juha Nieminen
-License: MIT/X11 (BSD like)
+License: Expat
 
 Files:
  libs/ardour/rdff.c
@@ -794,16 +794,10 @@ Copyright:
 License: ISC
 
 Files:
- libs/ardour/test/midi_clock_slave_test.h
-Copyright:
- 2000-2008 Paul Davis
-License: GPL
-
-Files:
  libs/audiographer/private/sndfile.hh
 Copyright:
  2005-2007 Erik de Castro Lopo <erikd at mega-nerd.com>
-License: BSD (3 clause)
+License: BSD-3-clause
 
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify it
@@ -946,7 +940,7 @@ License: other-Apple
  Inc. ("Apple") in consideration of your agreement to the following
  terms, and your use, installation, modification or redistribution of
  this Apple software constitutes acceptance of these terms.  If you do
- not agree with these terms, please do not use, install, modify orisc
+ not agree with these terms, please do not use, install, modify or
  redistribute this Apple software.
  .
  In consideration of your agreement to abide by the following terms, and
@@ -1024,32 +1018,6 @@ License: zlib
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
 
-License: MIT/X11 (BSD like)
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use, copy,
- modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- .
- Except as contained in this notice, the names of the Centre for
- Digital Music; Queen Mary, University of London; and Chris Cannam
- shall not be used in advertising or otherwise to promote the sale,
- use or other dealings in this Software without prior written
- authorization.
-
 License: LGPL-3+
  This package is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -1070,7 +1038,7 @@ X-Comment: On Debian systems, the complete text of the GNU Lesser
  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/>.
 
-License: BSD (2 clause)
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -1092,12 +1060,12 @@ License: BSD (2 clause)
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-License: BSL (v1.0)
+License: BSL-1.0
  Distributed under the Boost Software License, Version 1.0. (See
  accompanying file LICENSE_1_0.txt or copy at
  http://www.boost.org/LICENSE_1_0.txt)
 
-License: BSD (4 clause)
+License: BSD-4-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -1126,21 +1094,7 @@ License: BSD (4 clause)
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-License: LGPL-2.1 MPL-1.1
- This library is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version
- 2.1 as published by the Free Software Foundation.
- .
- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- USA
- .
+License: MPL-1.1
  Alternatively, this file is available under the Mozilla Public
  License Version 1.1.  You may obtain a copy of the License at
  http://www.mozilla.org/MPL/
@@ -1158,7 +1112,7 @@ License: ISC
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-License: BSD (3 clause)
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:

-- 
ardour3 packaging

More information about the pkg-multimedia-commits mailing list