From a819b20f55221671318c8849970204c67ef3a547 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 22 Nov 2012 15:37:08 +0000 Subject: [PATCH] Moved Flot license information into LICENSE_3RD_PARTY and debian/copyright files --- LICENSE_3RD_PARTY | 4 ++++ airtime_mvc/public/js/flot/LICENSE.txt | 22 ---------------------- debian/copyright | 4 ++++ 3 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 airtime_mvc/public/js/flot/LICENSE.txt diff --git a/LICENSE_3RD_PARTY b/LICENSE_3RD_PARTY index fff6fc84d..b32dd6d06 100644 --- a/LICENSE_3RD_PARTY +++ b/LICENSE_3RD_PARTY @@ -112,6 +112,10 @@ Non-linked code: - Web site: http://code.google.com/p/jq-serverbrowse/ - License: BSD 2-Clause + * Flot + - Web site: http://www.flotcharts.org/ + - License: MIT + ------------- Media-Monitor ------------- diff --git a/airtime_mvc/public/js/flot/LICENSE.txt b/airtime_mvc/public/js/flot/LICENSE.txt deleted file mode 100644 index 07d5b2094..000000000 --- a/airtime_mvc/public/js/flot/LICENSE.txt +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2007-2009 IOLA and Ole Laursen - -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 OR COPYRIGHT -HOLDERS 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. diff --git a/debian/copyright b/debian/copyright index 0f11be953..80d81c352 100644 --- a/debian/copyright +++ b/debian/copyright @@ -45,6 +45,10 @@ Files: airtime_mvc/library/propel/test/etc/xsl/* Copyright: 2001-2004 The Apache Software Foundation License: Apache-2.0 +Files: airtime_mvc/public/js/flot/* +Copyright: 2007-2009 IOLA and Ole Laursen +License: Expat + Files: debian/* Copyright: 2012 Alessio Treglia