From 7e13e94458d2676dedcb3d63ad9b9f06274622b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 11 Aug 2014 20:39:42 +0200 Subject: change typos in debian/copyright --- debian/control | 8 ++++---- debian/copyright | 54 +++++++++++++++++++++++++++++------------------------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/debian/control b/debian/control index 231f3d1..a6a43cf 100644 --- a/debian/control +++ b/debian/control @@ -15,13 +15,13 @@ Depends: ${misc:Depends} Description: Fast C++ CSV Parser Automatically rearranges columns by parsing the header line. Disk I/O and CSV-parsing are overlapped using threads for efficiency. - Parsing features such as escaped strings can be enabled and disabled - at compile time using templates. You only pay in speed for the + Parsing features such as escaped strings can be enabled and disabled + at compile time using templates. You only pay in speed for the features you actually use. Can read multiple GB files in reasonable time. - Support for custom columns separators (i.e. Tab separated value files + Support for custom columns separators (i.e. Tab separated value files are supported), quote escaped strings, automatic space trimming. Works with *nix and Windows newlines and automatically ignores UTF-8 BOMs. - Exception classes with enough context to format useful error messages. + Exception classes with enough context to format useful error messages. what() returns error messages ready to be shown to a user. diff --git a/debian/copyright b/debian/copyright index 8c9e49b..126a259 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,34 +8,38 @@ License: BSD-3-Clause Files: debian/* Copyright: 2014 Jörg Frings-Fürst -License: GPL-3.0+ +License: GPL-3+ License: BSD-3-Clause - 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 University 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 HOLDERS 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. + All rights reserved. +. + 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 copyright holder 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 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. -License: GPL-3.0+ +License: GPL-3+ 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 -- cgit v1.2.3