diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,30 +1,23 @@ -Copyright Daniel Lovasko (c) 2016 - +Copyright (c) 2016-2017 Daniel Lovasko All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * 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. - - * Neither the name of Daniel Lovasko nor the names of other - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * 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 -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. +THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. diff --git a/src/Text/Tabl.hs b/src/Text/Tabl.hs --- a/src/Text/Tabl.hs +++ b/src/Text/Tabl.hs @@ -1,8 +1,8 @@ {- | Module : Text.Tabl Description : Table layout engine that provides alignment and decoration -Copyright : (c) Daniel Lovasko, 2016 -License : BSD3 +Copyright : (c) 2016-2017 Daniel Lovasko +License : BSD2 Maintainer : Daniel Lovasko Stability : stable diff --git a/src/Text/Tabl/Alignment.hs b/src/Text/Tabl/Alignment.hs --- a/src/Text/Tabl/Alignment.hs +++ b/src/Text/Tabl/Alignment.hs @@ -1,8 +1,8 @@ {- | Module : Text.Tabl.Alignment Description : Column alignments -Copyright : (c) Daniel Lovasko, 2016 -License : BSD3 +Copyright : (c) 2016-2017 Daniel Lovasko +License : BSD2 Maintainer : Daniel Lovasko Stability : stable diff --git a/src/Text/Tabl/Ascii.hs b/src/Text/Tabl/Ascii.hs --- a/src/Text/Tabl/Ascii.hs +++ b/src/Text/Tabl/Ascii.hs @@ -1,8 +1,8 @@ {- | Module : Text.Tabl.Ascii Description : ASCII-art table rendering engine -Copyright : (c) Daniel Lovasko, 2016 -License : BSD3 +Copyright : (c) 2016-2017 Daniel Lovasko +License : BSD2 Maintainer : Daniel Lovasko Stability : stable diff --git a/src/Text/Tabl/Decoration.hs b/src/Text/Tabl/Decoration.hs --- a/src/Text/Tabl/Decoration.hs +++ b/src/Text/Tabl/Decoration.hs @@ -1,8 +1,8 @@ {- | Module : Text.Tabl.Decoration Description : Horizontal and vertical decoration -Copyright : (c) Daniel Lovasko, 2016 -License : BSD3 +Copyright : (c) 2016-2017 Daniel Lovasko +License : BSD2 Maintainer : Daniel Lovasko Stability : stable diff --git a/src/Text/Tabl/Environment.hs b/src/Text/Tabl/Environment.hs --- a/src/Text/Tabl/Environment.hs +++ b/src/Text/Tabl/Environment.hs @@ -1,8 +1,8 @@ {- | Module : Text.Tabl.Environment Description : Table environments -Copyright : (c) Daniel Lovasko, 2016 -License : BSD3 +Copyright : (c) 2016-2017 Daniel Lovasko +License : BSD2 Maintainer : Daniel Lovasko Stability : stable diff --git a/src/Text/Tabl/Latex.hs b/src/Text/Tabl/Latex.hs --- a/src/Text/Tabl/Latex.hs +++ b/src/Text/Tabl/Latex.hs @@ -1,8 +1,8 @@ {- | Module : Text.Tabl.Latex Description : LaTeX table rendering engine -Copyright : (c) Daniel Lovasko, 2016 -License : BSD3 +Copyright : (c) 2016-2017 Daniel Lovasko +License : BSD2 Maintainer : Daniel Lovasko Stability : stable diff --git a/src/Text/Tabl/Util.hs b/src/Text/Tabl/Util.hs --- a/src/Text/Tabl/Util.hs +++ b/src/Text/Tabl/Util.hs @@ -1,8 +1,8 @@ {- | Module : Text.Tabl.Util Description : Various utilities -Copyright : (c) Daniel Lovasko, 2016 -License : BSD3 +Copyright : (c) 2016-2017 Daniel Lovasko +License : BSD2 Maintainer : Daniel Lovasko Stability : stable diff --git a/tabl.cabal b/tabl.cabal --- a/tabl.cabal +++ b/tabl.cabal @@ -1,15 +1,15 @@ name: tabl -version: 1.0.2 +version: 1.0.3 synopsis: Table layout description: Text.Tabl arranges multiple Text instances into a table layout while providing means of alignment visual decoration both horizontally and vertically. homepage: https://github.com/lovasko/tabl -license: BSD3 +license: OtherLicense license-file: LICENSE author: Daniel Lovasko maintainer: Daniel Lovasko -copyright: 2016 Daniel Lovasko +copyright: 2016-2017 Daniel Lovasko category: Text build-type: Simple cabal-version: >=1.10