Merge branch 'master' of github.com:hdbc/convertible

hdbc · Oct 26, 2011 · 63c6820 · 63c6820
2 parents 744d92d + d0b89d2
commit 63c6820
Show file tree

Hide file tree

Showing 17 changed files with 95 additions and 587 deletions.
diff --git a/COPYING b/COPYING
diff --git a/COPYRIGHT b/COPYRIGHT
diff --git a/Data/Convertible.hs b/Data/Convertible.hs
@@ -1,16 +1,16 @@
 {-
-Copyright (C) 2009 John Goerzen <jgoerzen@complete.org>
+Copyright (C) 2009-2011 John Goerzen <jgoerzen@complete.org>
 
 All rights reserved.
 
-For license and copyright information, see the file COPYRIGHT
+For license and copyright information, see the file LICENSE
 
 -}
 
 {- |
    Module     : Data.Convertible.Base
-   Copyright  : Copyright (C) 2009 John Goerzen
-   License    : LGPL
+   Copyright  : Copyright (C) 2009-2011 John Goerzen
+   License    : BSD3
 
    Maintainer : John Goerzen <jgoerzen@complete.org>
    Stability  : provisional

diff --git a/Data/Convertible/Base.hs b/Data/Convertible/Base.hs
@@ -1,16 +1,16 @@
 {-
-Copyright (C) 2009 John Goerzen <jgoerzen@complete.org>
+Copyright (C) 2009-2011 John Goerzen <jgoerzen@complete.org>
 
 All rights reserved.
 
-For license and copyright information, see the file COPYRIGHT
+For license and copyright information, see the file LICENSE
 
 -}
 
 {- |
    Module     : Data.Convertible.Base
-   Copyright  : Copyright (C) 2009 John Goerzen
-   License    : LGPL
+   Copyright  : Copyright (C) 2009-2011 John Goerzen
+   License    : BSD3
 
    Maintainer : John Goerzen <jgoerzen@complete.org>
    Stability  : provisional

diff --git a/Data/Convertible/Instances.hs b/Data/Convertible/Instances.hs
@@ -1,16 +1,16 @@
 {-
-Copyright (C) 2009 John Goerzen <jgoerzen@complete.org>
+Copyright (C) 2009-2011 John Goerzen <jgoerzen@complete.org>
 
 All rights reserved.
 
-For license and copyright information, see the file COPYRIGHT
+For license and copyright information, see the file LICENSE
 
 -}
 
 {- |
    Module     : Data.Convertible.Instances
-   Copyright  : Copyright (C) 2009 John Goerzen
-   License    : LGPL
+   Copyright  : Copyright (C) 2009-2011 John Goerzen
+   License    : BSD3
 
    Maintainer : John Goerzen <jgoerzen@complete.org>
    Stability  : provisional

diff --git a/Data/Convertible/Instances/C.hs b/Data/Convertible/Instances/C.hs
@@ -1,7 +1,7 @@
 {- |
    Module     : Data.Convertible.Instances.C
-   Copyright  : Copyright (C) 2009 John Goerzen
-   License    : LGPL
+   Copyright  : Copyright (C) 2009-2011 John Goerzen
+   License    : BSD3
 
    Maintainer : John Goerzen <jgoerzen@complete.org>
    Stability  : provisional
@@ -10,11 +10,11 @@
 Numeric instances for Convertible for C types.  See comments in
 "Data.Convertible.Instances.Num".
 
-Copyright (C) 2009 John Goerzen <jgoerzen@complete.org>
+Copyright (C) 2009-2011 John Goerzen <jgoerzen@complete.org>
 
 All rights reserved.
 
-For license and copyright information, see the file COPYRIGHT
+For license and copyright information, see the file LICENSE
 -}
 module Data.Convertible.Instances.C()
 where

diff --git a/Data/Convertible/Instances/Map.hs b/Data/Convertible/Instances/Map.hs
@@ -1,19 +1,19 @@
 {- |
    Module     : Data.Convertible.Instances.Map
-   Copyright  : Copyright (C) 2009 John Goerzen
-   License    : LGPL
+   Copyright  : Copyright (C) 2009-2011 John Goerzen
+   License    : BSD3
 
    Maintainer : John Goerzen <jgoerzen@complete.org>
    Stability  : provisional
    Portability: portable
 
 Instances to convert between Map and association list.
 
-Copyright (C) 2009 John Goerzen <jgoerzen@complete.org>
+Copyright (C) 2009-2011 John Goerzen <jgoerzen@complete.org>
 
 All rights reserved.
 
-For license and copyright information, see the file COPYRIGHT
+For license and copyright information, see the file LICENSE
 
 -}
 

diff --git a/Data/Convertible/Instances/Num.hs b/Data/Convertible/Instances/Num.hs
@@ -1,19 +1,19 @@
 {- |
    Module     : Data.Convertible.Instances.Num
-   Copyright  : Copyright (C) 2009 John Goerzen
-   License    : LGPL
+   Copyright  : Copyright (C) 2009-2011 John Goerzen
+   License    : BSD3
 
    Maintainer : John Goerzen <jgoerzen@complete.org>
    Stability  : provisional
    Portability: portable
 
 Numeric instances for Convertible.
 
-Copyright (C) 2009 John Goerzen <jgoerzen@complete.org>
+Copyright (C) 2009-2011 John Goerzen <jgoerzen@complete.org>
 
 All rights reserved.
 
-For license and copyright information, see the file COPYRIGHT
+For license and copyright information, see the file LICENSE
 
 These instances perform conversion between numeric types such as Double, Int, Integer,
 Rational, and the like.  Here are some notes about the conversion process:

diff --git a/Data/Convertible/Instances/Time.hs b/Data/Convertible/Instances/Time.hs
@@ -1,7 +1,7 @@
 {- |
    Module     : Data.Convertible.Instances.Time
-   Copyright  : Copyright (C) 2009 John Goerzen
-   License    : LGPL
+   Copyright  : Copyright (C) 2009-2011 John Goerzen
+   License    : BSD3
 
    Maintainer : John Goerzen <jgoerzen@complete.org>
    Stability  : provisional
@@ -13,11 +13,11 @@ At present, this module does not do full input validation.  That is, it is possi
 to get an exception rather than a Left result from these functions if your input is
 invalid, particularly when converting from the old-style System.Time structures.
 
-Copyright (C) 2009 John Goerzen <jgoerzen@complete.org>
+Copyright (C) 2009-2011 John Goerzen <jgoerzen@complete.org>
 
 All rights reserved.
 
-For license and copyright information, see the file COPYRIGHT
+For license and copyright information, see the file LICENSE
 
 -}
 

diff --git a/Data/Convertible/Utils.hs b/Data/Convertible/Utils.hs
@@ -1,16 +1,16 @@
 {-
-Copyright (C) 2009 John Goerzen <jgoerzen@complete.org>
+Copyright (C) 2009-2011 John Goerzen <jgoerzen@complete.org>
 
 All rights reserved.
 
-For license and copyright information, see the file COPYRIGHT
+For license and copyright information, see the file LICENSE
 
 -}
 
 {- |
    Module     : Data.Convertible.Utils
-   Copyright  : Copyright (C) 2009 John Goerzen
-   License    : LGPL
+   Copyright  : Copyright (C) 2009-2011 John Goerzen
+   License    : BSD3
 
    Maintainer : John Goerzen <jgoerzen@complete.org>
    Stability  : provisional

diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 - 2011 John Goerzen
+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 John Goerzen nor the names of the
+  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.
diff --git a/convertible.cabal b/convertible.cabal
@@ -1,11 +1,11 @@
 Name: convertible
-Version: 1.0.10.0
-License: LGPL
+Version: 1.0.11.0
+License: BSD3
 Maintainer: John Goerzen <jgoerzen@complete.org>
 Author: John Goerzen
-Copyright: Copyright (c) 2009-2010 John Goerzen
-license-file: COPYRIGHT
-extra-source-files: COPYING, utils/genCinstances.hs,
+Copyright: Copyright (c) 2009-2011 John Goerzen
+license-file: LICENSE
+extra-source-files: LICENSE, utils/genCinstances.hs,
                     Makefile,
                     testsrc/TestInfrastructure.hs,
                     testsrc/TestMap.hs,
@@ -50,7 +50,7 @@ flag time_gte_113
 
 library
   if flag(splitBase)
-    Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4 && <=1.2.0.3,
+    Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4 && <=1.2.0.5,
      bytestring, containers, old-locale
     if flag(time_gte_113)
       Build-Depends: time>=1.1.3

diff --git a/debian/copyright b/debian/copyright
@@ -6,21 +6,30 @@ The original source can always be found at:
 The Darcs repository for this program can be accessed with:
    git clone git://git.complete.org/convertible
 
-Copyright (C) 2005-2010 John Goerzen <jgoerzen@complete.org>
+Copyright (c) 2009 - 2011 John Goerzen
+All rights reserved.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+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
-    Lesser General Public License for more details.
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+* 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.
 
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+* Neither the name of John Goerzen nor the names of the
+  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.
diff --git a/testsrc/TestInfrastructure.hs b/testsrc/TestInfrastructure.hs
@@ -3,7 +3,7 @@ Copyright (C) 2009 John Goerzen <jgoerzen@complete.org>
 
 All rights reserved.
 
-For license and copyright information, see the file COPYRIGHT
+For license and copyright information, see the file LICENSE
 -}
 module TestInfrastructure where
 import qualified Test.QuickCheck as QC

diff --git a/testsrc/TestMap.hs b/testsrc/TestMap.hs
@@ -1,9 +1,9 @@
 {-
-Copyright (C) 2009 John Goerzen <jgoerzen@complete.org>
+Copyright (C) 2009-2011 John Goerzen <jgoerzen@complete.org>
 
 All rights reserved.
 
-For license and copyright information, see the file COPYRIGHT
+For license and copyright information, see the file LICENSE
 -}
 
 module TestMap where

diff --git a/testsrc/TestNum.hs b/testsrc/TestNum.hs
@@ -1,9 +1,9 @@
 {-
-Copyright (C) 2009 John Goerzen <jgoerzen@complete.org>
+Copyright (C) 2009-2011 John Goerzen <jgoerzen@complete.org>
 
 All rights reserved.
 
-For license and copyright information, see the file COPYRIGHT
+For license and copyright information, see the file LICENSE
 -}
 
 module TestNum where

diff --git a/testsrc/TestTime.hs b/testsrc/TestTime.hs
@@ -1,9 +1,9 @@
 {-
-Copyright (C) 2009 John Goerzen <jgoerzen@complete.org>
+Copyright (C) 2009-2011 John Goerzen <jgoerzen@complete.org>
 
 All rights reserved.
 
-For license and copyright information, see the file COPYRIGHT
+For license and copyright information, see the file LICENSE
 -}
 
 module TestTime where