[SCM] ardour/master: Update copyright file.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Fri Dec 16 21:22:32 UTC 2016
The following commit has been merged in the master branch:
commit f0b88b1586f6627f45d3540ce6e8b7de69521ee5
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Fri Dec 16 19:17:27 2016 +0100
Update copyright file.
diff --git a/debian/copyright b/debian/copyright
index bbbe7cd..2315f48 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -671,12 +671,6 @@ Copyright:
License: GPL-2+
Files:
- libs/qm-dsp/thread/BlockAllocator.h
-Copyright:
- 2008 Juha Nieminen
-License: Expat
-
-Files:
libs/qm-dsp/maths/CosineDistance.cpp
libs/qm-dsp/maths/CosineDistance.h
Copyright:
@@ -696,17 +690,6 @@ License: GPL-2+
Files:
libs/qm-dsp/maths/pca/pca.h
- libs/qm-dsp/hmm/hmm.c
- libs/qm-dsp/hmm/hmm.h
- libs/qm-dsp/dsp/segmentation/segment.h
- libs/qm-dsp/dsp/segmentation/Segmenter.cpp
- libs/qm-dsp/dsp/segmentation/ClusterMeltSegmenter.cpp
- libs/qm-dsp/dsp/segmentation/cluster_segmenter.c
- libs/qm-dsp/dsp/segmentation/cluster_melt.c
- libs/qm-dsp/dsp/segmentation/cluster_melt.h
- libs/qm-dsp/dsp/segmentation/cluster_segmenter.h
- libs/qm-dsp/dsp/segmentation/Segmenter.h
- libs/qm-dsp/dsp/segmentation/ClusterMeltSegmenter.h
Copyright:
2006 Centre for Digital Music, Queen Mary, University of London
License: GPL-2+
@@ -773,10 +756,6 @@ Copyright:
2005-2007 Erik de Castro Lopo <erikd at mega-nerd.com>
License: BSD-3-clause
-Files: tools/windows_packaging/mingw64/fonts/conf.*/65-fonts-persian.conf
-Copyright: 2005, Sharif FarsiWeb, Inc. <license at farsiweb.info>
-License: other
-
Files: libs/lua/LuaBridge/*
Copyright: 2001
2001, Andrei Alexandrescu
@@ -860,7 +839,7 @@ License: GPL-2+
Files: libs/qm-dsp/dsp/chromagram/ConstantQ.cpp
libs/qm-dsp/dsp/chromagram/ConstantQ.h
Copyright: NONE
-License: GPL-2+ and/or FTL
+License: GPL-2+
License: GPL-2+
This program is free software; you can redistribute it and/or modify it
@@ -1135,22 +1114,3 @@ License: MPL-1.1
The Original Code is JEDI math.
.
You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-License: other
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of Sharif FarsiWeb, Inc. not be used in
- advertising or publicity pertaining to distribution of the software without
- specific, written prior permission. Sharif FarsiWeb, Inc. makes no
- representations about the suitability of this software for any purpose. It
- is provided "as is" without express or implied warranty.
- .
- SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
--
ardour Debian packaging
More information about the pkg-multimedia-commits
mailing list