summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Truzjan <pxqr.sta@gmail.com>2013-09-27 23:45:56 +0400
committerSam Truzjan <pxqr.sta@gmail.com>2013-09-27 23:45:56 +0400
commit655ae695939e46d60eac9f898fade899cf20697f (patch)
treee095540f2e7a94dc24ebf04e2ffc1e3a4003dbf9
parent35913c887d8ef8f4e42398755bafb1439cd7c1aa (diff)
Change license to BSD3
-rw-r--r--LICENSE43
-rw-r--r--bencoding.cabal11
-rw-r--r--src/Data/BEncode.hs4
3 files changed, 35 insertions, 23 deletions
diff --git a/LICENSE b/LICENSE
index 777f89d..4c30139 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,19 +1,30 @@
1Copyright (c) 2012 Sam T. 1Copyright (c) 2013, Sam Truzjan
2 2
3Permission is hereby granted, free of charge, to any person obtaining a copy of 3All rights reserved.
4this software and associated documentation files (the "Software"), to deal in
5the Software without restriction, including without limitation the rights to
6use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
7of the Software, and to permit persons to whom the Software is furnished to do
8so, subject to the following conditions:
9 4
10The above copyright notice and this permission notice shall be included in all 5Redistribution and use in source and binary forms, with or without
11copies or substantial portions of the Software. 6modification, are permitted provided that the following conditions are met:
12 7
13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 8 * Redistributions of source code must retain the above copyright
14IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 9 notice, this list of conditions and the following disclaimer.
15FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 10
16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 11 * Redistributions in binary form must reproduce the above
17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 12 copyright notice, this list of conditions and the following
18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 13 disclaimer in the documentation and/or other materials provided
19SOFTWARE. \ No newline at end of file 14 with the distribution.
15
16 * Neither the name of Sam Truzjan nor the names of other
17 contributors may be used to endorse or promote products derived
18 from this software without specific prior written permission.
19
20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/bencoding.cabal b/bencoding.cabal
index 4775ff4..70659f5 100644
--- a/bencoding.cabal
+++ b/bencoding.cabal
@@ -3,15 +3,16 @@ version: 0.2.0.0
3synopsis: A library for encoding and decoding of BEncode data. 3synopsis: A library for encoding and decoding of BEncode data.
4homepage: https://github.com/cobit/bencoding 4homepage: https://github.com/cobit/bencoding
5bug-reports: https://github.com/cobit/bencoding/issues 5bug-reports: https://github.com/cobit/bencoding/issues
6license: MIT 6license: BSD3
7license-file: LICENSE 7license-file: LICENSE
8author: Sam T. 8author: Sam Truzjan
9maintainer: Sam T. <pxqr.sta@gmail.com> 9maintainer: Sam Truzjan <pxqr.sta@gmail.com>
10copyright: (c) 2013, Sam T. 10copyright: (c) 2013, Sam Truzjan
11category: Data 11category: Data
12build-type: Simple 12build-type: Simple
13cabal-version: >= 1.10 13cabal-version: >= 1.10
14tested-with: GHC==7.4.1, GHC==7.6.3 14tested-with: GHC==7.4.1
15 , GHC==7.6.3
15description: 16description:
16 17
17 A library for encoding and decoding of BEncode data. 18 A library for encoding and decoding of BEncode data.
diff --git a/src/Data/BEncode.hs b/src/Data/BEncode.hs
index 0866f49..5fb7e1e 100644
--- a/src/Data/BEncode.hs
+++ b/src/Data/BEncode.hs
@@ -2,8 +2,8 @@
2-- library portable. 2-- library portable.
3 3
4-- | 4-- |
5-- Copyright : (c) Sam T. 2013 5-- Copyright : (c) Sam Truzjan 2013
6-- License : MIT 6-- License : BSD3
7-- Maintainer : pxqr.sta@gmail.com 7-- Maintainer : pxqr.sta@gmail.com
8-- Stability : stable 8-- Stability : stable
9-- Portability : non-portable 9-- Portability : non-portable