From a149d9d1800dc59ac3c8c27f455d463d65fbc4a8 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sun, 11 Feb 2018 11:52:46 +0000 Subject: [PATCH] lazbarcode: Change license from GPL to BSD (in acreement with author, Jose Mejuto) git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6194 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/lazbarcodes/README.txt | 2 +- .../lazbarcodes/packages/lazbarcodes.lpk | 2 +- .../packages/lazbarcodes_runtimeonly.lpk | 18 ++++++- components/lazbarcodes/src/zint.pp | 49 ++++++++++++------- 4 files changed, 48 insertions(+), 23 deletions(-) diff --git a/components/lazbarcodes/README.txt b/components/lazbarcodes/README.txt index 07357f9a1..21fc60dba 100644 --- a/components/lazbarcodes/README.txt +++ b/components/lazbarcodes/README.txt @@ -20,7 +20,7 @@ Author: Jose Mejuto License: -GPL 3.0 as it is being inherited from the zint source code. +BSD 3 as it is being inherited from the zint backend source code. wiki Page: http://wiki.freepascal.org/LazBarcodes diff --git a/components/lazbarcodes/packages/lazbarcodes.lpk b/components/lazbarcodes/packages/lazbarcodes.lpk index e9420f670..46bb2ee01 100644 --- a/components/lazbarcodes/packages/lazbarcodes.lpk +++ b/components/lazbarcodes/packages/lazbarcodes.lpk @@ -14,7 +14,7 @@ - + diff --git a/components/lazbarcodes/packages/lazbarcodes_runtimeonly.lpk b/components/lazbarcodes/packages/lazbarcodes_runtimeonly.lpk index 20c969568..00b0169c7 100644 --- a/components/lazbarcodes/packages/lazbarcodes_runtimeonly.lpk +++ b/components/lazbarcodes/packages/lazbarcodes_runtimeonly.lpk @@ -13,8 +13,22 @@ - - + + diff --git a/components/lazbarcodes/src/zint.pp b/components/lazbarcodes/src/zint.pp index 6ef69c935..8494cbe5b 100644 --- a/components/lazbarcodes/src/zint.pp +++ b/components/lazbarcodes/src/zint.pp @@ -12,26 +12,37 @@ interface //{$PACKRECORDS C} {$ENDIF} + { zint.h - definitions for libzint + + libzint - the open source barcode library + Copyright (C) 2009-2017 Robin Stuart + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 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. + 3. Neither the name of the project nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + 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 OWNER 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. + } - { zint.h - definitions for libzint - - libzint - the open source barcode library - Copyright (C) 2009 Robin Stuart - - 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 - 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. - } {$ifndef ZINT_H} {$define ZINT_H} { C++ extern C conditionnal removed }