diff --git a/README b/README
index 09ce35d3acc6526072085df411b63fa1086da947..9a16eff8e58acd40424119cbf4a358a88e09e99a 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
COPYRIGHT NOTICE
-Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2015 Savoir-faire Linux Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,17 +15,6 @@ 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, see <http://www.gnu.org/licenses/>.
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-
Introduction
------------
@@ -42,7 +31,7 @@ it is easy to provide different user interfaces. Ring comes with
various graphical user interfaces and even scripts to control the daemon from
the shell.
-Ring is currently used by the support team of Savoir-Faire Linux Inc.
+Ring is currently used by the support team of Savoir-faire Linux Inc.
More information is available on the project homepage:
http://www.ring.cx/
@@ -61,10 +50,10 @@ Short description of content of source tree
- bin/dbus, the D-Bus xml interfaces, and c++ bindings
-About Savoir-Faire Linux
+About Savoir-faire Linux
------------------------
-Savoir-Faire Linux is a consulting company based in Montreal, Quebec.
+Savoir-faire Linux is a consulting company based in Montreal, Quebec.
For more information, please check out our website:
http://www.savoirfairelinux.com/
diff --git a/bin/dbus/dbus_cpp.h b/bin/dbus/dbus_cpp.h
index 9b8a0c46481f3b9317e0c2333deb1f62e165444e..db836c08b826411934efc4ef329de94cc481d23f 100644
--- a/bin/dbus/dbus_cpp.h
+++ b/bin/dbus/dbus_cpp.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef DBUS_CPP_WRAPPER_H_
#define DBUS_CPP_WRAPPER_H_
diff --git a/bin/dbus/dbuscallmanager.cpp b/bin/dbus/dbuscallmanager.cpp
index 4bf52331bdd7d242bc7e44c918783a0aae41522b..87a7a77b085c882ba7e00c61b32e3d46ce087636 100644
--- a/bin/dbus/dbuscallmanager.cpp
+++ b/bin/dbus/dbuscallmanager.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Philippe Proulx <philippe.proulx@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "dbuscallmanager.h"
diff --git a/bin/dbus/dbuscallmanager.h b/bin/dbus/dbuscallmanager.h
index 1f6597425ddf963b1385294d7111a2f910a04ba4..007e99df768a43d20ae35d967064b4dced30d7fc 100644
--- a/bin/dbus/dbuscallmanager.h
+++ b/bin/dbus/dbuscallmanager.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __RING_DBUSCALLMANAGER_H__
diff --git a/bin/dbus/dbusclient.cpp b/bin/dbus/dbusclient.cpp
index 22509844471df6c0df31c5566b43798e5755eff8..9ed4ba6327d648441fcdc442b8dafadd269b8b47 100644
--- a/bin/dbus/dbusclient.cpp
+++ b/bin/dbus/dbusclient.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ *
* Author: Philippe Proulx <philippe.proulx@savoirfairelinux.com>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/bin/dbus/dbusclient.h b/bin/dbus/dbusclient.h
index 52bb865e3a13d5d22e49b4602e12688fd118902b..f3dea7516afd37e9286d470132ccc78e273e2fba 100644
--- a/bin/dbus/dbusclient.h
+++ b/bin/dbus/dbusclient.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/bin/dbus/dbusconfigurationmanager.cpp b/bin/dbus/dbusconfigurationmanager.cpp
index 7d8cf9c076ba0c6216d5981e942fa7db85444aba..4cae44f8cb72857e6998275a5fdec852410cc496 100644
--- a/bin/dbus/dbusconfigurationmanager.cpp
+++ b/bin/dbus/dbusconfigurationmanager.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Philippe Proulx <philippe.proulx@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/bin/dbus/dbusconfigurationmanager.h b/bin/dbus/dbusconfigurationmanager.h
index 3b18ec25b36092ec9e3472ce3864d5d8e9b1e0fe..f3e6dc41049a262efa4adbf2edd7aaeaf9cdaa6a 100644
--- a/bin/dbus/dbusconfigurationmanager.h
+++ b/bin/dbus/dbusconfigurationmanager.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
@@ -19,17 +20,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __RING_DBUSCONFIGURATIONMANAGER_H__
diff --git a/bin/dbus/dbusinstance.cpp b/bin/dbus/dbusinstance.cpp
index 8aedbc307e6f384653fa3990579692b1b2924332..1ac06168b0644f45a4288acf04e40dd3e653e512 100644
--- a/bin/dbus/dbusinstance.cpp
+++ b/bin/dbus/dbusinstance.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "intrin.h"
#include "dbusinstance.h"
diff --git a/bin/dbus/dbusinstance.h b/bin/dbus/dbusinstance.h
index b410c21a7eabb0096e3a4a2b5b55f1aca0ce0dfd..6983d058cda9a9a4fb6c56005c947f6624269c9f 100644
--- a/bin/dbus/dbusinstance.h
+++ b/bin/dbus/dbusinstance.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __RING_DBUSINSTANCE_H__
diff --git a/bin/dbus/dbuspresencemanager.cpp b/bin/dbus/dbuspresencemanager.cpp
index 21a838e348883e39fb3f8b72ec13746d0aa68afa..b7a07db174b6236bcbee7a2ab8c038b8576b8a73 100644
--- a/bin/dbus/dbuspresencemanager.cpp
+++ b/bin/dbus/dbuspresencemanager.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Philippe Proulx <philippe.proulx@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "dbuspresencemanager.h"
diff --git a/bin/dbus/dbuspresencemanager.h b/bin/dbus/dbuspresencemanager.h
index 9f5361f0409162388b43c6a16d4084ba8652c1ca..a4fcb98c7b82aeea5b582974d0902d9a1eba57ea 100644
--- a/bin/dbus/dbuspresencemanager.h
+++ b/bin/dbus/dbuspresencemanager.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Patrick Keroulas <patrick.keroulas@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __RING_DBUSPRESENCEMANAGER_H__
diff --git a/bin/dbus/dbusvideomanager.cpp b/bin/dbus/dbusvideomanager.cpp
index a2474ea86b06f0f4811896d926ec07fbc1e1a0be..8ea8304a61543ec76dc326f5cab9e6d7b6228898 100644
--- a/bin/dbus/dbusvideomanager.cpp
+++ b/bin/dbus/dbusvideomanager.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Philippe Proulx <philippe.proulx@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "dbusvideomanager.h"
diff --git a/bin/dbus/dbusvideomanager.h b/bin/dbus/dbusvideomanager.h
index ee128a488c6ed24041863063481d11558c6ded82..0c01d87bcae1e3319458e748a4560023312e2527 100644
--- a/bin/dbus/dbusvideomanager.h
+++ b/bin/dbus/dbusvideomanager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2012-2015 Savoir-faire Linux Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,17 +14,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __RING_DBUSVIDEOMANAGER_H__
diff --git a/bin/main.cpp b/bin/main.cpp
index 04f1adb0072ea9a8f81387f99181c9d41f777bca..edd0d69cfae84bc1e7d11d8719c3bf91e1cb590b 100644
--- a/bin/main.cpp
+++ b/bin/main.cpp
@@ -1,12 +1,13 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <iostream>
@@ -47,7 +37,7 @@ print_title()
{
std::cout
<< "Ring Daemon " << DRing::version()
- << ", by Savoir-Faire Linux 2004-2015" << std::endl
+ << ", by Savoir-faire Linux 2004-2015" << std::endl
<< "http://www.ring.cx/" << std::endl
#ifdef RING_VIDEO
<< "[Video support enabled]" << std::endl
diff --git a/bin/osxmain.cpp b/bin/osxmain.cpp
index 73e22255c37c7aadaf876036898a8f78be078184..e1c69bba8bae395e01a2876db40bee4c74b90ca8 100644
--- a/bin/osxmain.cpp
+++ b/bin/osxmain.cpp
@@ -1,12 +1,13 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <iostream>
#include <thread>
@@ -52,7 +42,7 @@ print_title()
{
std::cout
<< "Ring Daemon " << DRing::version()
- << ", by Savoir-Faire Linux 2004-2015" << std::endl
+ << ", by Savoir-faire Linux 2004-2015" << std::endl
<< "http://www.ring.cx/" << std::endl
#ifdef RING_VIDEO
<< "[Video support enabled]" << std::endl
diff --git a/bin/winmain.cpp b/bin/winmain.cpp
index 5cf9d20ab9f04f41d37357111ea7fc2e9acfed5b..efce9d324d311293ebe16d98fb85371ec7f88e40 100644
--- a/bin/winmain.cpp
+++ b/bin/winmain.cpp
@@ -1,10 +1,11 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <iostream>
@@ -57,7 +47,7 @@ print_title()
{
std::cout
<< "Ring Daemon " << DRing::version()
- << ", by Savoir-Faire Linux 2004-2015" << std::endl
+ << ", by Savoir-faire Linux 2004-2015" << std::endl
<< "http://www.ring.cx/" << std::endl
#ifdef RING_VIDEO
<< "[Video support enabled]" << std::endl
diff --git a/configure.ac b/configure.ac
index f9d626e414908255004d8b39f394ead0bbc44944..2398401cfb6de6047729efe629a1d1ce00bfcef0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65])
AC_INIT([Ring],[2.3.0],[ring@lists.savoirfairelinux.net],[ring])
-AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2015]])
+AC_COPYRIGHT([[Copyright (c) Savoir-faire Linux 2004-2015]])
AC_REVISION([$Revision$])
dnl Where to find configure files
diff --git a/contrib/src/pjproject/gnutls.patch b/contrib/src/pjproject/gnutls.patch
index 26189553aa3d3b3a6d33d28612d312b672b96972..ab78426e7f5bc0e1e198877c34b3f2bd702cd0e7 100644
--- a/contrib/src/pjproject/gnutls.patch
+++ b/contrib/src/pjproject/gnutls.patch
@@ -15,7 +15,7 @@ Written by
Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
Philippe Proulx <philippe.proulx@savoirfairelinux.com> and
Adrien Béraud <adrien.beraud@savoirfairelinux.com>
-on behalf of Savoir-Faire Linux.
+on behalf of Savoir-faire Linux.
---
{a => b}/aconfigure | 194 +-
{a => b}/aconfigure.ac | 109 +-
@@ -496,7 +496,7 @@ index 0000000..5a383d7
@@ -0,0 +1,2869 @@
+/* $Id$ */
+/*
-+ * Copyright (C) 2014-2015 Savoir-Faire Linux. (http://www.savoirfairelinux.com)
++ * Copyright (C) 2014-2015 Savoir-faire Linux. (http://www.savoirfairelinux.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
diff --git a/man/dring.pod b/man/dring.pod
index e0bfa4bc128c5615cd62df6da50540dd371c0d97..0052aa3bb719fc3e8873853b1a0497cec8b6f516 100644
--- a/man/dring.pod
+++ b/man/dring.pod
@@ -36,7 +36,7 @@ Please report bugs at https://projects.savoirfairelinux.com/projects/ring/issues
=head1 AUTHORS
-B<dring> is developed in Montreal by Savoir-Faire Linux Inc. The active developers are Tristan Matthews <tristan.matthews@savoirfairelinux.com> and Alexandre Savard <alexandre.savard@savoirfairelinux.com>.
+B<dring> is developed in Montreal by Savoir-faire Linux Inc. The active developers are Tristan Matthews <tristan.matthews@savoirfairelinux.com> and Alexandre Savard <alexandre.savard@savoirfairelinux.com>.
This manual page was written by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>.
diff --git a/src/account.cpp b/src/account.cpp
index 243d36c35de8f546ced42ad81e170236d7739c7c..21ee0885a041df1504313d1e74df6d6e4e831305 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -1,9 +1,9 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
- * Author : Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/account.h b/src/account.h
index fd2efb6d79abd2802ac12817d20e5cbb2627c5e7..d746ac97c6933a984a92581b2e60886dfd4bea5b 100644
--- a/src/account.h
+++ b/src/account.h
@@ -1,8 +1,9 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
- * Author : Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef ACCOUNT_H
diff --git a/src/account_factory.cpp b/src/account_factory.cpp
index e711bfd60db6033dea46f9661b621676e561581a..574c674618afb4c4b3cf97a852d0f2392d48ddb6 100644
--- a/src/account_factory.cpp
+++ b/src/account_factory.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/account_factory.h b/src/account_factory.h
index 34b7e6a4b61644f20bc681c41f1440e096a27c1c..f3c47249200917e240dcf855f0c4df86c8a3b616 100644
--- a/src/account_factory.h
+++ b/src/account_factory.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef ACCOUNT_FACTORY_H
diff --git a/src/account_schema.h b/src/account_schema.h
index 5a1bfd4d40ba145ceb9bb91d04f8f188d28fef43..35bc3a92d3da6823539a4ce90e2bec22f467e8dc 100644
--- a/src/account_schema.h
+++ b/src/account_schema.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef ACCOUNT_SCHEMA_H_
diff --git a/src/array_size.h b/src/array_size.h
index 34bc58c7d7c6c7964484e00ddfb06d0048c4f2dc..53a94b3d6ddeecd44b541e869d1ba9859006cfed 100644
--- a/src/array_size.h
+++ b/src/array_size.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/src/buildinfo.cpp b/src/buildinfo.cpp
index 45f0cbb95fd22f4353f460fc025456f524bfc82e..a5162c3039b2cd2a4c401ea7bb5b2633bfa0381e 100644
--- a/src/buildinfo.cpp
+++ b/src/buildinfo.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/call.cpp b/src/call.cpp
index 4f38d1e2fcc8258103c2b59f36c5a71c228f8f3a..b93a21889b254199af779c8cf292270c8f029e8a 100644
--- a/src/call.cpp
+++ b/src/call.cpp
@@ -1,8 +1,9 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
- * Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
- * Author : Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "call.h"
diff --git a/src/call.h b/src/call.h
index 641bf0dddba8b55534de2870e24c423bdcc4b69b..863d9d1bdf9fe26ef3b5a63f2f99d6b577b0ba3e 100644
--- a/src/call.h
+++ b/src/call.h
@@ -1,9 +1,10 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
- * Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
- * Author : Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __CALL_H__
diff --git a/src/call_factory.cpp b/src/call_factory.cpp
index dcd3ac806553225f2b33603dcb0c65393b1496ec..cc2f8440ba4a6aa34527a88c8133aba230c73bd8 100644
--- a/src/call_factory.cpp
+++ b/src/call_factory.cpp
@@ -1,6 +1,7 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
- * Author : Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "call_factory.h"
diff --git a/src/call_factory.h b/src/call_factory.h
index 4f6df7c7cc6d3e3dad9b8c73e149c41f413c2f12..04821cc2dff731744c6936805872d1aca1bd3e42 100644
--- a/src/call_factory.h
+++ b/src/call_factory.h
@@ -1,6 +1,7 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
- * Author : Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef CALL_FACTORY_H
diff --git a/src/client/callmanager.cpp b/src/client/callmanager.cpp
index aebeb5bf334726466fe53faaa74a1119a9b239be..cabc97dc67f2c0b7540bf9e745913355f069fbec 100644
--- a/src/client/callmanager.cpp
+++ b/src/client/callmanager.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <vector>
#include <cstring>
diff --git a/src/client/configurationmanager.cpp b/src/client/configurationmanager.cpp
index f8d2f03aa00364b317f83445d24dfb60f694f3f9..18ae6989a9f1c8905e57fc6bf44e89f889d50c7f 100644
--- a/src/client/configurationmanager.cpp
+++ b/src/client/configurationmanager.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@savoirfairelinux.com>
@@ -18,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/client/presencemanager.cpp b/src/client/presencemanager.cpp
index 22182f9a0d9e717d6afb00af756748a06844ccd5..b9d640c268f93c8d37c953a98086952d6cd891ff 100644
--- a/src/client/presencemanager.cpp
+++ b/src/client/presencemanager.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Patrick Keroulas <patrick.keroulas@savoirfairelinux.com>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/client/ring_signal.cpp b/src/client/ring_signal.cpp
index ac552d5b5b6774c49e31a9ffbe322356209f6c25..498d4ad1218b92120e9c30739f5bf9487aba578f 100644
--- a/src/client/ring_signal.cpp
+++ b/src/client/ring_signal.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "ring_signal.h"
diff --git a/src/client/ring_signal.h b/src/client/ring_signal.h
index afdb584bf1fbb00c35fc4542e18c6f67870fec79..7fe880408175a2c9b71c79a3fff3ae2f7164ebec 100644
--- a/src/client/ring_signal.h
+++ b/src/client/ring_signal.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/src/client/videomanager.cpp b/src/client/videomanager.cpp
index 8fb1c730806a5c4bd80c824cde31839e1970e986..b02dc7d41a5cbdca32104899bb0d9bb699c5dca3 100644
--- a/src/client/videomanager.cpp
+++ b/src/client/videomanager.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@savoirfairelinux.com>
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "videomanager_interface.h"
diff --git a/src/client/videomanager.h b/src/client/videomanager.h
index 6e3eed64b63e203a42602672dd10f957af172ba5..47ff88dff5163bd871edfd1a5392d9ded2e03164 100644
--- a/src/client/videomanager.h
+++ b/src/client/videomanager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2012-2015 Savoir-faire Linux Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,17 +14,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef VIDEOMANAGER_H_
diff --git a/src/conference.cpp b/src/conference.cpp
index 30286dc69b7973eac392d0577de534965ef1eed9..19df4d4ea38be3858fedb1bf824069101ef6f9f4 100644
--- a/src/conference.cpp
+++ b/src/conference.cpp
@@ -1,7 +1,8 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
- * Author : Alexandre Savard <alexandre.savard@savoirfairelinux.com>
- * Author : Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <sstream>
diff --git a/src/conference.h b/src/conference.h
index 24e8519f8241a4ed5a9179e5db2523046356ed60..daaf1c25e4b00f2389c98e9abd92a3f1026848c7 100644
--- a/src/conference.h
+++ b/src/conference.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef CONFERENCE_H
#define CONFERENCE_H
diff --git a/src/config/serializable.h b/src/config/serializable.h
index d5a83ab52eab24d11ae6b3d464970241a24f7afe..de76c2af3e8c0f864a1f67c62c330ca3bef594bf 100644
--- a/src/config/serializable.h
+++ b/src/config/serializable.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef SERIALIZABLE_H__
diff --git a/src/config/yamlparser.cpp b/src/config/yamlparser.cpp
index b410c0d042aef430f6af4612a272614767abc0fe..e40e366b7cb8e0907a7be851a3d251d478352e47 100644
--- a/src/config/yamlparser.cpp
+++ b/src/config/yamlparser.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "yamlparser.h"
diff --git a/src/config/yamlparser.h b/src/config/yamlparser.h
index d947228c9fc1f818bfd4104daa3377c0fb514373..0162df723579f3d4b02774417d7aa192a1ae222f 100644
--- a/src/config/yamlparser.h
+++ b/src/config/yamlparser.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __YAMLPARSER_H__
diff --git a/src/dring/account_const.h b/src/dring/account_const.h
index a2827bae25aeadf775c5ed4f9c1294f67a4a63f5..c77a00e2e8308e4b5be846615ad458279822a862 100644
--- a/src/dring/account_const.h
+++ b/src/dring/account_const.h
@@ -1,32 +1,22 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
- * This program is free software you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation either version 3 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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
+ * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef DRING_ACCOUNT_H
#define DRING_ACCOUNT_H
diff --git a/src/dring/call_const.h b/src/dring/call_const.h
index 86f63681ce1a45311c0dbbca53ee845aced16f47..0626adcd84e8bc9491b9da03416b0a7b5f5dac55 100644
--- a/src/dring/call_const.h
+++ b/src/dring/call_const.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef DRING_CALL_H
#define DRING_CALL_H
diff --git a/src/dring/callmanager_interface.h b/src/dring/callmanager_interface.h
index 22078079cc2385d7b832ce638956c242401537df..aec8d911a084d5df0b08e7092b7344db4292d2c0 100644
--- a/src/dring/callmanager_interface.h
+++ b/src/dring/callmanager_interface.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef DRING_CALLMANAGERI_H
diff --git a/src/dring/configurationmanager_interface.h b/src/dring/configurationmanager_interface.h
index 5d7d3c69972a68b4c831221d103c5e95f0e79e7b..9786ed8e6bbe779d7a9c37fd752c2188f479b982 100644
--- a/src/dring/configurationmanager_interface.h
+++ b/src/dring/configurationmanager_interface.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
@@ -19,17 +20,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef DRING_CONFIGURATIONMANAGERI_H
diff --git a/src/dring/dring.h b/src/dring/dring.h
index fe9b421392e3cfc38b85e505e45d55020320c19e..1463e9725872521f26b5fc17ee84000cf41db2a3 100644
--- a/src/dring/dring.h
+++ b/src/dring/dring.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ *
* Author: Philippe Proulx <philippe.proulx@savoirfairelinux.com>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef DRING_H
#define DRING_H
diff --git a/src/dring/media_const.h b/src/dring/media_const.h
index 2929dd21186f67b870ddd958319464e3b4b15899..9a26a135e4c1e159a94279ccb5b7af0858c1ef2a 100644
--- a/src/dring/media_const.h
+++ b/src/dring/media_const.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Eloi Bail <eloi.bail@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef DRING_MEDIA_H
#define DRING_MEDIA_H
diff --git a/src/dring/presencemanager_interface.h b/src/dring/presencemanager_interface.h
index 0790cc793b2b8f5443f028a4ce28cd9cb8c7b652..e6eb841a2a4b68a63ec3215f5d249961fe6d88ee 100644
--- a/src/dring/presencemanager_interface.h
+++ b/src/dring/presencemanager_interface.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Patrick Keroulas <patrick.keroulas@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef DRING_PRESENCEMANAGERI_H
diff --git a/src/dring/security_const.h b/src/dring/security_const.h
index 70386855dee4eaa14050a85166cd6a9e96351a2e..49500b66e42df2f625aca565beab888ed0cbd5e5 100644
--- a/src/dring/security_const.h
+++ b/src/dring/security_const.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Philippe Proulx <philippe.proulx@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef DRING_SECURITY_H
#define DRING_SECURITY_H
diff --git a/src/dring/videomanager_interface.h b/src/dring/videomanager_interface.h
index 03eda7980590a57f838f849f10120db80e325acf..c10035f0cdda1fe88f9052c8b6668fca79b940a7 100644
--- a/src/dring/videomanager_interface.h
+++ b/src/dring/videomanager_interface.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2012-2015 Savoir-faire Linux Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,17 +14,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef DRING_VIDEOMANAGERI_H
diff --git a/src/enumclass_utils.h b/src/enumclass_utils.h
index f67ef8d699f88e9083421879543adff9802d63ff..a6c3542169bfc63a1e89248b688fd881ec5766f5 100644
--- a/src/enumclass_utils.h
+++ b/src/enumclass_utils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
*
* Author: Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
*
@@ -16,7 +16,6 @@
* 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.
- *
*/
#ifndef ENUM_CLASS_UTILS_H
#define ENUM_CLASS_UTILS_H
diff --git a/src/fileutils.cpp b/src/fileutils.cpp
index f4cce895ad1b1266df7c75f1e2212b0e90dd6c49..34fe6a31cb16fa44da02b1e8d550bcd439323937 100644
--- a/src/fileutils.cpp
+++ b/src/fileutils.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011-2015 Savoir-faire Linux Inc.
* Copyright (C) 2010 Michael Kerrisk
* Copyright (C) 2007-2009 Rémi Denis-Courmont
*
@@ -18,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/fileutils.h b/src/fileutils.h
index 0d54de12e472ab6527ed33f86523f76fd4484501..3c43366fb05c237dcc421d00f1dc5f9fcb6cc3dd 100644
--- a/src/fileutils.h
+++ b/src/fileutils.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011-2015 Savoir-faire Linux Inc.
+ *
* Author: Rafaël Carré <rafael.carre@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef FILEUTILS_H_
diff --git a/src/hooks/urlhook.cpp b/src/hooks/urlhook.cpp
index 373fa2bc0cc6d8df2142b25b556cfba83b9fb94f..ed75ef022cf07cf99151e3b7dbfb286929972d3a 100644
--- a/src/hooks/urlhook.cpp
+++ b/src/hooks/urlhook.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "urlhook.h"
diff --git a/src/hooks/urlhook.h b/src/hooks/urlhook.h
index 2c51325181a5d71bf73af84d8ce407f4f31d46a2..0df2b9c42b5308d62966d519233231af4f531c40 100644
--- a/src/hooks/urlhook.h
+++ b/src/hooks/urlhook.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef URL_HOOK_H
diff --git a/src/iax/iaxaccount.cpp b/src/iax/iaxaccount.cpp
index ea989572097fc7a947b4c9c74e3b45cc8e0cbffa..55751a6b182f7a9c7d2291d7ddc23801e801f1f6 100644
--- a/src/iax/iaxaccount.cpp
+++ b/src/iax/iaxaccount.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
@@ -19,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/iax/iaxaccount.h b/src/iax/iaxaccount.h
index 7586cae944ba706319f50f6db9a2762762cf55b7..34767766e03cf986a8b7157df1d5ca08dd6a2f22 100644
--- a/src/iax/iaxaccount.h
+++ b/src/iax/iaxaccount.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef IAXACCOUNT_H
diff --git a/src/iax/iaxcall.cpp b/src/iax/iaxcall.cpp
index 5cd366f869e42b91585946114439b1e4603a1c2f..58e2fac32a9913d4149946e8a3e718b5029316fd 100644
--- a/src/iax/iaxcall.cpp
+++ b/src/iax/iaxcall.cpp
@@ -1,8 +1,9 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
- * Author : Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <cstring>
diff --git a/src/iax/iaxcall.h b/src/iax/iaxcall.h
index b12a9133b7cf5f239e79c210c86e06ae52da68c6..fc9164d5ef6e768ca6036448d57cfacb631375ad 100644
--- a/src/iax/iaxcall.h
+++ b/src/iax/iaxcall.h
@@ -1,8 +1,9 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
- * Author : Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef IAXCALL_H
#define IAXCALL_H
diff --git a/src/iax/iaxvoiplink.cpp b/src/iax/iaxvoiplink.cpp
index 225690ba172d0b278ccdb3854c8e1a7197cd0098..44ae13fa1aa7090635ca5057623a220c7925830a 100644
--- a/src/iax/iaxvoiplink.cpp
+++ b/src/iax/iaxvoiplink.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "iaxvoiplink.h"
diff --git a/src/iax/iaxvoiplink.h b/src/iax/iaxvoiplink.h
index 09078ed76f8640ed31d109da5dbaaedffca7350c..9a6593e39bbeeefa3964a5263a4a0f8dcbd4cac0 100644
--- a/src/iax/iaxvoiplink.h
+++ b/src/iax/iaxvoiplink.h
@@ -1,9 +1,10 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
- * Author : Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef IAXVOIPLINK_H
#define IAXVOIPLINK_H
diff --git a/src/ice_socket.h b/src/ice_socket.h
index 19fec6ccfe0ec8d95a303cf8eb8d08dccb15dec6..7efda8ff58c2cdd9b3af9f1475dac5146e9dcbe5 100644
--- a/src/ice_socket.h
+++ b/src/ice_socket.h
@@ -1,11 +1,13 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program 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
@@ -14,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef ICE_SOCKET_H
#define ICE_SOCKET_H
diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index e44e557ef16c026a19c25ccf6f9ad79b2e9803c4..f4e2ed5d6e0431cd5274b4f29af26e4733b1bb34 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -1,11 +1,13 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program 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
@@ -14,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "ice_transport.h"
diff --git a/src/ice_transport.h b/src/ice_transport.h
index 109c8a126a1ef7d05035d3551ff803327afe31e4..6318a0526f71a0f9a75def6b303a69868b2b5aaa 100644
--- a/src/ice_transport.h
+++ b/src/ice_transport.h
@@ -1,11 +1,13 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program 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
@@ -14,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef ICE_TRANSPORT_H
diff --git a/src/im/instant_messaging.cpp b/src/im/instant_messaging.cpp
index 2a44a17ad4dad730dc2817a9162a71feb9be4ed4..3cac14038267c98d9dcc804bd90675da095a2d9d 100644
--- a/src/im/instant_messaging.cpp
+++ b/src/im/instant_messaging.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Emmanuel Lepage <elv1313@gmail.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
@@ -18,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "instant_messaging.h"
diff --git a/src/im/instant_messaging.h b/src/im/instant_messaging.h
index 2bd13fa87ba340f346f240d10d52f388128c002f..0fac2aa90ef8eaed5ad6d5c1005159911e9a5718 100644
--- a/src/im/instant_messaging.h
+++ b/src/im/instant_messaging.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/src/intrin.h b/src/intrin.h
index 1757794a50d5404c285d79f217ab9ddf35749d4a..31e35ca80ce40a137d9f5b280125babb5c6e797d 100644
--- a/src/intrin.h
+++ b/src/intrin.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef INTRIN_H_
diff --git a/src/ip_utils.cpp b/src/ip_utils.cpp
index 66435d20d312c48f7cb54e74f497b17765c8258a..66bb2c574e12a7a6233f335ba09ecfb54f5fb47d 100644
--- a/src/ip_utils.cpp
+++ b/src/ip_utils.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "ip_utils.h"
diff --git a/src/ip_utils.h b/src/ip_utils.h
index db86673e5e645340c29a8f1b6dc00181e0e66ffd..8d966ebc834e8c8b6ac9e8bf377f80bb96c76e4b 100644
--- a/src/ip_utils.h
+++ b/src/ip_utils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef IP_UTILS_H_
diff --git a/src/logger.cpp b/src/logger.cpp
index 1467492816a0c19e8531a585d2c66d66018c5eeb..37a4c51cbfc81b88517c3ebff6380efa8d7be7f2 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <stdio.h>
diff --git a/src/logger.h b/src/logger.h
index b35b1ef33518c82b87a411de72ab8a94caa94125..5f00df14d8d0bb4fdb64c43d1e17562dc62f1a18 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/src/manager.cpp b/src/manager.cpp
index 0f8c5499034f58438fdf9cfb4cfdcf13332a8a70..6da67fb820b93dc5c376b21b3b72ce6e40ba7002 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
@@ -22,17 +23,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/manager.h b/src/manager.h
index 1cf2257c35a5f8407f3fe99d5b2245f07b19c1f3..74bea6c748d218fa15de135c08bfb2b8b9d2b4ad 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
@@ -21,17 +22,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/src/map_utils.h b/src/map_utils.h
index 2f7eb8155382ddf384bb9f64aacd9efbba8e5e53..9e09e6c272f97f4c2f7537381039af1bf97b6f40 100644
--- a/src/map_utils.h
+++ b/src/map_utils.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef MAP_UTILS_H_
diff --git a/src/media/audio/alsa/alsalayer.cpp b/src/media/audio/alsa/alsalayer.cpp
index c44d5ba1a0d8cda700537389a32c30c726d5cfce..2e73ff61dd0f16f8c85faeeaace96d8ea7f7d8ae 100644
--- a/src/media/audio/alsa/alsalayer.cpp
+++ b/src/media/audio/alsa/alsalayer.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Андрей Лухнов <aol.nnov@gmail.com>
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "alsalayer.h"
diff --git a/src/media/audio/alsa/alsalayer.h b/src/media/audio/alsa/alsalayer.h
index a743817ca3b33846fb1e1d3f36cf28f1d6ad415a..f547b086b9b3e39f7785b7b7114e89ddf1c240cf 100644
--- a/src/media/audio/alsa/alsalayer.h
+++ b/src/media/audio/alsa/alsalayer.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Андрей Лухнов <aol.nnov@gmail.com>
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef ALSA_LAYER_H_
diff --git a/src/media/audio/audio_rtp_session.cpp b/src/media/audio/audio_rtp_session.cpp
index afe335846da68bbf59e53c57b10dd9b3d7f69a62..ae2b4d17ce5c34e277003fd8f62038f1f6037849 100644
--- a/src/media/audio/audio_rtp_session.cpp
+++ b/src/media/audio/audio_rtp_session.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "audio_rtp_session.h"
diff --git a/src/media/audio/audio_rtp_session.h b/src/media/audio/audio_rtp_session.h
index 4cca94ec9d2385fe571651b0ba7b82346b2a5758..1f633fb09a326a3a22aabf1f90c9efb377df52e4 100644
--- a/src/media/audio/audio_rtp_session.h
+++ b/src/media/audio/audio_rtp_session.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef AUDIO_RTP_SESSION_H__
diff --git a/src/media/audio/audiobuffer.cpp b/src/media/audio/audiobuffer.cpp
index 4a396e800bfcee0251d8e14e8a2f82c1df54ccca..9fb272956060507ce6307924c1bfc493837a4b9d 100644
--- a/src/media/audio/audiobuffer.cpp
+++ b/src/media/audio/audiobuffer.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Adrien Beraud <adrien.beraud@wisdomvibes.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "audiobuffer.h"
diff --git a/src/media/audio/audiobuffer.h b/src/media/audio/audiobuffer.h
index fe25c969c202a1fc0e2f095c7924757440c6c049..5e18de20b9e04d002d3075288fcbac21c44986a1 100644
--- a/src/media/audio/audiobuffer.h
+++ b/src/media/audio/audiobuffer.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Adrien Beraud <adrien.beraud@wisdomvibes.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _AUDIO_BUFFER_H
diff --git a/src/media/audio/audiolayer.cpp b/src/media/audio/audiolayer.cpp
index 0823ca3a164c06952ad57e1bca8cd773c72bf391..3e3c4c0b73525a570abe543f7feaf332479a335e 100644
--- a/src/media/audio/audiolayer.cpp
+++ b/src/media/audio/audiolayer.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "audiolayer.h"
diff --git a/src/media/audio/audiolayer.h b/src/media/audio/audiolayer.h
index 611ddc77ef801dfca69dae7e9672c41cddce89b8..92d767bba86655ef0f19378ce3a296a01902773f 100644
--- a/src/media/audio/audiolayer.h
+++ b/src/media/audio/audiolayer.h
@@ -1,9 +1,10 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
- * Author: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
+ * Author: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
- * Authro: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef AUDIO_LAYER_H_
diff --git a/src/media/audio/audioloop.cpp b/src/media/audio/audioloop.cpp
index e3928111342d924626f3306c76d7b99f58654274..25dfe9193d60cb75212ec72d4fb97eabb5793bec 100644
--- a/src/media/audio/audioloop.cpp
+++ b/src/media/audio/audioloop.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -19,17 +20,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/media/audio/audioloop.h b/src/media/audio/audioloop.h
index ff53398a98d856d952b7c8200a09691db9d415f3..c5019c29aad6a1e501c4cfeeb178bd8fe365d044 100644
--- a/src/media/audio/audioloop.h
+++ b/src/media/audio/audioloop.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -18,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __AUDIOLOOP_H__
#define __AUDIOLOOP_H__
diff --git a/src/media/audio/audiorecord.cpp b/src/media/audio/audiorecord.cpp
index 3dc8b5c12c6565cdc36b5b02e025ad748a388f28..799db739ead8b09a6519c2fe024d44722fa84fcc 100644
--- a/src/media/audio/audiorecord.cpp
+++ b/src/media/audio/audiorecord.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/media/audio/audiorecord.h b/src/media/audio/audiorecord.h
index d60b6639405397e8cce1159ee79cad92e65c5095..2037ab0bafa713566f492dd8cb42af38656625b0 100644
--- a/src/media/audio/audiorecord.h
+++ b/src/media/audio/audiorecord.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _AUDIO_RECORD_H
diff --git a/src/media/audio/audiorecorder.cpp b/src/media/audio/audiorecorder.cpp
index 2e1600bce11c405879a8b6c197dc9949b0d86641..06ec53e3408ced93f9a5c2417e25f108c5998531 100644
--- a/src/media/audio/audiorecorder.cpp
+++ b/src/media/audio/audiorecorder.cpp
@@ -1,6 +1,7 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
- * Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "audiorecorder.h"
diff --git a/src/media/audio/audiorecorder.h b/src/media/audio/audiorecorder.h
index 8766119a838e20920317401d142309ab1198fed1..9878ff1d7b4ddfb7411c97e53d2c8f26d067708f 100644
--- a/src/media/audio/audiorecorder.h
+++ b/src/media/audio/audiorecorder.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef AUDIORECORDER_H_
diff --git a/src/media/audio/coreaudio/audiodevice.cpp b/src/media/audio/coreaudio/audiodevice.cpp
index 591154b56a7e4c52d8a5fd25634b7a2809772384..b28bde171cc45ef03c0d90e1968e9e08bc14318f 100644
--- a/src/media/audio/coreaudio/audiodevice.cpp
+++ b/src/media/audio/coreaudio/audiodevice.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Philippe Groarke <philippe.groarke@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "audiodevice.h"
diff --git a/src/media/audio/coreaudio/audiodevice.h b/src/media/audio/coreaudio/audiodevice.h
index 16016bc08769e7955e6649e91829488d21665fdb..6f5cc6773450197103a6e07c877e063dd59b89ad 100644
--- a/src/media/audio/coreaudio/audiodevice.h
+++ b/src/media/audio/coreaudio/audiodevice.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Philippe Groarke <philippe.groarke@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef AUDIO_DEVICE_H
diff --git a/src/media/audio/coreaudio/corelayer.cpp b/src/media/audio/coreaudio/corelayer.cpp
index 2bbe088056bfd4db8ca8737222db347f8d04bf93..9cef1ec5c2aa813e079b2c44701c69374e73e472 100644
--- a/src/media/audio/coreaudio/corelayer.cpp
+++ b/src/media/audio/coreaudio/corelayer.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Philippe Groarke <philippe.groarke@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "corelayer.h"
diff --git a/src/media/audio/coreaudio/corelayer.h b/src/media/audio/coreaudio/corelayer.h
index 732348ba32ba6d59dc1223b933827d58309217aa..2389433ec9cb56d3dfbedb029f85a1db59386c46 100644
--- a/src/media/audio/coreaudio/corelayer.h
+++ b/src/media/audio/coreaudio/corelayer.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Philippe Groarke <philippe.groarke@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef CORE_LAYER_H_
diff --git a/src/media/audio/dcblocker.cpp b/src/media/audio/dcblocker.cpp
index 418969bd9d7dc048cfeb5393e9dab6c0f1f73854..eb375c6d256d2a7dad692b1af1c88d4683063e23 100644
--- a/src/media/audio/dcblocker.cpp
+++ b/src/media/audio/dcblocker.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "dcblocker.h"
diff --git a/src/media/audio/dcblocker.h b/src/media/audio/dcblocker.h
index aeac13f62edb1288de83321f618b87d6cb98d8f7..5ca914142daea55a7172e6178ee9d19fac2a1f86 100644
--- a/src/media/audio/dcblocker.h
+++ b/src/media/audio/dcblocker.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Adrien Beraud <adrien.beraud@gmail.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef DCBLOCKER_H
diff --git a/src/media/audio/dsp.cpp b/src/media/audio/dsp.cpp
index 2ffb5c9c19584022eb63cb020e675694fac6f0fb..f9fcb700aaff81749d6e1fe36bc99f0701ac82b6 100644
--- a/src/media/audio/dsp.cpp
+++ b/src/media/audio/dsp.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "logger.h"
diff --git a/src/media/audio/dsp.h b/src/media/audio/dsp.h
index de65cd2a5b0562cd4f54bd35e4e2e26f9582f9d7..872949583cd59a188eeaaa2f3562c10e1fbdfa9e 100644
--- a/src/media/audio/dsp.h
+++ b/src/media/audio/dsp.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef DSP_H_
diff --git a/src/media/audio/jack/jacklayer.cpp b/src/media/audio/jack/jacklayer.cpp
index 10ad67b86f194719cbff4d9405b76b63c3ab2821..994032b3d898ba326028bfc9f6b676a2469e65d5 100644
--- a/src/media/audio/jack/jacklayer.cpp
+++ b/src/media/audio/jack/jacklayer.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/media/audio/jack/jacklayer.h b/src/media/audio/jack/jacklayer.h
index 1e2f1a5a3b8dc9a01ff1370d40a378e907561b51..0b54dcaac31443035697dc591f534cc6be88c1f5 100644
--- a/src/media/audio/jack/jacklayer.h
+++ b/src/media/audio/jack/jacklayer.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef JACK_LAYER_H_
diff --git a/src/media/audio/opensl/opensllayer.cpp b/src/media/audio/opensl/opensllayer.cpp
index f179bafba036286ca7a9db7b0b8304e8d71180a4..3eafa8a5bf036a5f25f232e49d04b85209da1fb4 100644
--- a/src/media/audio/opensl/opensllayer.cpp
+++ b/src/media/audio/opensl/opensllayer.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,18 +15,7 @@
*
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "opensllayer.h"
diff --git a/src/media/audio/opensl/opensllayer.h b/src/media/audio/opensl/opensllayer.h
index ac0a44de50c6a5f71946a0f5d24cf19f5aa09e25..defba741bad3b07339b6492f1f1b17e04a55c400 100644
--- a/src/media/audio/opensl/opensllayer.h
+++ b/src/media/audio/opensl/opensllayer.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,18 +15,7 @@
*
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef _OPENSL_LAYER_H
diff --git a/src/media/audio/portaudio/portaudiolayer.cpp b/src/media/audio/portaudio/portaudiolayer.cpp
index cb943ff1c73cbaa71a6292c6f6482870161c24c9..28a12d15f4bc4e054dd203f0a83f68126a09641a 100644
--- a/src/media/audio/portaudio/portaudiolayer.cpp
+++ b/src/media/audio/portaudio/portaudiolayer.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Edric Ladent-Milaret <edric.ladent-milaret@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "portaudiolayer.h"
diff --git a/src/media/audio/portaudio/portaudiolayer.h b/src/media/audio/portaudio/portaudiolayer.h
index c54e713fa7ca6b3141b35678462ef4d3caf30315..589a5f2c249d94ddc0b503b0ed3470def8b862bc 100644
--- a/src/media/audio/portaudio/portaudiolayer.h
+++ b/src/media/audio/portaudio/portaudiolayer.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Edric Ladent-Milaret <edric.ladent-milaret@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef PORTAUDIO_LAYER_H
@@ -101,4 +91,4 @@ public:
};
}
-#endif
\ No newline at end of file
+#endif
diff --git a/src/media/audio/pulseaudio/audiostream.cpp b/src/media/audio/pulseaudio/audiostream.cpp
index 7fe4871798170607c991830086c799cd1dc408d7..fe27833a99230674245486de9062d5a9ae6502b5 100644
--- a/src/media/audio/pulseaudio/audiostream.cpp
+++ b/src/media/audio/pulseaudio/audiostream.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "audiostream.h"
diff --git a/src/media/audio/pulseaudio/audiostream.h b/src/media/audio/pulseaudio/audiostream.h
index 2e494344d84062d743658c18a45cd5178cef1208..9758389c921c8a50645cf4099d5c24703bf25407 100644
--- a/src/media/audio/pulseaudio/audiostream.h
+++ b/src/media/audio/pulseaudio/audiostream.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _AUDIO_STREAM_H
diff --git a/src/media/audio/pulseaudio/pulselayer.cpp b/src/media/audio/pulseaudio/pulselayer.cpp
index a90d0f7bf2c26d978c533b63fa8ba24a582ac1cb..7589b7e42c06954539b150dc9625a1eaee104baf 100644
--- a/src/media/audio/pulseaudio/pulselayer.cpp
+++ b/src/media/audio/pulseaudio/pulselayer.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Андрей Лухнов <aol.nnov@gmail.com>
@@ -18,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <algorithm> // for std::find
diff --git a/src/media/audio/pulseaudio/pulselayer.h b/src/media/audio/pulseaudio/pulselayer.h
index 56013545d105f49bd58654df877bba0af318f3da..02a2b78a72da1d41082b746198a13c11fd100f86 100644
--- a/src/media/audio/pulseaudio/pulselayer.h
+++ b/src/media/audio/pulseaudio/pulselayer.h
@@ -1,6 +1,7 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Андрей Лухнов <aol.nnov@gmail.com>
@@ -19,17 +20,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef PULSE_LAYER_H_
diff --git a/src/media/audio/recordable.cpp b/src/media/audio/recordable.cpp
index 6c0832c355e06fe34fb181949eeef488a45c5019..163059c1bc815b84f65112f8f1d43cb1c4727de0 100644
--- a/src/media/audio/recordable.cpp
+++ b/src/media/audio/recordable.cpp
@@ -1,11 +1,13 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program 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
@@ -14,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "recordable.h"
diff --git a/src/media/audio/recordable.h b/src/media/audio/recordable.h
index cc8bb4325d8e83d8df7b9efb590a8c13b20a0622..2bc781d22041c7375c35deeccabb18004ebbfa6b 100644
--- a/src/media/audio/recordable.h
+++ b/src/media/audio/recordable.h
@@ -1,11 +1,13 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program 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
@@ -14,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef RECORDABLE_H
diff --git a/src/media/audio/resampler.cpp b/src/media/audio/resampler.cpp
index 643bf35e569fe877d76e749cba016b206896ed91..076a5795f5b02d3c602f4e4b5c69f1a13cef14a2 100644
--- a/src/media/audio/resampler.cpp
+++ b/src/media/audio/resampler.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
@@ -7,6 +8,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program 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
@@ -15,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "resampler.h"
diff --git a/src/media/audio/resampler.h b/src/media/audio/resampler.h
index 73e770e911209ebb3d0fa2f9e47b734d9b9b2408..0c69a71a4a48de56f75b06379532f7128de6df9b 100644
--- a/src/media/audio/resampler.h
+++ b/src/media/audio/resampler.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
@@ -7,6 +8,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program 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
@@ -15,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _SAMPLE_RATE_H
diff --git a/src/media/audio/ringbuffer.cpp b/src/media/audio/ringbuffer.cpp
index 03c4a4f04d39718fe623235f813404106925faff..af100ac9427e1d44ddcc86366b2d14692f9ace69 100644
--- a/src/media/audio/ringbuffer.cpp
+++ b/src/media/audio/ringbuffer.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
@@ -20,17 +21,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "ringbuffer.h"
diff --git a/src/media/audio/ringbuffer.h b/src/media/audio/ringbuffer.h
index 8d9aa9becd6565f29e09e8ab30df0884c83d1879..456210e7b90057d5b98a650594a984255136eb32 100644
--- a/src/media/audio/ringbuffer.h
+++ b/src/media/audio/ringbuffer.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2007-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2007-2015 Savoir-faire Linux Inc.
+ *
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
diff --git a/src/media/audio/ringbufferpool.cpp b/src/media/audio/ringbufferpool.cpp
index 8104a57afe1f3d35aa33fd72beec7bb61522c2d3..83c481c41e8391dd50ad74cdf8867e6f04f57bdb 100644
--- a/src/media/audio/ringbufferpool.cpp
+++ b/src/media/audio/ringbufferpool.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "ringbufferpool.h"
diff --git a/src/media/audio/ringbufferpool.h b/src/media/audio/ringbufferpool.h
index acba104a27e2f8a4c14aced8d6aceea592196eda..51986ff32b4beb86d4db4e608ecad0cb5de3eeec 100644
--- a/src/media/audio/ringbufferpool.h
+++ b/src/media/audio/ringbufferpool.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef RING_BUFFER_POOL_H_
diff --git a/src/media/audio/sound/audiofile.cpp b/src/media/audio/sound/audiofile.cpp
index 7b413b59b6120f73f250f9ae573094c150237f91..322fabdc6e9e353b84a02ccacf28f426a7697618 100644
--- a/src/media/audio/sound/audiofile.cpp
+++ b/src/media/audio/sound/audiofile.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+/* Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -18,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <fstream>
#include <cmath>
diff --git a/src/media/audio/sound/audiofile.h b/src/media/audio/sound/audiofile.h
index 8a4c33074d51d794df3ffba662a2cace1c24eb59..a2e37569f01980aa1fa18d4da43cdd0cc3467966 100644
--- a/src/media/audio/sound/audiofile.h
+++ b/src/media/audio/sound/audiofile.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -19,17 +20,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __AUDIOFILE_H__
#define __AUDIOFILE_H__
diff --git a/src/media/audio/sound/dtmf.cpp b/src/media/audio/sound/dtmf.cpp
index 09cf18d9e14892650909913c0f3d03f135fa77fe..b49263f29a6f68f25f184482d0a152ea691a9876 100644
--- a/src/media/audio/sound/dtmf.cpp
+++ b/src/media/audio/sound/dtmf.cpp
@@ -1,7 +1,8 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
- * Author : Yan Morin <yan.morin@savoirfairelinux.com>
- * Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
+ * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions Copyright (c) 2000 Billy Biggs <bbiggs@div8.net>
* Portions Copyright (c) 2004 Wirlab <kphone@wirlab.net>
@@ -19,17 +20,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "dtmf.h"
diff --git a/src/media/audio/sound/dtmf.h b/src/media/audio/sound/dtmf.h
index 476500d7823a087a85f9e1f7ada4a23e6b2df035..c4a3e93eb40e0a9f93a7c38feaee1d01bdf5f456 100644
--- a/src/media/audio/sound/dtmf.h
+++ b/src/media/audio/sound/dtmf.h
@@ -1,6 +1,7 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
- * Author : Yan Morin <yan.morin@savoirfairelinux.com>
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions Copyright (c) 2000 Billy Biggs <bbiggs@div8.net>
@@ -19,17 +20,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __DTMF_H_
diff --git a/src/media/audio/sound/dtmfgenerator.cpp b/src/media/audio/sound/dtmfgenerator.cpp
index ab16eecb1105542a2184ebe713050e78f99140cb..2e61e1cc29c15c2ed336770fe4958e814a11d802 100644
--- a/src/media/audio/sound/dtmfgenerator.cpp
+++ b/src/media/audio/sound/dtmfgenerator.cpp
@@ -1,36 +1,24 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
- * Author: Yan Morin <yan.morin@savoirfairelinux.com>
- * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
- * Portions (c) 2003 iptel.org
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
+ * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or (at your
- * option) any later version.
+ * Portions (c) 2003 iptel.org
*
- * This program 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 Library General Public
- * License for more details.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
+ * This program 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 General Public License for more details.
*
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * 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.
*/
#include <cmath>
diff --git a/src/media/audio/sound/dtmfgenerator.h b/src/media/audio/sound/dtmfgenerator.h
index 0f4b43dd51d6151c728f26c3ecccb4ab4397d8a8..910da90dbe1f4f8d6218e0650d66a34ca08a101c 100644
--- a/src/media/audio/sound/dtmfgenerator.h
+++ b/src/media/audio/sound/dtmfgenerator.h
@@ -1,36 +1,24 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
- * Author: Yan Morin <yan.morin@savoirfairelinux.com>
- * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
- * Portions (c) 2003 iptel.org
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
+ * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or (at your
- * option) any later version.
+ * Portions (c) 2003 iptel.org
*
- * This program 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 Library General Public
- * License for more details.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
+ * This program 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 General Public License for more details.
*
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * 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.
*/
#ifndef DTMFGENERATOR_H
diff --git a/src/media/audio/sound/tone.cpp b/src/media/audio/sound/tone.cpp
index 434bd33750e233a33f77f8a9f14f9ceb1c2cadd1..819d54e0e6b72b2042583e152fa9a080b33204d4 100644
--- a/src/media/audio/sound/tone.cpp
+++ b/src/media/audio/sound/tone.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -20,17 +21,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "tone.h"
#include "logger.h"
diff --git a/src/media/audio/sound/tone.h b/src/media/audio/sound/tone.h
index ed808681191ff1be04838d9535a875eb4a8d1b66..f688f43f840bdbc87973f033fede809f4a80d14e 100644
--- a/src/media/audio/sound/tone.h
+++ b/src/media/audio/sound/tone.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -18,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __TONE_H__
#define __TONE_H__
diff --git a/src/media/audio/sound/tonelist.cpp b/src/media/audio/sound/tonelist.cpp
index 482c5a829484e1f77e94634051961dee8155c390..f1c6061b99e6a5f9ee857b49e71b80da48a01c7b 100644
--- a/src/media/audio/sound/tonelist.cpp
+++ b/src/media/audio/sound/tonelist.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -18,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "tonelist.h"
diff --git a/src/media/audio/sound/tonelist.h b/src/media/audio/sound/tonelist.h
index 83eed03734bfdc0022b6dc53a770cb8bb198fe69..070439d42fc2abe19fd86fd5b6847dc555e49f17 100644
--- a/src/media/audio/sound/tonelist.h
+++ b/src/media/audio/sound/tonelist.h
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
* Laurielle Lea <laurielle.lea@savoirfairelinux.com> (2004)
*
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
@@ -19,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __TONELIST_H__
diff --git a/src/media/audio/tonecontrol.cpp b/src/media/audio/tonecontrol.cpp
index e13a95a9535798beea16e440a4dbd5a51d20b612..f705bc138e8b705a5a56f891c1c7b53708763ead 100644
--- a/src/media/audio/tonecontrol.cpp
+++ b/src/media/audio/tonecontrol.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/media/audio/tonecontrol.h b/src/media/audio/tonecontrol.h
index e5c4ef72388f93a326509d768200480c900a33d3..c04a5481d77cc6e065308e09e71d4705adc1a291 100644
--- a/src/media/audio/tonecontrol.h
+++ b/src/media/audio/tonecontrol.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/src/media/libav_deps.h b/src/media/libav_deps.h
index 50c87c1bcda2cac0623e62f69a102d17dd3b02d5..4432738f04d8b9f564fa2e8a7e765a5c781f5eb3 100644
--- a/src/media/libav_deps.h
+++ b/src/media/libav_deps.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __LIBAV_DEPS_H__
diff --git a/src/media/libav_utils.cpp b/src/media/libav_utils.cpp
index 0b968664192f6ea644973349102b2ca1bb1d1893..fc0943f95c519a348380c8b1528c600eef8e2b6d 100644
--- a/src/media/libav_utils.cpp
+++ b/src/media/libav_utils.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Luca Barbato <lu_zero@gentoo.org>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "libav_deps.h" // MUST BE INCLUDED FIRST
diff --git a/src/media/libav_utils.h b/src/media/libav_utils.h
index f12147b5d0f6d5f725a2b9b2faefb2179497e28d..233862c7d07f0d8983b7426139f0cffc07ad486f 100644
--- a/src/media/libav_utils.h
+++ b/src/media/libav_utils.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __LIBAV_UTILS_H__
diff --git a/src/media/media_buffer.cpp b/src/media/media_buffer.cpp
index 2a0df42b819f2dab7886f31c99bdfef7a8cb3c18..589ed96e4c5cebc530f3db1f601b660fe6f1156f 100644
--- a/src/media/media_buffer.cpp
+++ b/src/media/media_buffer.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "libav_deps.h" // MUST BE INCLUDED FIRST
diff --git a/src/media/media_buffer.h b/src/media/media_buffer.h
index 524fd8c41b670f9dd340cb5c8f1e0a34fd97062c..359cd2583ff0c68cad18a617e5b0dbfa0b9bc599 100644
--- a/src/media/media_buffer.h
+++ b/src/media/media_buffer.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#pragma once
diff --git a/src/media/media_codec.cpp b/src/media/media_codec.cpp
index 5c0155ef6d79b6c7d13c23fa026f64fea67d5e22..8c89d08d98a5f5b97f3b2c73731644e072cb0991 100644
--- a/src/media/media_codec.cpp
+++ b/src/media/media_codec.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Eloi BAIL <eloi.bail@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "libav_deps.h" // MUST BE INCLUDED FIRST
diff --git a/src/media/media_codec.h b/src/media/media_codec.h
index 157640d407ba712a3c2806698cce0fc06e07caa5..2ad3e027b4bb57f0f39f5f1f714dceb571572bc5 100644
--- a/src/media/media_codec.h
+++ b/src/media/media_codec.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Eloi BAIL <eloi.bail@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -15,19 +16,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __MEDIA_CODEC_H__
diff --git a/src/media/media_decoder.cpp b/src/media/media_decoder.cpp
index f8cd95998e0d77a411fccb194be6707dbe22ded8..0cc31a7e9032c1fcac6aec4f0be21d02a7d31065 100644
--- a/src/media/media_decoder.cpp
+++ b/src/media/media_decoder.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "libav_deps.h" // MUST BE INCLUDED FIRST
diff --git a/src/media/media_decoder.h b/src/media/media_decoder.h
index 5268a628c7c4ccabcf661ebcea40d3854056daff..8abff0ee23e197f58b2dc768c22dd857009fc5a1 100644
--- a/src/media/media_decoder.h
+++ b/src/media/media_decoder.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __MEDIA_DECODER_H__
diff --git a/src/media/media_device.h b/src/media/media_device.h
index dfc5a23fa9ff2b4b77e4ecc16d0d30856fd65f21..38888783758c7df0cfc10a26acf57467767c1ef7 100644
--- a/src/media/media_device.h
+++ b/src/media/media_device.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __MEDIA_DEVICE_H__
diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp
index 94edf737bed5099c7f94fbd685333e5b0993bb82..48a8aa5cde9a76536f92a29f4efe00a622deefee 100644
--- a/src/media/media_encoder.cpp
+++ b/src/media/media_encoder.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "libav_deps.h" // MUST BE INCLUDED FIRST
diff --git a/src/media/media_encoder.h b/src/media/media_encoder.h
index 14a45c1917d938bd830eddc4de142e311f907bbf..01f34890669167ee3362ed6b7d8177e0b9d31994 100644
--- a/src/media/media_encoder.h
+++ b/src/media/media_encoder.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __MEDIA_ENCODER_H__
diff --git a/src/media/media_io_handle.cpp b/src/media/media_io_handle.cpp
index 1b0bd0c823c2ff5767a902c83246b1274957d3d5..d34fc906347184b998a23e3ec0c7824a40b55230 100644
--- a/src/media/media_io_handle.cpp
+++ b/src/media/media_io_handle.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "libav_deps.h" // MUST BE INCLUDED FIRST
diff --git a/src/media/media_io_handle.h b/src/media/media_io_handle.h
index f2ccda44ce60fb136be38bc1f690db52b39b20af..56a79b3ddd326274afd18e7e42e4351dd03269d1 100644
--- a/src/media/media_io_handle.h
+++ b/src/media/media_io_handle.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __MEDIA_IO_HANDLE_H__
diff --git a/src/media/rtp_session.h b/src/media/rtp_session.h
index 567c04e701425c44988d5739fadbd4a43e0198b6..a024af4ee15463ed096cc588a59d41ae70f8af61 100644
--- a/src/media/rtp_session.h
+++ b/src/media/rtp_session.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/src/media/socket_pair.cpp b/src/media/socket_pair.cpp
index 6580f67d73f5fd6d8866a24b9d8adfe6fbeda49a..03798c51e93023cc43dcf1891ea05ed2e74c14d3 100644
--- a/src/media/socket_pair.cpp
+++ b/src/media/socket_pair.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
* Copyright (c) 2002 Fabrice Bellard
*
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
@@ -18,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "libav_deps.h" // MUST BE INCLUDED FIRST
diff --git a/src/media/socket_pair.h b/src/media/socket_pair.h
index 216b675e3e16e49bb370d4b788a4b32263046174..b70858511c70f92788bd074c4206b32764fa0e03 100644
--- a/src/media/socket_pair.h
+++ b/src/media/socket_pair.h
@@ -1,6 +1,7 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
* Copyright (C) 2012 VLC authors and VideoLAN
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/src/media/system_codec_container.cpp b/src/media/system_codec_container.cpp
index 6695624041727cfb9a0d0d0e86883d0260504d84..3a8a0ae2585fe3fb450c87ab478db126b310b308 100644
--- a/src/media/system_codec_container.cpp
+++ b/src/media/system_codec_container.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Eloi BAIL <eloi.bail@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "libav_deps.h" // MUST BE INCLUDED FIRST
diff --git a/src/media/system_codec_container.h b/src/media/system_codec_container.h
index c3d7477dd60b40c2983685e65f39c3bbbba7e506..ea11185adf8a56333013c8ad7ddff0cb3df542e5 100644
--- a/src/media/system_codec_container.h
+++ b/src/media/system_codec_container.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Eloi BAIL <eloi.bail@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __SYSTEM_CODEC_CONTAINER_H__
diff --git a/src/media/video/androidvideo/video_device_impl.cpp b/src/media/video/androidvideo/video_device_impl.cpp
index 74056893e370fe9c2524c7c67b6786e5a9f53c68..b41f822385a4531ad20f59b552c3afb0c6bd06a7 100644
--- a/src/media/video/androidvideo/video_device_impl.cpp
+++ b/src/media/video/androidvideo/video_device_impl.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011-2015 Savoir-faire Linux Inc.
+ *
* Author: Rafaël Carré <rafael.carre@savoirfairelinux.com>
* Author: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "logger.h"
diff --git a/src/media/video/androidvideo/video_device_monitor_impl.cpp b/src/media/video/androidvideo/video_device_monitor_impl.cpp
index 55062bd7c861ee03c7915339f2fab7b5a4364f3c..66ab2932fa743438486297f26641ebe0da4dd84e 100644
--- a/src/media/video/androidvideo/video_device_monitor_impl.cpp
+++ b/src/media/video/androidvideo/video_device_monitor_impl.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2009 Rémi Denis-Courmont
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
* Author: Rafaël Carré <rafael.carre@savoirfairelinux.com>
* Author: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
*
@@ -18,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "../video_device_monitor.h"
diff --git a/src/media/video/osxvideo/video_device_impl.mm b/src/media/video/osxvideo/video_device_impl.mm
index ffb26eb5440dc4152a9a756c32a2e1f66930c5ae..f1ed03c0ebff2f87fc12de013b669179b276c3c9 100644
--- a/src/media/video/osxvideo/video_device_impl.mm
+++ b/src/media/video/osxvideo/video_device_impl.mm
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <algorithm>
diff --git a/src/media/video/osxvideo/video_device_monitor_impl.mm b/src/media/video/osxvideo/video_device_monitor_impl.mm
index 2eeee8e0f487aaa7d8bfe627b38ae60b90b94bcf..d67d1bbb3b9bdc46f0ec04e6123cd9b433899486 100644
--- a/src/media/video/osxvideo/video_device_monitor_impl.mm
+++ b/src/media/video/osxvideo/video_device_monitor_impl.mm
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <algorithm>
diff --git a/src/media/video/shm_header.h b/src/media/video/shm_header.h
index 01861d85a887ace2c2045db25886e899b4e01573..594913d1fe2da96db3c671e697f40d20ef517196 100644
--- a/src/media/video/shm_header.h
+++ b/src/media/video/shm_header.h
@@ -1,11 +1,7 @@
/*
- * Copyright (C) 2012-2015 Savoir-Faire Linux Inc.
- * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
+ * Copyright (C) 2012-2015 Savoir-faire Linux Inc.
*
- * Portions derived from GStreamer:
- * Copyright (C) <2009> Collabora Ltd
- * @author: Olivier Crete <olivier.crete@collabora.co.uk
- * Copyright (C) <2009> Nokia Inc
+ * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef SHM_HEADER_H_
diff --git a/src/media/video/sinkclient.cpp b/src/media/video/sinkclient.cpp
index 9fb574b4e108d02cb4b09c2190ea2a7ab986f5fc..bf5e7d6e3875c209627b0a6e56ec43148f5ee207 100644
--- a/src/media/video/sinkclient.cpp
+++ b/src/media/video/sinkclient.cpp
@@ -1,13 +1,9 @@
/*
- * Copyright (C) 2012-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2012-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
- * Portions derived from GStreamer:
- * Copyright (C) <2009> Collabora Ltd
- * @author: Olivier Crete <olivier.crete@collabora.co.uk
- * Copyright (C) <2009> Nokia Inc
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
@@ -21,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/media/video/sinkclient.h b/src/media/video/sinkclient.h
index 077035a5c9f3d58ff8ec2b6b420267b37ed1940a..e8e99dd2f38ee56256eb6a167c24ce8172d22ef5 100644
--- a/src/media/video/sinkclient.h
+++ b/src/media/video/sinkclient.h
@@ -1,11 +1,7 @@
/*
- * Copyright (C) 2012-2015 Savoir-Faire Linux Inc.
- * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
+ * Copyright (C) 2012-2015 Savoir-faire Linux Inc.
*
- * Portions derived from GStreamer:
- * Copyright (C) <2009> Collabora Ltd
- * @author: Olivier Crete <olivier.crete@collabora.co.uk
- * Copyright (C) <2009> Nokia Inc
+ * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/src/media/video/test/shm_src.cpp b/src/media/video/test/shm_src.cpp
index 6fbcb80fe5a692d0fb4f0c5b831bc46ce16f0271..bf64c5fe879f67e0456620058b8c6e246febe4ce 100644
--- a/src/media/video/test/shm_src.cpp
+++ b/src/media/video/test/shm_src.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2012-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2012-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* Portions derived from GStreamer:
@@ -20,17 +21,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "shm_src.h"
diff --git a/src/media/video/test/shm_src.h b/src/media/video/test/shm_src.h
index b81e6bbbc8523d0cdcb3f9bde78c8f9a605acea9..6ca347fd87795fb09801fa59487668ea6e901b67 100644
--- a/src/media/video/test/shm_src.h
+++ b/src/media/video/test/shm_src.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2012-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2012-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* Portions derived from GStreamer:
@@ -20,17 +21,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef SHM_SRC_H_
diff --git a/src/media/video/test/shmclient.cpp b/src/media/video/test/shmclient.cpp
index e994d5c6e44a4b38315630e8791c678c8da4c83b..9479e218675ff58cddffd8455e70f5c307f0271e 100644
--- a/src/media/video/test/shmclient.cpp
+++ b/src/media/video/test/shmclient.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <cstdio>
diff --git a/src/media/video/test/test_shm.cpp b/src/media/video/test/test_shm.cpp
index 4ab0b172ab4aac3ce8df49b5f3772679145fb465..07db26f627e089d94755e9e80b87f43a3b40e385 100644
--- a/src/media/video/test/test_shm.cpp
+++ b/src/media/video/test/test_shm.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2012-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2012-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "shm_sink.h"
diff --git a/src/media/video/test/test_video_input.cpp b/src/media/video/test/test_video_input.cpp
index c7f932f7968464a75c47974f0dcb8c67bfc6f29b..0b68d959151faaf76b0d9c75e070f6ee8646e4b2 100644
--- a/src/media/video/test/test_video_input.cpp
+++ b/src/media/video/test/test_video_input.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <unistd.h> // for sleep
diff --git a/src/media/video/test/test_video_input.h b/src/media/video/test/test_video_input.h
index 64889e616b16626659a252b1fc55287211ac36b9..5f371ce1faf0535c3fdf184546d0376d31f151ec 100644
--- a/src/media/video/test/test_video_input.h
+++ b/src/media/video/test/test_video_input.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _VIDEO_INPUT_TEST_
diff --git a/src/media/video/test/test_video_rtp.cpp b/src/media/video/test/test_video_rtp.cpp
index 011d781f4106833fbf9d8038415bee2d4d59de4d..7300ec5cec103f3eb8dcab0a84c431ac32cc421b 100644
--- a/src/media/video/test/test_video_rtp.cpp
+++ b/src/media/video/test/test_video_rtp.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "video_rtp_session.h"
diff --git a/src/media/video/v4l2/video_device_impl.cpp b/src/media/video/v4l2/video_device_impl.cpp
index f6e1996b3093d0fac752f65dd8fc217ecd72fe8f..defaa6706ada9417d8c1103b2561dce2366f7638 100644
--- a/src/media/video/v4l2/video_device_impl.cpp
+++ b/src/media/video/v4l2/video_device_impl.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011-2015 Savoir-faire Linux Inc.
+ *
* Author: Rafaël Carré <rafael.carre@savoirfairelinux.com>
* Author: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <algorithm>
diff --git a/src/media/video/v4l2/video_device_monitor_impl.cpp b/src/media/video/v4l2/video_device_monitor_impl.cpp
index 8d867f647b39425c97bed9ce79fd7ec6da70cb6c..7082d6b502116ffd50ef7e5e4a47a5127cb80ac4 100644
--- a/src/media/video/v4l2/video_device_monitor_impl.cpp
+++ b/src/media/video/v4l2/video_device_monitor_impl.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2009 Rémi Denis-Courmont
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
* Author: Rafaël Carré <rafael.carre@savoirfairelinux.com>
* Author: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
*
@@ -18,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <algorithm>
diff --git a/src/media/video/video_base.cpp b/src/media/video/video_base.cpp
index 2d58bf855640f3f5824bdcdb71fef5cc0f234e32..835deb821106f01d8c8774ceef8ecffdb8be2a31 100644
--- a/src/media/video/video_base.cpp
+++ b/src/media/video/video_base.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -15,19 +16,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "libav_deps.h" // MUST BE INCLUDED FIRST
diff --git a/src/media/video/video_base.h b/src/media/video/video_base.h
index f7da34637b1c8ed3f43cc973077fc7df89577430..a91314f70bfb0999bea5acc887d69fff76492548 100644
--- a/src/media/video/video_base.h
+++ b/src/media/video/video_base.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -15,19 +16,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#pragma once
diff --git a/src/media/video/video_device.h b/src/media/video/video_device.h
index 92a3123d1965fb62280e65916113f46916aa910b..2b51c98b5e855a41dee27f801f31f8b736a90339 100644
--- a/src/media/video/video_device.h
+++ b/src/media/video/video_device.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ *
* Author: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __VIDEO_DEVICE_H__
diff --git a/src/media/video/video_device_monitor.cpp b/src/media/video/video_device_monitor.cpp
index a8bf025902ff16ea59eebe9869a3f1e5b95fb529..78444f8147d97eebcd74eff85216fc58fd59b069 100644
--- a/src/media/video/video_device_monitor.cpp
+++ b/src/media/video/video_device_monitor.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <algorithm>
diff --git a/src/media/video/video_device_monitor.h b/src/media/video/video_device_monitor.h
index 8219faa126722fd62c39065c3e188841c1326eaf..59b215f3cd96eedaa05cacc41590fdd4b0ae2a94 100644
--- a/src/media/video/video_device_monitor.h
+++ b/src/media/video/video_device_monitor.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef VIDEO_DEVICE_MONITOR_H__
diff --git a/src/media/video/video_input.cpp b/src/media/video/video_input.cpp
index 5f1b901e3364ab21297a6f1c712509429e4f2100..19355e13010c75e077f8ada39cadb6cb825ba912 100644
--- a/src/media/video/video_input.cpp
+++ b/src/media/video/video_input.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/media/video/video_input.h b/src/media/video/video_input.h
index 201bbd02fc68c6ae60192539a6952034028ede4a..740b5c7f8864f04ddd4d67f4b3340fbfc322afd9 100644
--- a/src/media/video/video_input.h
+++ b/src/media/video/video_input.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011-2015 Savoir-faire Linux Inc.
*
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
@@ -18,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __VIDEO_INPUT_H__
diff --git a/src/media/video/video_mixer.cpp b/src/media/video/video_mixer.cpp
index 68a9790ff2c39b7d5ce88e4c414fb85ed7870743..59e045e8ea5c8d6b2966008e3bff2318437ff9ab 100644
--- a/src/media/video/video_mixer.cpp
+++ b/src/media/video/video_mixer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
*
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "libav_deps.h" // MUST BE INCLUDED FIRST
diff --git a/src/media/video/video_mixer.h b/src/media/video/video_mixer.h
index 6333cb52a887ad5d6de065b87d99ab5202e29fa1..978269a63a488df5832bca92d7b931dcdaed1053 100644
--- a/src/media/video/video_mixer.h
+++ b/src/media/video/video_mixer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
*
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __VIDEO_MIXER_H__
diff --git a/src/media/video/video_provider.h b/src/media/video/video_provider.h
index c7f189fb756bf6daa797659c7d239980c8a4e35b..cd1b143171016394676e2f12a95fc13513875ec4 100644
--- a/src/media/video/video_provider.h
+++ b/src/media/video/video_provider.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2012-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2012-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef VIDEO_PROVIDER_H_
diff --git a/src/media/video/video_receive_thread.cpp b/src/media/video/video_receive_thread.cpp
index 81b5c4aeef27c9e6f500fe63920661be5811dfe5..10d0d54e59ec8ff6f0e030ca83bf40b02ca66804 100644
--- a/src/media/video/video_receive_thread.cpp
+++ b/src/media/video/video_receive_thread.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
@@ -17,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "libav_deps.h" // MUST BE INCLUDED FIRST
diff --git a/src/media/video/video_receive_thread.h b/src/media/video/video_receive_thread.h
index e93c15d3419910ae40d48cae252d4f68316802a3..79766000443a5d2246b458beeb5f003b46c6a426 100644
--- a/src/media/video/video_receive_thread.h
+++ b/src/media/video/video_receive_thread.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _VIDEO_RECEIVE_THREAD_H_
diff --git a/src/media/video/video_rtp_session.cpp b/src/media/video/video_rtp_session.cpp
index 01b7fecc0d68972b617f1d1b4c927afd188b6069..2a928b2358a702dc83a05f88d696d99f597c1d14 100644
--- a/src/media/video/video_rtp_session.cpp
+++ b/src/media/video/video_rtp_session.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "client/videomanager.h"
diff --git a/src/media/video/video_rtp_session.h b/src/media/video/video_rtp_session.h
index 989c393063157294f0975689730a17b3c6cfe0c6..0e86447d200905e2c0cba4b5e0dece5a78a3b0b3 100644
--- a/src/media/video/video_rtp_session.h
+++ b/src/media/video/video_rtp_session.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __VIDEO_RTP_SESSION_H__
diff --git a/src/media/video/video_scaler.cpp b/src/media/video/video_scaler.cpp
index 6525d132e96ee1fc7a74746d64cc0e357229f050..00116f868a975bf51589051470df79a142a7381c 100644
--- a/src/media/video/video_scaler.cpp
+++ b/src/media/video/video_scaler.cpp
@@ -1,6 +1,6 @@
-
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "libav_deps.h" // MUST BE INCLUDED FIRST
diff --git a/src/media/video/video_scaler.h b/src/media/video/video_scaler.h
index 6e16a665a1a7b542d4ef0a522fb470112c6466e0..07d0bd41cc1754d2655d1fc253048d76e446aca8 100644
--- a/src/media/video/video_scaler.h
+++ b/src/media/video/video_scaler.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011-2015 Savoir-faire Linux Inc.
*
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __VIDEO_SCALER_H__
diff --git a/src/media/video/video_sender.cpp b/src/media/video/video_sender.cpp
index e8e332fb0b960bdc3e86eaa186fa2eaae49b1d25..7c392a83a2bcfc8b4715646d93cd687651e0a37b 100644
--- a/src/media/video/video_sender.cpp
+++ b/src/media/video/video_sender.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "video_sender.h"
diff --git a/src/media/video/video_sender.h b/src/media/video/video_sender.h
index d1d1fd64521d1695dc71f9c03314e51c097aef50..8f63a935d94d579551f9f7874a76b3801413e9a0 100644
--- a/src/media/video/video_sender.h
+++ b/src/media/video/video_sender.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __VIDEO_SENDER_H__
diff --git a/src/media/video/winvideo/capture_graph_interfaces.h b/src/media/video/winvideo/capture_graph_interfaces.h
index fe74f8c3dcb06a31d906e1fee4dedd4855ea6232..f71e5a690aca3068cee13328ae24c5fd9f5d8ec7 100644
--- a/src/media/video/winvideo/capture_graph_interfaces.h
+++ b/src/media/video/winvideo/capture_graph_interfaces.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef CAPTURE_GRAPH_INTERFACES
@@ -52,4 +42,4 @@ public:
}} // namespace ring::video
-#endif
\ No newline at end of file
+#endif
diff --git a/src/media/video/winvideo/video_device_impl.cpp b/src/media/video/winvideo/video_device_impl.cpp
index 4bcdbe7e24f76025901ffb0b7820a250c8172442..0702d422a691618be21f6880e6793adbd7c83b63 100644
--- a/src/media/video/winvideo/video_device_impl.cpp
+++ b/src/media/video/winvideo/video_device_impl.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <algorithm>
diff --git a/src/media/video/winvideo/video_device_monitor_impl.cpp b/src/media/video/winvideo/video_device_monitor_impl.cpp
index 330c565432111f2beeaffa70544ad1eab8107b22..4e3970f83016a831ced0297ed2b4708b9b29e5d9 100644
--- a/src/media/video/winvideo/video_device_monitor_impl.cpp
+++ b/src/media/video/winvideo/video_device_monitor_impl.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <algorithm>
diff --git a/src/noncopyable.h b/src/noncopyable.h
index e9eea4b6109381283567dd909dbc38db87d71600..4f8a02effdf1a5b6721a2693ab67295f350c245c 100644
--- a/src/noncopyable.h
+++ b/src/noncopyable.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef NON_COPYABLE_H_
diff --git a/src/plugin_loader.h b/src/plugin_loader.h
index 4455cd8c7d2954f72ee3a252be98c3992977f96d..9433a3b085f34e134de2557424a03b88a7e7a028 100644
--- a/src/plugin_loader.h
+++ b/src/plugin_loader.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef PLUGIN_LOADER_H
#define PLUGIN_LOADER_H
diff --git a/src/plugin_loader_dl.cpp b/src/plugin_loader_dl.cpp
index bf358200f65c5dd775b7a2e4953950be16cb3d9b..ff2cbae2dcce059e4da8f2e14ca03c8141f1e768 100644
--- a/src/plugin_loader_dl.cpp
+++ b/src/plugin_loader_dl.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "plugin_loader.h"
diff --git a/src/plugin_manager.cpp b/src/plugin_manager.cpp
index 41e74c3113a822e831785ba877774263aac41636..8f050c916f3e7af0ed85da1b7d7f691042bba2f5 100644
--- a/src/plugin_manager.cpp
+++ b/src/plugin_manager.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "plugin_manager.h"
diff --git a/src/plugin_manager.h b/src/plugin_manager.h
index c429053a99231215812320706d73b4f53645b58d..b234d3098e3fc986597dd9bcd1708d23e5f778c2 100644
--- a/src/plugin_manager.h
+++ b/src/plugin_manager.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef PLUGIN_MANAGER_H
diff --git a/src/preferences.cpp b/src/preferences.cpp
index 2b9cebd84d5ad9a02a7be23f37b5e76d4ac20b2b..a379f89c59c88027dff8c7469f6888223250677c 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/preferences.h b/src/preferences.h
index 54887d326565a5c89f54106e3ae45e11215dd549..988b44c4219d2719ddfcf513c05cacba9d8cd4b7 100644
--- a/src/preferences.h
+++ b/src/preferences.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __PREFERENCE_H__
diff --git a/src/rational.h b/src/rational.h
index 43f368e1444906fc7ca3e463d5789629573bf8bb..49664797745cf32252c3e42a1a7a7639fcbe337c 100644
--- a/src/rational.h
+++ b/src/rational.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
+ *
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,19 +15,7 @@
*
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#pragma once
diff --git a/src/registration_states.h b/src/registration_states.h
index e523b93cdbee7e6f1c25f11218352fb544634f83..9a396f38fe67f275bf6fafbdb71c3e95994dc569 100644
--- a/src/registration_states.h
+++ b/src/registration_states.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef REGISTRATION_STATES_H_
diff --git a/src/ring_api.cpp b/src/ring_api.cpp
index e06be3d120cbf7fbcb3436bd284cbcbf8372c1d3..d43eb3650c4bd31330f7f0ba3e80c9099717a726 100644
--- a/src/ring_api.cpp
+++ b/src/ring_api.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ *
* Author: Philippe Proulx <philippe.proulx@savoirfairelinux.com>
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <string>
#include <vector>
diff --git a/src/ring_plugin.h b/src/ring_plugin.h
index c3a011d835db4bce1526662047231dff003eb01a..78d2052b3c644b6eb5ce1ae91b0117823d535ccf 100644
--- a/src/ring_plugin.h
+++ b/src/ring_plugin.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef RING_PLUGIN_H
diff --git a/src/ring_types.h b/src/ring_types.h
index 9bf25d5b5983f21d7d74a201f9e6a54ca1e61de2..2f11ca8b3396fafaeb1eda88346f88bf61b012ce 100644
--- a/src/ring_types.h
+++ b/src/ring_types.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef RING_TYPES_H_
diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp
index b69ad9adc1e519c9da86a3a7abbc70c01db26edf..3078023f00847c7eacc4ec1158c793730d8d02ff 100644
--- a/src/ringdht/ringaccount.cpp
+++ b/src/ringdht/ringaccount.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
* Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
@@ -17,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "ringaccount.h"
diff --git a/src/ringdht/ringaccount.h b/src/ringdht/ringaccount.h
index 5efa1e5803ee2dafb27f0ddd5a791283031970b9..226dae8a89e5fa555dfd963e81f03fa364bdeb99 100644
--- a/src/ringdht/ringaccount.h
+++ b/src/ringdht/ringaccount.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef RINGACCOUNT_H
diff --git a/src/ringdht/sip_transport_ice.cpp b/src/ringdht/sip_transport_ice.cpp
index 534ca61b501109d5847755d7be00573a48646012..4dc5182cc0542c6f323006c371d120b6448349d4 100644
--- a/src/ringdht/sip_transport_ice.cpp
+++ b/src/ringdht/sip_transport_ice.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "sip_transport_ice.h"
diff --git a/src/ringdht/sip_transport_ice.h b/src/ringdht/sip_transport_ice.h
index f1bd4d3d5a203fe33c6c5d65c8c56406519e77be..e6290a86dfa6e040fceb5de4f330de276acf77af 100644
--- a/src/ringdht/sip_transport_ice.h
+++ b/src/ringdht/sip_transport_ice.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/src/ringdht/sips_transport_ice.cpp b/src/ringdht/sips_transport_ice.cpp
index ce554fff1aa58a2d669b3750c3aa6cef55a59971..9b1d340d497bee00bd1f001ef2956929c89ba841 100644
--- a/src/ringdht/sips_transport_ice.cpp
+++ b/src/ringdht/sips_transport_ice.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "sips_transport_ice.h"
diff --git a/src/ringdht/sips_transport_ice.h b/src/ringdht/sips_transport_ice.h
index 3d1c2902685d31d18c842cfbe6b593a5db8bc06c..aa4284afeda4cdada6d23049192a399b6e45d34c 100644
--- a/src/ringdht/sips_transport_ice.h
+++ b/src/ringdht/sips_transport_ice.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/src/rw_mutex.h b/src/rw_mutex.h
index 466465a04c166698d91d86172ecaf6b6ab8c049b..8af109d4cd8eab9d0b21d47c2ac3270cd5603968 100644
--- a/src/rw_mutex.h
+++ b/src/rw_mutex.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef RW_MUTEX_H_
diff --git a/src/security/certstore.cpp b/src/security/certstore.cpp
index b2aac86001b3ce56e1ace78af2c9731183181dea..db673727a63a0ed261dcc7eb57e6d745a4bc559e 100644
--- a/src/security/certstore.cpp
+++ b/src/security/certstore.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
diff --git a/src/security/certstore.h b/src/security/certstore.h
index 6e3f0d6838e6a2bfe41a735738dd9c40ae2d3f60..a277d7d43a6db433877e88700e3977b0f53bcc35 100644
--- a/src/security/certstore.h
+++ b/src/security/certstore.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
diff --git a/src/security/tlsvalidator.cpp b/src/security/tlsvalidator.cpp
index cd027333bab843f8a42d91d9852f50dd1e503830..01965d03dc6548eec808a40f0c066964683d812d 100644
--- a/src/security/tlsvalidator.cpp
+++ b/src/security/tlsvalidator.cpp
@@ -1,10 +1,10 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- * Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
- * Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
- * Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ * Author: Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
+ * Author: Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "tlsvalidator.h"
diff --git a/src/security/tlsvalidator.h b/src/security/tlsvalidator.h
index bde47a677e65e757b614f139b6e49a274ffc0942..7bbf813306092093f8160a600b1021a2ca058983 100644
--- a/src/security/tlsvalidator.h
+++ b/src/security/tlsvalidator.h
@@ -1,10 +1,10 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- * Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
- * Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
- * Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ * Author: Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
+ * Author: Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/sip/base64.c b/src/sip/base64.c
index b4affa94448c6798565ed19eb786d0c211b4eb68..fa0d82d1225858ea0e3376b6764cbc23eebb8dcb 100644
--- a/src/sip/base64.c
+++ b/src/sip/base64.c
@@ -1,10 +1,11 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program 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
@@ -13,17 +14,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <stdint.h>
diff --git a/src/sip/base64.h b/src/sip/base64.h
index 3f6c41949b9c5a7265a51ddb28f83eda224e086f..e21d1700b6690a90f9dc7013dd0bbd6d3f8ed28c 100644
--- a/src/sip/base64.h
+++ b/src/sip/base64.h
@@ -1,10 +1,11 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program 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
@@ -13,17 +14,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef H_BASE64
diff --git a/src/sip/pattern.cpp b/src/sip/pattern.cpp
index 340e47d65491453aafd4512eea19f1ba1a656dce..0c4289e3253c8b9fe072246f8db32980a1958422 100644
--- a/src/sip/pattern.cpp
+++ b/src/sip/pattern.cpp
@@ -1,11 +1,13 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program 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
@@ -14,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "pattern.h"
diff --git a/src/sip/pattern.h b/src/sip/pattern.h
index 935eb9d141b5bfb337f48b67438b6fc71c8e7058..b9240a070afe765c829b939985bceb984485bef0 100644
--- a/src/sip/pattern.h
+++ b/src/sip/pattern.h
@@ -1,11 +1,13 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program 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
@@ -14,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __PATTERN_H__
#define __PATTERN_H__
diff --git a/src/sip/pres_sub_client.cpp b/src/sip/pres_sub_client.cpp
index 553ae7152b38332859561419ffd2a7c9b6f87293..481dc3ef7762d99cf3120b4ee91d5cee53de875d 100644
--- a/src/sip/pres_sub_client.cpp
+++ b/src/sip/pres_sub_client.cpp
@@ -16,17 +16,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this programm. If not, see <http://www.gnu.org/licenses/>.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify pult5-voip, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, LOTES-TM LLC
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <pj/log.h>
diff --git a/src/sip/pres_sub_client.h b/src/sip/pres_sub_client.h
index 19398ab68bee97eb54c155443949c0da4726b2bb..0f81d0f18cdd972db77b32afc7a4c2b98b52202e 100644
--- a/src/sip/pres_sub_client.h
+++ b/src/sip/pres_sub_client.h
@@ -16,16 +16,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this programm. If not, see <http://www.gnu.org/licenses/>.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify pult5-voip, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, LOTES-TM LLC
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef PRES_SUB_CLIENT_H
diff --git a/src/sip/pres_sub_server.cpp b/src/sip/pres_sub_server.cpp
index 724705d6345a1d246d95d2b8a86288cdaf4a9e6c..760277f216f7bb39bb6fe6b00f634ee637379509 100644
--- a/src/sip/pres_sub_server.cpp
+++ b/src/sip/pres_sub_server.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Patrick Keroulas <patrick.keroulas@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
diff --git a/src/sip/pres_sub_server.h b/src/sip/pres_sub_server.h
index e75423537c9305eaeee9b8a6b75b8a97cadb771d..0eaec7cc71ffd197a70dc82c2e959499c3e2b2b0 100644
--- a/src/sip/pres_sub_server.h
+++ b/src/sip/pres_sub_server.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Patrick Keroulas <patrick.keroulas@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
diff --git a/src/sip/sdes_negotiator.cpp b/src/sip/sdes_negotiator.cpp
index 64d53f0fc1a9abffbafe194f0ab7a59a01759b5c..b0b390baeb59e0de3e4ed6f9d6869a714d04a4cd 100644
--- a/src/sip/sdes_negotiator.cpp
+++ b/src/sip/sdes_negotiator.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
@@ -8,6 +9,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program 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
@@ -16,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "sdes_negotiator.h"
diff --git a/src/sip/sdes_negotiator.h b/src/sip/sdes_negotiator.h
index ce37420ad84a6ef72c17e3881728dccffb16f867..fe74e7e2d1b2ebba8ad5be6d1de9dd62d142700d 100644
--- a/src/sip/sdes_negotiator.h
+++ b/src/sip/sdes_negotiator.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
@@ -8,6 +9,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program 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
@@ -16,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __SDES_NEGOTIATOR_H__
#define __SDES_NEGOTIATOR_H__
diff --git a/src/sip/sdp.cpp b/src/sip/sdp.cpp
index 9fd4f32368f9402f78c383c9be8ce6d597d255f3..f9d51384309c218857c86ca6d8f03891a5535546 100644
--- a/src/sip/sdp.cpp
+++ b/src/sip/sdp.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
@@ -19,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "sdp.h"
diff --git a/src/sip/sdp.h b/src/sip/sdp.h
index 79bb95e020e9f2db435f6eb28a8dd62222be90b6..83e78abdc08940de4e8dce3237168d71586c28f8 100644
--- a/src/sip/sdp.h
+++ b/src/sip/sdp.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
@@ -17,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef SDP_H_
diff --git a/src/sip/sip_utils.cpp b/src/sip/sip_utils.cpp
index 0710501f4baa5399a4bcf7ba4add7d386e87157f..cbbf810e930747d3b21859a7ac322872ca3b76db 100644
--- a/src/sip/sip_utils.cpp
+++ b/src/sip/sip_utils.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "sip_utils.h"
diff --git a/src/sip/sip_utils.h b/src/sip/sip_utils.h
index 1364f76ba1f11d7eaf15dc857bd5bbca94504f4f..1d6510046e1e6ee1c4cb821f0e82c401cee7c1ab 100644
--- a/src/sip/sip_utils.h
+++ b/src/sip/sip_utils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef SIP_UTILS_H_
diff --git a/src/sip/sipaccount.cpp b/src/sip/sipaccount.cpp
index 2788a790970ec2ba87a0a1fd5ac9d83e5d050b81..bd85ee756c77e163464b83cf29353b15fd2e15b6 100644
--- a/src/sip/sipaccount.cpp
+++ b/src/sip/sipaccount.cpp
@@ -1,9 +1,9 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
- * Author : Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "sipaccount.h"
diff --git a/src/sip/sipaccount.h b/src/sip/sipaccount.h
index 00672816d458afd3829f1d046c7bfc4ad5ffa5cc..6bd3b72d2c0ce98aec3847ea6989fb32253db4f2 100644
--- a/src/sip/sipaccount.h
+++ b/src/sip/sipaccount.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
@@ -19,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef SIPACCOUNT_H
diff --git a/src/sip/sipaccountbase.cpp b/src/sip/sipaccountbase.cpp
index bd903b9329d1a34f8b7965c294ff5df87572ae7b..658f609fd0b3626a28671afacbe4caa2c5a329ec 100644
--- a/src/sip/sipaccountbase.cpp
+++ b/src/sip/sipaccountbase.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
diff --git a/src/sip/sipaccountbase.h b/src/sip/sipaccountbase.h
index 38c2066e36db15e0957302035a6902e01cb6480d..64eab481368c3e94f2194cd86796fd6ea341e31f 100644
--- a/src/sip/sipaccountbase.h
+++ b/src/sip/sipaccountbase.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef SIPACCOUNTBASE_H
diff --git a/src/sip/sipcall.cpp b/src/sip/sipcall.cpp
index 83c4021f00db113e560880507fd1507f43c0edd0..66bed5ae612447dfc6f1776629e07da65722ea75 100644
--- a/src/sip/sipcall.cpp
+++ b/src/sip/sipcall.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
@@ -19,17 +20,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "call_factory.h"
diff --git a/src/sip/sipcall.h b/src/sip/sipcall.h
index 182d37cb4a6444d78dcfed947c5967aa9047fadc..9edc8d32cdd9738fdaf6031e24f10260810928cd 100644
--- a/src/sip/sipcall.h
+++ b/src/sip/sipcall.h
@@ -1,9 +1,10 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
- * Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
- * Author : Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,17 +19,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __SIPCALL_H__
diff --git a/src/sip/sippresence.cpp b/src/sip/sippresence.cpp
index ef1a87e9d9c9ddfee370f45549416a9117c9bf58..271b747b9e9ce22f04f115d3881e0c7700bdedb0 100644
--- a/src/sip/sippresence.cpp
+++ b/src/sip/sippresence.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Patrick Keroulas <patrick.keroulas@savoirfairelinux.com>
*
@@ -16,20 +16,8 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
-
#include "sippresence.h"
#include "logger.h"
diff --git a/src/sip/sippresence.h b/src/sip/sippresence.h
index b96e4a2b4af05096c7ca98fb9c77fd129bfe4270..848e44fdb6307b98f06436d4af1679be91004b39 100644
--- a/src/sip/sippresence.h
+++ b/src/sip/sippresence.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Patrick Keroulas <patrick.keroulas@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef SIPPRESENCE_H
diff --git a/src/sip/siptransport.cpp b/src/sip/siptransport.cpp
index e6201c1fcd6e41cab01bfda5d31f3dee9f35ed70..5be586798fe063a56cc8509014a9a111c49524eb 100644
--- a/src/sip/siptransport.cpp
+++ b/src/sip/siptransport.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
@@ -17,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "siptransport.h"
diff --git a/src/sip/siptransport.h b/src/sip/siptransport.h
index 2cb794f8730ab16ed1ba6923e8328fe110d74e92..d0aa0bfd395da3fce1ce29a35d42d154cd9c676b 100644
--- a/src/sip/siptransport.h
+++ b/src/sip/siptransport.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
@@ -17,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef SIPTRANSPORT_H_
diff --git a/src/sip/sipvoiplink.cpp b/src/sip/sipvoiplink.cpp
index e1fe35694c85c7b2dfdd657f79b1a17b4ed12145..21cd5b6564e6b8f1b67cc288d41cea214b7f0236 100644
--- a/src/sip/sipvoiplink.cpp
+++ b/src/sip/sipvoiplink.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yun Liu <yun.liu@savoirfairelinux.com>
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
@@ -19,17 +20,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "sipvoiplink.h"
diff --git a/src/sip/sipvoiplink.h b/src/sip/sipvoiplink.h
index 8b32933e22bd694c1523e371591898870f516bf7..0d54e93cf76ea94ad49e89c3bd0024177888ce17 100644
--- a/src/sip/sipvoiplink.h
+++ b/src/sip/sipvoiplink.h
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yun Liu <yun.liu@savoirfairelinux.com>
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
- * Author : Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,24 +14,12 @@
*
* This program 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 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef SIPVOIPLINK_H_
diff --git a/src/string_utils.cpp b/src/string_utils.cpp
index b511f6c83a26b84d358500715174acd54b5cf12c..a172f2b86c35d95590d765f8c21744442c394966 100644
--- a/src/string_utils.cpp
+++ b/src/string_utils.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
*
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
@@ -17,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "string_utils.h"
diff --git a/src/string_utils.h b/src/string_utils.h
index b23470f4e0caed2869a912b9a5fbb2a204670ce5..3fd19d3336f9cf3a1525b098d6fea5e15f80ee88 100644
--- a/src/string_utils.h
+++ b/src/string_utils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
*
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
@@ -17,17 +17,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef STRING_UTILS_H
diff --git a/src/threadloop.cpp b/src/threadloop.cpp
index b1cef7d2349f7d715d9d467288befc22ebfcc1cb..3fcb54711cd9d34a7fdb4e353fccfddd5c4be996 100644
--- a/src/threadloop.cpp
+++ b/src/threadloop.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
*
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "threadloop.h"
diff --git a/src/threadloop.h b/src/threadloop.h
index a15d6d39fe6cf56753dab191ddcb22fb9f75d138..7888f4b98971cb0066d3bd239f78ea29bbf06188 100644
--- a/src/threadloop.h
+++ b/src/threadloop.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
*
* Author: Guillaume Roguez <Guillaume.Roguez@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/src/upnp/upnp_context.cpp b/src/upnp/upnp_context.cpp
index e6da0d249ff71d03204236bde2f911c77f7bab81..2262a0ccb16138352e21587872f959f97148c320 100644
--- a/src/upnp/upnp_context.cpp
+++ b/src/upnp/upnp_context.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/upnp/upnp_context.h b/src/upnp/upnp_context.h
index c9c869ea0867487df42e35fe35d69ce63bd4c1fd..250e5b3f24657af270c06ef3e82fd6570d331c23 100644
--- a/src/upnp/upnp_context.h
+++ b/src/upnp/upnp_context.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef UPNP_CONTEXT_H_
diff --git a/src/upnp/upnp_control.cpp b/src/upnp/upnp_control.cpp
index 9bdc9fb6d450a86fb3e3c10f4003129893790b81..df3a32144506d481ebef8135873f942bce8df760 100644
--- a/src/upnp/upnp_control.cpp
+++ b/src/upnp/upnp_control.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/upnp/upnp_control.h b/src/upnp/upnp_control.h
index 924a95b044f9996048b6e94f2eb1e9082e5cef71..dd64296869a61a810407aa7ed78d0cc3e4b519c9 100644
--- a/src/upnp/upnp_control.h
+++ b/src/upnp/upnp_control.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef UPNP_H_
diff --git a/src/upnp/upnp_igd.cpp b/src/upnp/upnp_igd.cpp
index dfe0a410c95d39165e30f0311c363eeaf87cad4d..e58be9688d6b2792d59e9cb4db3eef2befd90fe6 100644
--- a/src/upnp/upnp_igd.cpp
+++ b/src/upnp/upnp_igd.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "upnp_igd.h"
diff --git a/src/upnp/upnp_igd.h b/src/upnp/upnp_igd.h
index b0d472f4d7884675f4cb19981cdbca7ccfa9dc92..da756120030dc8ea5a78a221c546f3d8fa455bd2 100644
--- a/src/upnp/upnp_igd.h
+++ b/src/upnp/upnp_igd.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef UPNP_IGD_H_
diff --git a/src/utf8_utils.cpp b/src/utf8_utils.cpp
index 4088fd692098c06ae013a61bae37246f637e7612..d0975f12123bcd8b936e06115dd69f7e8762a8f4 100644
--- a/src/utf8_utils.cpp
+++ b/src/utf8_utils.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999 Tom Tromey
* Copyright (C) 2000 Red Hat, Inc.
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
*
* Author: Pascal Potvin <pascal.potvin@extenway.com>
*
@@ -18,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
diff --git a/src/utf8_utils.h b/src/utf8_utils.h
index c48422a7a4e1bea601873195a343b532d6a5c4ca..7ef852ffeb9c2b498b9271d074b52df3ceb6ffc7 100644
--- a/src/utf8_utils.h
+++ b/src/utf8_utils.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999 Tom Tromey
* Copyright (C) 2000 Red Hat, Inc.
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
*
* Author: Pascal Potvin <pascal.potvin@extenway.com>
*
@@ -18,17 +18,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef H_UTF8_UTILS
diff --git a/test/accounttest.cpp b/test/accounttest.cpp
index e8c359c7bf8754649fa279e7ff9011b8486ff912..4fdbba1947e80279fc6db844b9c50df4ff978ed0 100644
--- a/test/accounttest.cpp
+++ b/test/accounttest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <cppunit/extensions/HelperMacros.h>
diff --git a/test/accounttest.h b/test/accounttest.h
index 1c1606e8131b2d433cc465c579ac5ab48c3b2988..3b364c8220157d41fc7819e304496325082dbc75 100644
--- a/test/accounttest.h
+++ b/test/accounttest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef ACCOUNTTEST_H_
diff --git a/test/audiobuffertest.cpp b/test/audiobuffertest.cpp
index f006cb8997ace7ca82ce4fe3cd3143573e4b4a66..856e4bbde0e9ba670361095b719acbb433f311fe 100644
--- a/test/audiobuffertest.cpp
+++ b/test/audiobuffertest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Adrien Beraud <adrienberaud@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <string>
diff --git a/test/audiobuffertest.h b/test/audiobuffertest.h
index 48cf7c2668857d03632ae841398cd8399118a822..e421acf8c5559d99ea5471aaac28d9a9149a78f0 100644
--- a/test/audiobuffertest.h
+++ b/test/audiobuffertest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Adrien Beraud <adrienberaud@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef AUDIOBUFFER_TEST_
diff --git a/test/audiocodectest.cpp b/test/audiocodectest.cpp
index 82ab0ab75100e44410a11671d0e44a3ce7782445..46d598afea7da9612502bea9270a286842e8071f 100644
--- a/test/audiocodectest.cpp
+++ b/test/audiocodectest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
/*
diff --git a/test/audiocodectest.h b/test/audiocodectest.h
index 7bc7677cfc0e538517d1277721f8bb789c7dbdb3..8a24ccc2c18bda32cb63585c9266d4973bf3c20b 100644
--- a/test/audiocodectest.h
+++ b/test/audiocodectest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
/*
diff --git a/test/audiolayertest.cpp b/test/audiolayertest.cpp
index 88c17d048546420b6346cbb47d57155c114bddc4..7a7c42d63499fa7d746de07bca08c3b5122a6108 100644
--- a/test/audiolayertest.cpp
+++ b/test/audiolayertest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "audiolayertest.h"
diff --git a/test/audiolayertest.h b/test/audiolayertest.h
index 98e40e8242fc6f69c99f4b14094398d5e7c98517..0117699e195a7077be742a96942ff277bf120006 100644
--- a/test/audiolayertest.h
+++ b/test/audiolayertest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
/*
diff --git a/test/configurationtest.cpp b/test/configurationtest.cpp
index 0ccc7f56e0bea0f580148fab3665a86978aab854..c77bd4757de4cd0e340b2b4fbf217bfd400d69d4 100644
--- a/test/configurationtest.cpp
+++ b/test/configurationtest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "configurationtest.h"
diff --git a/test/configurationtest.h b/test/configurationtest.h
index 446d9e0c42068930e52ee5125302ad0f24b44398..15d6847628a4a2809bdb968f5167a26b647f6965 100644
--- a/test/configurationtest.h
+++ b/test/configurationtest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
/*
diff --git a/test/constants.h b/test/constants.h
index 8b33136b04ef5109f63010700274548eaf99fb6f..82f7cd8342862e212bebb1cc41dd8860f3884ba9 100644
--- a/test/constants.h
+++ b/test/constants.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef CONSTANTS_H_
diff --git a/test/historytest.cpp b/test/historytest.cpp
index d153ac3f814b2762a1b2e93d73308ad079f2c399..3a9213cb90706700d5d41698ecefd70eaa156650 100644
--- a/test/historytest.cpp
+++ b/test/historytest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <cstdlib>
diff --git a/test/historytest.h b/test/historytest.h
index b8671f8476f2ba564ff801885a3aedf8a86f5d40..510a14ce3e1e9e279ccb3d1d9459de2f8232c5ad 100644
--- a/test/historytest.h
+++ b/test/historytest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
// Cppunit import
diff --git a/test/hooktest.cpp b/test/hooktest.cpp
index 1ef998148adac47191a2c3a43427b369bd506376..96cc4645bb7c6446fc59450a6715c93d982d50ac 100644
--- a/test/hooktest.cpp
+++ b/test/hooktest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "hooktest.h"
diff --git a/test/hooktest.h b/test/hooktest.h
index 432c3f000a487e4b7fb3e8a2a59fe2d17ad1f1f7..fb1d9323bf91e78b675c8f08a5af17dd218b0127 100644
--- a/test/hooktest.h
+++ b/test/hooktest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef HOOKTEST_H_
diff --git a/test/instantmessagingtest.cpp b/test/instantmessagingtest.cpp
index 148f2d8a921e4f63315cad885e68aecf03fbf30a..f8e2e38053b1cb021b88b02a62f2fe323cc0f447 100644
--- a/test/instantmessagingtest.cpp
+++ b/test/instantmessagingtest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <iostream>
diff --git a/test/instantmessagingtest.h b/test/instantmessagingtest.h
index 2485acba5cf69b48ea4fa6227b685159d0b33143..eddced93986ed97a9f2162603f88dc2bd84811b0 100644
--- a/test/instantmessagingtest.h
+++ b/test/instantmessagingtest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
// Cppunit import
diff --git a/test/iptest.cpp b/test/iptest.cpp
index ca8f2ac7601ac842111076fb089f4ca1966f4fec..07707907a895864dcd6b94e51846789e899a7c2a 100644
--- a/test/iptest.cpp
+++ b/test/iptest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <string>
diff --git a/test/iptest.h b/test/iptest.h
index 5ac72f7c578704b1fa6802dd837a32b0d9893e36..1da05062717855edf8891ce6d408df5ab7237c19 100644
--- a/test/iptest.h
+++ b/test/iptest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef IP_TEST_
diff --git a/test/main.cpp b/test/main.cpp
index 66a202f89cd18ec921daf1861feb575533d820c4..7c277272d89348fac6f396a63a83e4c790e8e68a 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "logger.h"
@@ -62,7 +52,7 @@ void cleanup()
int main(int argc, char* argv[])
{
atexit(cleanup);
- printf("\nRing Daemon Test Suite, by Savoir-Faire Linux 2004-2015\n\n");
+ printf("\nRing Daemon Test Suite, by Savoir-faire Linux 2004-2015\n\n");
setConsoleLog(true);
setDebugMode(true);
ring::fileutils::FileHandle f(ring::fileutils::create_pidfile());
diff --git a/test/numbercleanertest.cpp b/test/numbercleanertest.cpp
index f2c4cb0469b050f15c53b697aec3956e93652eb2..845f5f645930bbc261566f2c372ad3347a85f68c 100644
--- a/test/numbercleanertest.cpp
+++ b/test/numbercleanertest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <cstdio>
diff --git a/test/numbercleanertest.h b/test/numbercleanertest.h
index 3e60df6a3bc0b92d343380f5381bc72255e89e77..d7f5b9f584edb9db89d4797904b928a9855e59dc 100644
--- a/test/numbercleanertest.h
+++ b/test/numbercleanertest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
// Cppunit import
diff --git a/test/resamplertest.cpp b/test/resamplertest.cpp
index b0a1c5f88a726271a1ace17bdd4cad5721b182f9..e0979285389f010af211ce8c17e3a3092eff1171 100644
--- a/test/resamplertest.cpp
+++ b/test/resamplertest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <iostream>
diff --git a/test/resamplertest.h b/test/resamplertest.h
index 3297d356043080adaf544685cc1d2e295ef6b8d8..f887687490848e4146c37bff2de8c0fc10a31d7c 100644
--- a/test/resamplertest.h
+++ b/test/resamplertest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2012-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2012-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _RESAMPLER_TEST_
diff --git a/test/ringbufferpooltest.cpp b/test/ringbufferpooltest.cpp
index ba76e7742c90407d47edeb6dfc0c8adc964952b2..c37e68f50ff5582a8214edccb36aab08b4e81e81 100644
--- a/test/ringbufferpooltest.cpp
+++ b/test/ringbufferpooltest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <string>
diff --git a/test/ringbufferpooltest.h b/test/ringbufferpooltest.h
index ae48bb8e85b35cc67bbdb4ff205f0d67f379bfba..3ee66835788a2a9f31823187fc8a59fe2789ceb4 100644
--- a/test/ringbufferpooltest.h
+++ b/test/ringbufferpooltest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef RINGBUFFERPOOL_TEST_
diff --git a/test/scripts/presence_test.py b/test/scripts/presence_test.py
index 757aa5afac94335559de241795b55735bc6fbfea..81a4a1aed0514bd33f99001ac4079c567aa811fd 100755
--- a/test/scripts/presence_test.py
+++ b/test/scripts/presence_test.py
@@ -3,7 +3,7 @@
print "\
# --SFLPhone-- #\n\
# #\n\
-# copyright: Savoir-Faire Linux (2013) #\n\
+# copyright: Savoir-faire Linux (2013) #\n\
# author: Patrick keroulas <patrick.keroulas@savoirfairelinux.com> #\n\
# description: This script sends a sequence of methods to the daemon #\n\
# through the dbus to test the presence feature of SFLPhone. #\n\
diff --git a/test/scripts/stress_test.py b/test/scripts/stress_test.py
index cfad97e741268babfc0ecfa325a5c3a056d0b251..4d4a608f7f46954048d5e7f9e09a9f87824ca808 100755
--- a/test/scripts/stress_test.py
+++ b/test/scripts/stress_test.py
@@ -10,7 +10,7 @@ print "\
# #\n\
# _Version 2.0_ #\n\
# #\n\
-# copyright: Savoir-Faire Linux (2012-2013) #\n\
+# copyright: Savoir-faire Linux (2012-2013) #\n\
# author: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> #\n\
# description: This script perform stress tests to trigger rare race #\n\
# conditions or ASSERT caused by excessive load. This script #\n\
diff --git a/test/sdesnegotiatortest.cpp b/test/sdesnegotiatortest.cpp
index 77bcd41f6ac367f1da92b6466da6f1ccd1c0a99b..b03ea7cbddefcd32ee70f7a39ea06397c1f24ada 100644
--- a/test/sdesnegotiatortest.cpp
+++ b/test/sdesnegotiatortest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <cstddef>
diff --git a/test/sdesnegotiatortest.h b/test/sdesnegotiatortest.h
index 168d65ca71d40732be0a92d6d894718d42ad6609..5f8b94758b319164a1e25510b3eb10af8c2c2cf2 100644
--- a/test/sdesnegotiatortest.h
+++ b/test/sdesnegotiatortest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
// Cppunit import
diff --git a/test/sdptest.cpp b/test/sdptest.cpp
index 5ef2a2cac5546c6855c7e37ba3c43073878d8fc2..3d87e17a2ec6daad071addf418f55b9b4ead8313 100644
--- a/test/sdptest.cpp
+++ b/test/sdptest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
/*
diff --git a/test/sdptest.h b/test/sdptest.h
index c977a2b9b63704254f79abbaadaadaf889f16452..f635624af319781737b26da2ad79084c35f7010d 100644
--- a/test/sdptest.h
+++ b/test/sdptest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,21 +16,8 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
-
-
/*
* @file sdptest.h
* @brief Regroups unitary tests related to the SDP session
diff --git a/test/siptest.cpp b/test/siptest.cpp
index 09df660ae6f265bddcb83fb065fba2a36dc05bd4..f69a9a48fa4315b0c92b89185bd7f2f8d4530177 100644
--- a/test/siptest.cpp
+++ b/test/siptest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
/*
diff --git a/test/siptest.h b/test/siptest.h
index 82ccef51b83def9c77d6af74fc3ed5c810903b03..f657622e846665240f1a52f420db47019ca9e08e 100644
--- a/test/siptest.h
+++ b/test/siptest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
// Cppunit import
diff --git a/test/test_utils.h b/test/test_utils.h
index 5fd9d9f4d6d09d5311c5d18c7d297b5d49d39810..8f22dabf0212146cc2a04dc998b596ccd8d705da 100644
--- a/test/test_utils.h
+++ b/test/test_utils.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef TEST_UTILS_H_
diff --git a/test/tlstest.cpp b/test/tlstest.cpp
index dbbbadf4345b60d8d7cd3007626ee71129823713..19d787c2e4dee3374844918914cf036380ce8aea 100644
--- a/test/tlstest.cpp
+++ b/test/tlstest.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
/*
diff --git a/test/tlstest.h b/test/tlstest.h
index eb5c5e3082b0737cf87aca1bd567b926a7296aec..da2e0ef227daecfdfffd3d7405377de2c2eab9ef 100644
--- a/test/tlstest.h
+++ b/test/tlstest.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +16,6 @@
* 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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
/*
diff --git a/tools/asterisk/keys/ca.cfg b/tools/asterisk/keys/ca.cfg
index f362441845dd96792477e6e592f397923b57d711..f716d5def1ee9c8436e625d967e99099d0a9e7f8 100644
--- a/tools/asterisk/keys/ca.cfg
+++ b/tools/asterisk/keys/ca.cfg
@@ -4,7 +4,7 @@ prompt = no
[req_distinguished_name]
CN=Asterisk Private CA
-O=Test Savoir-Faire Linux
+O=Test Savoir-faire Linux
[ext]
basicConstraints=CA:TRUE
diff --git a/tools/asterisk/keys/tmp.cfg b/tools/asterisk/keys/tmp.cfg
index f9d4477e978ba4a795440491b0922beff81e1ab9..41d3454da1af44d5cad7d6346522ea139201a2bf 100644
--- a/tools/asterisk/keys/tmp.cfg
+++ b/tools/asterisk/keys/tmp.cfg
@@ -4,4 +4,4 @@ prompt = no
[req_distinguished_name]
CN=127.0.0.1
-O=Test Savoir-Faire Linux
+O=Test Savoir-faire Linux
diff --git a/tools/build-system/hudson-sflphone-script.sh b/tools/build-system/hudson-sflphone-script.sh
index fc63181c7dafd0f3f023e46b2b322db1ab9f21f2..7067088d63ef45c388505f75509bbf5da002706b 100755
--- a/tools/build-system/hudson-sflphone-script.sh
+++ b/tools/build-system/hudson-sflphone-script.sh
@@ -1,6 +1,6 @@
#!/bin/bash -e
#
-# Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+# Copyright (C) 2004-2015 Savoir-faire Linux Inc.
#
# Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
#
@@ -18,17 +18,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
-# Additional permission under GNU GPL version 3 section 7:
-#
-# If you modify this program, or any covered work, by linking or
-# combining it with the OpenSSL project's OpenSSL library (or a
-# modified version of that library), containing parts covered by the
-# terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-# grants you additional permission to convey the resulting work.
-# Corresponding Source for a non-source form of such a combination
-# shall include the source code for the parts of OpenSSL used as well
-# as that of the covered work.
-#
# Script used by Hudson continious integration server to build SFLphone
diff --git a/tools/build-system/launchpad/sflphone-daemon-video/debian/copyright b/tools/build-system/launchpad/sflphone-daemon-video/debian/copyright
index 90f090efff49cde5c3c3678b9edf1bb98f60d5d6..84b366d484b05663db183970d75d35e466acb968 100644
--- a/tools/build-system/launchpad/sflphone-daemon-video/debian/copyright
+++ b/tools/build-system/launchpad/sflphone-daemon-video/debian/copyright
@@ -7,11 +7,11 @@ Upstream Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Copyright:
-Savoir-Faire Linux Inc.
+Savoir-faire Linux Inc.
License:
-This software is copyright (c) 2004-2011 Savoir-Faire Linux inc.
+This software is copyright (c) 2004-2011 Savoir-faire Linux Inc.
You are free to distribute this software under the terms of
the GNU General Public License version 3.
diff --git a/tools/build-system/launchpad/sflphone-daemon/debian/copyright b/tools/build-system/launchpad/sflphone-daemon/debian/copyright
index 90f090efff49cde5c3c3678b9edf1bb98f60d5d6..84b366d484b05663db183970d75d35e466acb968 100644
--- a/tools/build-system/launchpad/sflphone-daemon/debian/copyright
+++ b/tools/build-system/launchpad/sflphone-daemon/debian/copyright
@@ -7,11 +7,11 @@ Upstream Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Copyright:
-Savoir-Faire Linux Inc.
+Savoir-faire Linux Inc.
License:
-This software is copyright (c) 2004-2011 Savoir-Faire Linux inc.
+This software is copyright (c) 2004-2011 Savoir-faire Linux Inc.
You are free to distribute this software under the terms of
the GNU General Public License version 3.
diff --git a/tools/build-system/launchpad/sflphone-gnome-video/debian/copyright b/tools/build-system/launchpad/sflphone-gnome-video/debian/copyright
index 90f090efff49cde5c3c3678b9edf1bb98f60d5d6..84b366d484b05663db183970d75d35e466acb968 100644
--- a/tools/build-system/launchpad/sflphone-gnome-video/debian/copyright
+++ b/tools/build-system/launchpad/sflphone-gnome-video/debian/copyright
@@ -7,11 +7,11 @@ Upstream Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Copyright:
-Savoir-Faire Linux Inc.
+Savoir-faire Linux Inc.
License:
-This software is copyright (c) 2004-2011 Savoir-Faire Linux inc.
+This software is copyright (c) 2004-2011 Savoir-faire Linux Inc.
You are free to distribute this software under the terms of
the GNU General Public License version 3.
diff --git a/tools/build-system/launchpad/sflphone-gnome/debian/copyright b/tools/build-system/launchpad/sflphone-gnome/debian/copyright
index 90f090efff49cde5c3c3678b9edf1bb98f60d5d6..84b366d484b05663db183970d75d35e466acb968 100644
--- a/tools/build-system/launchpad/sflphone-gnome/debian/copyright
+++ b/tools/build-system/launchpad/sflphone-gnome/debian/copyright
@@ -7,11 +7,11 @@ Upstream Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Copyright:
-Savoir-Faire Linux Inc.
+Savoir-faire Linux Inc.
License:
-This software is copyright (c) 2004-2011 Savoir-Faire Linux inc.
+This software is copyright (c) 2004-2011 Savoir-faire Linux Inc.
You are free to distribute this software under the terms of
the GNU General Public License version 3.
diff --git a/tools/build-system/launchpad/sflphone-kde/debian/copyright b/tools/build-system/launchpad/sflphone-kde/debian/copyright
index 9a2517742fc84d943b27046e0f5538cd76fbd00c..754aa06895bd918a26abd3834731ca29539eb1e1 100644
--- a/tools/build-system/launchpad/sflphone-kde/debian/copyright
+++ b/tools/build-system/launchpad/sflphone-kde/debian/copyright
@@ -1,8 +1,8 @@
SFLPhone:
- (C) 2004-2012 Savoir-Faire Linux <contact@savoirfairelinux.com>
+ (C) 2004-2012 Savoir-faire Linux <contact@savoirfairelinux.com>
SFLPhone KDE:
- Copyright (C) 2008-2009 Savoir-Faire Linux <jeremy.quentin@savoirfairelinux.com>
- Copyright (C) 2009-2012 Savoir-Faire Linux <emmanuel.lepage@savoirfairelinux.com>
+ Copyright (C) 2008-2009 Savoir-faire Linux <jeremy.quentin@savoirfairelinux.com>
+ Copyright (C) 2009-2012 Savoir-faire Linux <emmanuel.lepage@savoirfairelinux.com>
diff --git a/tools/build-system/launchpad/sflphone-plugins/debian/copyright b/tools/build-system/launchpad/sflphone-plugins/debian/copyright
index 14695bb9f73024dee1504ae486f5427ef6ce8e9a..a01821d0913c8aefd6f2c197119dc8e462d82f5e 100644
--- a/tools/build-system/launchpad/sflphone-plugins/debian/copyright
+++ b/tools/build-system/launchpad/sflphone-plugins/debian/copyright
@@ -7,11 +7,11 @@ Upstream Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Copyright:
-Savoir-Faire Linux Inc.
+Savoir-faire Linux Inc.
License:
-This software is copyright (c) 2004-2011 Savoir-Faire Linux inc.
+This software is copyright (c) 2004-2011 Savoir-faire Linux Inc.
You are free to distribute this software under the terms of
the GNU General Public License version 3.
diff --git a/tools/dringctrl/__init__.py b/tools/dringctrl/__init__.py
index 991f029774f57b1a8a354ae702efe5c7e5855e03..3b2757a9b0609e43a2e2076db93b29274fe9571b 100644
--- a/tools/dringctrl/__init__.py
+++ b/tools/dringctrl/__init__.py
@@ -1,5 +1,6 @@
#
-# Copyright (C) 2015 Savoir-Faire Linux Inc.
+# Copyright (C) 2015 Savoir-faire Linux Inc.
+#
# Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
#
# This program is free software; you can redistribute it and/or modify
@@ -16,14 +17,3 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-# Additional permission under GNU GPL version 3 section 7:
-#
-# If you modify this program, or any covered work, by linking or
-# combining it with the OpenSSL project's OpenSSL library (or a
-# modified version of that library), containing parts covered by the
-# terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-# grants you additional permission to convey the resulting work.
-# Corresponding Source for a non-source form of such a combination
-# shall include the source code for the parts of OpenSSL used as well
-# as that of the covered work.
-#
diff --git a/tools/dringctrl/controler.py b/tools/dringctrl/controler.py
index bbb6702653e0129b134a6ba6c63fc31801441d41..27f4eb2decfa79c3b2e0cbfd3fa8bda4c76b06a7 100644
--- a/tools/dringctrl/controler.py
+++ b/tools/dringctrl/controler.py
@@ -1,5 +1,6 @@
#
-# Copyright (C) 2015 Savoir-Faire Linux Inc.
+# Copyright (C) 2015 Savoir-faire Linux Inc
+#
# Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
#
# This program is free software; you can redistribute it and/or modify
@@ -16,17 +17,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-# Additional permission under GNU GPL version 3 section 7:
-#
-# If you modify this program, or any covered work, by linking or
-# combining it with the OpenSSL project's OpenSSL library (or a
-# modified version of that library), containing parts covered by the
-# terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-# grants you additional permission to convey the resulting work.
-# Corresponding Source for a non-source form of such a combination
-# shall include the source code for the parts of OpenSSL used as well
-# as that of the covered work.
-#
"""DRing controling class through DBUS"""
diff --git a/tools/dringctrl/errors.py b/tools/dringctrl/errors.py
index 27bcf5d7199d83f6fb93ede5f074f6b612b32273..eff698728727037ce64baa2052af524f981c72f9 100644
--- a/tools/dringctrl/errors.py
+++ b/tools/dringctrl/errors.py
@@ -1,5 +1,6 @@
#
-# Copyright (C) 2015 Savoir-Faire Linux Inc.
+# Copyright (C) 2015 Savoir-faire Linux Inc.
+#
# Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
#
# This program is free software; you can redistribute it and/or modify
@@ -16,17 +17,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-# Additional permission under GNU GPL version 3 section 7:
-#
-# If you modify this program, or any covered work, by linking or
-# combining it with the OpenSSL project's OpenSSL library (or a
-# modified version of that library), containing parts covered by the
-# terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-# grants you additional permission to convey the resulting work.
-# Corresponding Source for a non-source form of such a combination
-# shall include the source code for the parts of OpenSSL used as well
-# as that of the covered work.
-#
"""Internal exceptions"""
diff --git a/tools/dringctrl/tester.py b/tools/dringctrl/tester.py
index a8bb0648c011ac9ef74c317b493b402d375db87a..100cc217142c569279dda630f97925ac56f68d5c 100644
--- a/tools/dringctrl/tester.py
+++ b/tools/dringctrl/tester.py
@@ -1,5 +1,6 @@
#
-# Copyright (C) 2015 Savoir-Faire Linux Inc.
+# Copyright (C) 2015 Savoir-faire Linux Inc.
+#
# Author: Eloi Bail <eloi.bail@savoirfairelinux.com>
#
# This program is free software; you can redistribute it and/or modify
@@ -16,17 +17,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-# Additional permission under GNU GPL version 3 section 7:
-#
-# If you modify this program, or any covered work, by linking or
-# combining it with the OpenSSL project's OpenSSL library (or a
-# modified version of that library), containing parts covered by the
-# terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-# grants you additional permission to convey the resulting work.
-# Corresponding Source for a non-source form of such a combination
-# shall include the source code for the parts of OpenSSL used as well
-# as that of the covered work.
-#
import sys
import os
diff --git a/tools/dringctrl/toggle_video_preview.py b/tools/dringctrl/toggle_video_preview.py
index 08ee58e7b7998e2a6b2dbca906c077b1d8c3c6bd..6058e4d80d9e7f629a78035cc5634f27dff53d04 100755
--- a/tools/dringctrl/toggle_video_preview.py
+++ b/tools/dringctrl/toggle_video_preview.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python3
#
-# Copyright (C) 2015 Savoir-Faire Linux Inc.
+# Copyright (C) 2015 Savoir-faire Linux Inc.
+#
# Author: Eloi Bail <eloi.bail@savoirfairelinux.com>
#
# This program is free software; you can redistribute it and/or modify
@@ -17,17 +18,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-# Additional permission under GNU GPL version 3 section 7:
-#
-# If you modify this program, or any covered work, by linking or
-# combining it with the OpenSSL project's OpenSSL library (or a
-# modified version of that library), containing parts covered by the
-# terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-# grants you additional permission to convey the resulting work.
-# Corresponding Source for a non-source form of such a combination
-# shall include the source code for the parts of OpenSSL used as well
-# as that of the covered work.
-#
import dbus
import time
diff --git a/tools/git-gerrit b/tools/git-gerrit
index 846f63331f1f55ad3bd3e77e6c7eb1b1a69b61c9..7326d264537d388a69af5fa38e9878a373e04661 100755
--- a/tools/git-gerrit
+++ b/tools/git-gerrit
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright 2014 Savoir-Faire Linux Inc.
+# Copyright 2014 Savoir-faire Linux Inc.
# Author: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
# Licensed under the terms of the GNU GPL v3, or at your option, any later version.
#
diff --git a/tools/git-redmine b/tools/git-redmine
index d2ca906e0fa23d4642bf17f10b9bd9afcb55f46d..db1ee0b86ef8573869910e33ffbebb43c12087e5 100755
--- a/tools/git-redmine
+++ b/tools/git-redmine
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright 2014 Savoir-Faire Linux Inc.
+# Copyright 2014 Savoir-faire Linux Inc.
# Author: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
# Licensed under the terms of the GNU GPL v3, or at your option, any later version.
#
diff --git a/tools/update-copyright b/tools/update-copyright
index 5092cc0da75571504d3259517a9e8c0d410cc574..b41c48bd76371f095642c978f09f458d5ec98b33 100755
--- a/tools/update-copyright
+++ b/tools/update-copyright
@@ -1,11 +1,12 @@
#!/bin/bash
-# Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+# Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+#
# Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
#
-# This program is free software: you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -14,29 +15,19 @@
# 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, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7:
-#
-# If you modify this program, or any covered work, by linking or
-# combining it with the OpenSSL project's OpenSSL library (or a
-# modified version of that library), containing parts covered by the
-# terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-# grants you additional permission to convey the resulting work.
-# Corresponding Source for a non-source form of such a combination
-# shall include the source code for the parts of OpenSSL used as well
-# as that of the covered work.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# List all files in current directory
-FILES=`find -name "*.h" -o -name "*.c" -o -name "*.cpp" -o -name "*.i" -o -name "README" -o -name "*.sh" -o -name "*.py"`
+FILES=`find -name "*.h" -o -name "*.c" -o -name "*.cpp" -o -name "*.i" -o -name "README" -o -name "*.sh" -o -name "*.py" -o -name "*.mm"`
year=`date +%Y`
# Loop and replace
for f in $FILES
do
- sed -i "/$year/b; s/\-[0-9]\+ Savoir-Faire Linux Inc/-$year Savoir-Faire Linux Inc/g" $f
- sed -i "/$year/b; s/ \([0-9]\+\) Savoir-Faire Linux Inc/ \1-$year Savoir-Faire Linux Inc/g" $f
+ sed -i "/$year/b; s/\-[0-9]\+ Savoir-[fF]aire Linux Inc/-$year Savoir-faire Linux Inc/g" $f
+ sed -i "/$year/b; s/ \([0-9]\+\) Savoir-[fF]aire Linux Inc/ \1-$year Savoir-faire Linux Inc/g" $f
done
exit 0;