diff --git a/Codec/Compression/BZip.hs b/Codec/Compression/BZip.hs --- a/Codec/Compression/BZip.hs +++ b/Codec/Compression/BZip.hs @@ -83,7 +83,7 @@ -- | Like 'decompress' but with the ability to specify various decompression -- parameters. Typical usage: -- --- > decompressWith defaultCompressParams { ... } +-- > decompressWith defaultDecompressParams { ... } -- decompressWith :: DecompressParams -> ByteString -> ByteString decompressWith = Internal.decompress diff --git a/Codec/Compression/BZip/Internal.hs b/Codec/Compression/BZip/Internal.hs --- a/Codec/Compression/BZip/Internal.hs +++ b/Codec/Compression/BZip/Internal.hs @@ -33,12 +33,8 @@ import Control.Monad (when) import Control.Exception (assert) import qualified Data.ByteString.Lazy as L -#ifdef BYTESTRING_IN_BASE -import qualified Data.ByteString.Base as S -#else import qualified Data.ByteString.Lazy.Internal as L import qualified Data.ByteString.Internal as S -#endif import qualified Codec.Compression.BZip.Stream as Stream import Codec.Compression.BZip.Stream (Stream) @@ -106,13 +102,8 @@ -- are 16k and 32k respectively (less a small accounting overhead). -- defaultCompressBufferSize, defaultDecompressBufferSize :: Int -#ifdef BYTESTRING_IN_BASE -defaultCompressBufferSize = 16 * 1024 - 16 -defaultDecompressBufferSize = 32 * 1024 - 16 -#else defaultCompressBufferSize = 16 * 1024 - L.chunkOverhead defaultDecompressBufferSize = 32 * 1024 - L.chunkOverhead -#endif {-# NOINLINE compress #-} compress diff --git a/Codec/Compression/BZip/Stream.hsc b/Codec/Compression/BZip/Stream.hsc --- a/Codec/Compression/BZip/Stream.hsc +++ b/Codec/Compression/BZip/Stream.hsc @@ -62,11 +62,7 @@ , unsafeForeignPtrToPtr, unsafePerformIO ) import Foreign.C ( CInt, CUInt ) -#ifdef BYTESTRING_IN_BASE -import Data.ByteString.Base (nullForeignPtr) -#else import Data.ByteString.Internal (nullForeignPtr) -#endif import System.IO.Unsafe (unsafeInterleaveIO) import System.IO (hPutStrLn, stderr) import Control.Monad (liftM) diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -9,6 +9,7 @@ 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. This clause is intentionally left blank. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/bzlib.cabal b/bzlib.cabal --- a/bzlib.cabal +++ b/bzlib.cabal @@ -1,10 +1,10 @@ name: bzlib -version: 0.5.0.0 +version: 0.5.0.1 copyright: (c) 2006-2008 Duncan Coutts license: BSD3 license-file: LICENSE -author: Duncan Coutts -maintainer: Duncan Coutts +author: Duncan Coutts +maintainer: Duncan Coutts category: Codec synopsis: Compression and decompression in the bzip2 format description: This package provides a pure interface for compressing and @@ -12,31 +12,26 @@ 'ByteString's. It uses the bz2 C library so it has high performance. . - It provides a convenient high level api suitable for most + It provides a convenient high level API suitable for most tasks and for the few cases where more control is needed it provides access to the full bzip2 feature set. -stability: provisional build-type: Simple -cabal-version: >= 1.2.1 -extra-source-files: cbits/bzlib_private.h +cabal-version: >= 1.6 +extra-source-files: cbits/bzlib_private.h cbits/LICENSE -- demo programs: bzip2.hs bunzip2.hs -flag bytestring-in-base - description: In the ghc-6.6 era the bytestring modules were - included in the base package. +source-repository head + type: darcs + location: http://code.haskell.org/bzlib/ library exposed-modules: Codec.Compression.BZip, Codec.Compression.BZip.Internal other-modules: Codec.Compression.BZip.Stream extensions: CPP, ForeignFunctionInterface - if flag(bytestring-in-base) - -- bytestring was in base-2.0 and 2.1.1 - build-depends: base >= 2.0 && < 2.2 - cpp-options: -DBYTESTRING_IN_BASE - else - build-depends: base < 2.0 || >= 2.2, bytestring >= 0.9 + build-depends: base >= 3 && < 5, + bytestring == 0.9.* includes: bzlib.h ghc-options: -Wall if !os(windows) diff --git a/cbits/LICENSE b/cbits/LICENSE new file mode 100644 --- /dev/null +++ b/cbits/LICENSE @@ -0,0 +1,42 @@ + +-------------------------------------------------------------------------- + +This program, "bzip2", the associated library "libbzip2", and all +documentation, are copyright (C) 1996-2007 Julian R Seward. 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. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + +3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + +4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + +Julian Seward, jseward@bzip.org +bzip2/libbzip2 version 1.0.5 of 10 December 2007 + +--------------------------------------------------------------------------