[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: koffice/filters/kword/mswrite
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2007-09-29 22:22:00
Message-ID: 200709300022.01334.inge () lysator ! liu ! se
[Download RAW message or body]

On Saturday 29 September 2007 16:32, Clarence Dang wrote:
> SVN commit 718715 by dang:
>
> Relicense from LGPL to 2-clause BSD.

Why was this change done?  I'm not sure it's compatible with the koffice 
policies to have BSD licensed code in there.  If you must change the license, 
then how about a dual license?

	-Inge

>  M  +19 -11    mswriteexport.cc
>  M  +19 -11    mswriteexport.h
>  M  +19 -11    mswriteimport.cc
>  M  +19 -11    mswriteimport.h
>
>
> --- trunk/koffice/filters/kword/mswrite/mswriteexport.cc #718714:718715
> @@ -1,19 +1,27 @@
>  /* This file is part of the KDE project
>     Copyright (C) 2002-2003 Clarence Dang <dang@kde.org>
> +   All rights reserved.
>
> -   This library is free software; you can redistribute it and/or
> -   modify it under the terms of the GNU Library General Public
> -   License Version 2 as published by the Free Software Foundation.
> +   Redistribution and use in source and binary forms, with or without
> +   modification, are permitted provided that the following conditions
> +   are met:
>
> -   This library is distributed in the hope that it will be useful,
> -   but WITHOUT ANY WARRANTY; without even the implied warranty of
> -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -   Library General Public License Version 2 for more details.
> +   1. Redistributions of source code must retain the above copyright
> +      notice, this list of conditions and the following disclaimer.
> +   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.
>
> -   You should have received a copy of the GNU Library General Public
> License -   Version 2 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 SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. */
>
>  #include <limits.h>
> --- trunk/koffice/filters/kword/mswrite/mswriteexport.h #718714:718715
> @@ -1,19 +1,27 @@
>  /* This file is part of the KDE project
>     Copyright (C) 2002-2003 Clarence Dang <dang@kde.org>
> +   All rights reserved.
>
> -   This library is free software; you can redistribute it and/or
> -   modify it under the terms of the GNU Library General Public
> -   License Version 2 as published by the Free Software Foundation.
> +   Redistribution and use in source and binary forms, with or without
> +   modification, are permitted provided that the following conditions
> +   are met:
>
> -   This library is distributed in the hope that it will be useful,
> -   but WITHOUT ANY WARRANTY; without even the implied warranty of
> -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -   Library General Public License Version 2 for more details.
> +   1. Redistributions of source code must retain the above copyright
> +      notice, this list of conditions and the following disclaimer.
> +   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.
>
> -   You should have received a copy of the GNU Library General Public
> License -   Version 2 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 SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. */
>
>  #ifndef MSWRITEEXPORT_H
> --- trunk/koffice/filters/kword/mswrite/mswriteimport.cc #718714:718715
> @@ -1,19 +1,27 @@
>  /* This file is part of the KDE project
>     Copyright (C) 2001-2003 Clarence Dang <dang@kde.org>
> +   All rights reserved.
>
> -   This library is free software; you can redistribute it and/or
> -   modify it under the terms of the GNU Library General Public
> -   License Version 2 as published by the Free Software Foundation.
> +   Redistribution and use in source and binary forms, with or without
> +   modification, are permitted provided that the following conditions
> +   are met:
>
> -   This library is distributed in the hope that it will be useful,
> -   but WITHOUT ANY WARRANTY; without even the implied warranty of
> -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -   Library General Public License Version 2 for more details.
> +   1. Redistributions of source code must retain the above copyright
> +      notice, this list of conditions and the following disclaimer.
> +   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.
>
> -   You should have received a copy of the GNU Library General Public
> License -   Version 2 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 SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. */
>
>  #ifndef NDEBUG
> --- trunk/koffice/filters/kword/mswrite/mswriteimport.h #718714:718715
> @@ -1,19 +1,27 @@
>  /* This file is part of the KDE project
>     Copyright (C) 2001-2003 Clarence Dang <dang@kde.org>
> +   All rights reserved.
>
> -   This library is free software; you can redistribute it and/or
> -   modify it under the terms of the GNU Library General Public
> -   License Version 2 as published by the Free Software Foundation.
> +   Redistribution and use in source and binary forms, with or without
> +   modification, are permitted provided that the following conditions
> +   are met:
>
> -   This library is distributed in the hope that it will be useful,
> -   but WITHOUT ANY WARRANTY; without even the implied warranty of
> -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -   Library General Public License Version 2 for more details.
> +   1. Redistributions of source code must retain the above copyright
> +      notice, this list of conditions and the following disclaimer.
> +   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.
>
> -   You should have received a copy of the GNU Library General Public
> License -   Version 2 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 SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. */
>
>  #ifndef MSWRITEIMPORT_H

-- 
Inge Wallin               | Thus spake the master programmer:               |
                          |      "After three days without programming,     |
inge@lysator.liu.se       |       life becomes meaningless."                |
                          | Geoffrey James: The Tao of Programming.         |
[prev in list] [next in list] [prev in thread] [next in thread]