[Libreoffice-commits] online.git: loolwsd/debian loolwsd/LOOLWSD.cpp

[Michael Meeks]

 loolwsd/LOOLWSD.cpp      |   27 ---------------------------
 loolwsd/debian/copyright |   40 +++++++++++++++++++---------------------
 2 files changed, 19 insertions(+), 48 deletions(-)

New commits:
commit 1216243935931ba3efe27be2497790405271d102
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Apr 5 13:58:41 2016 +0100

    License cleanup.
    
    Boost sample code long gone; and include loleaflet license.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 194cad3..a2f8911 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -5,33 +5,6 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Parts of this file is covered by:
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
  */
 
 #include "config.h"
diff --git a/loolwsd/debian/copyright b/loolwsd/debian/copyright
index d2a2a46..a75b302 100644
--- a/loolwsd/debian/copyright
+++ b/loolwsd/debian/copyright
@@ -6,28 +6,26 @@ Source: git://gerrit.libreoffice.org/online
 Copyright: 2015 Collabora Productivity <libreoffice at collabora.com>
 License: MPL-2
 
-Copyright: 2004-2006, Applied Informatics Software Engineering GmbH
+Copyright: Copyright (c) 2010-2015, Vladimir Agafonkin, Copyright (c) 2010-2011, CloudMade
 License:
-   Boost Software License - Version 1.0 - August 17th, 2003
+All rights reserved.
 
-   Permission is hereby granted, free of charge, to any person or organization
-   obtaining a copy of the software and accompanying documentation covered by
-   this license (the "Software") to use, reproduce, display, distribute,
-   execute, and transmit the Software, and to prepare derivative works of the
-   Software, and to permit third-parties to whom the Software is furnished to
-   do so, all subject to the following:
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
 
-   The copyright notices in the Software and this entire statement, including
-   the above license grant, this restriction and the following disclaimer,
-   must be included in all copies of the Software, in whole or in part, and
-   all derivative works of the Software, unless such copies or derivative
-   works are solely in the form of machine-executable object code generated by
-   a source language processor.
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
 
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-   SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-   FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.