From 2bfe44c45c536443b2c330b076d5e06e72ff9148 Mon Sep 17 00:00:00 2001 From: Tom Albers Date: Sun, 16 Dec 2007 23:34:09 +0000 Subject: [PATCH] RELICENSE: relicense to GPL2/3. All contributors agreed to the relicense. Received separate mail from Martin Pool: -------------------------------------------- > You are listed as copyright holder for the files > in kdegraphics/okular/generators/comicbook/qnatsort.cpp. > Please let me know if you approve of such a relicense. > > I hope you approce. I'm willing to relicence to GPL2/3. I'm reluctant to sign a blank cheque by agreeing to all future versions of the licence. -- Martin -------------------------------------------- CCMAIL: mbp@sourcefrog.net svn path=/trunk/KDE/kdegraphics/okular/; revision=749279 --- generators/comicbook/qnatsort.cpp | 25 +++++++++++-------------- generators/comicbook/qnatsort.h | 25 +++++++++++-------------- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/generators/comicbook/qnatsort.cpp b/generators/comicbook/qnatsort.cpp index 3e4c1fda7..fcb0ad654 100644 --- a/generators/comicbook/qnatsort.cpp +++ b/generators/comicbook/qnatsort.cpp @@ -2,24 +2,21 @@ Natural order sorting of strings which contains numbers. Copyright 2007 Tobias Koenig - based on the natural order code by Martin Pool - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License version 2 or at your option version 3 as published by + the Free Software Foundation. - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: + 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. - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. + You should have received a copy of the GNU General Public 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 "qnatsort.h" diff --git a/generators/comicbook/qnatsort.h b/generators/comicbook/qnatsort.h index f8d194448..b2af8e7a4 100644 --- a/generators/comicbook/qnatsort.h +++ b/generators/comicbook/qnatsort.h @@ -2,24 +2,21 @@ Natural order sorting of strings which contains numbers. Copyright 2007 Tobias Koenig - based on the natural order code by Martin Pool - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License version 2 or at your option version 3 as published by + the Free Software Foundation. - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: + 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. - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. + You should have received a copy of the GNU General Public 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