[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36
John Goerzen
jgoerzen at complete.org
Fri Apr 23 14:50:21 UTC 2010
The following commit has been merged in the master branch:
commit 2d95a0a4cc98657018db153d1a0bb18fda5ee441
Author: John Goerzen <jgoerzen at complete.org>
Date: Mon Dec 6 03:59:50 2004 +0100
Added missing ConfigParser.Lexer to Setup.description
Keywords:
(jgoerzen at complete.org--projects/missingh--head--0.7--patch-48)
diff --git a/ChangeLog b/ChangeLog
index 3ae3d20..63602d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,23 @@
# arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
#
+2004-12-05 20:59:50 GMT John Goerzen <jgoerzen at complete.org> patch-48
+
+ Summary:
+ Added missing ConfigParser.Lexer to Setup.description
+ Revision:
+ missingh--head--0.7--patch-48
+
+
+ removed files:
+ debian/libghc6-missingh-dev.postinst.debhelper
+ debian/libghc6-missingh-dev.prerm.debhelper
+
+ modified files:
+ ChangeLog README Setup.description debian/changelog
+ libsrc/MissingH/FileArchive/GZip.hs
+
+
2004-12-04 19:18:00 GMT John Goerzen <jgoerzen at complete.org> patch-47
Summary:
diff --git a/README b/README
index 64b1001..2e62428 100644
--- a/README
+++ b/README
@@ -38,6 +38,8 @@ Major Features
* Printf utilities for formatting strings
+ * GZip decompression
+
* Hundreds of unit tests to verify proper functionality
The following modules are are provided at this time, and more are
@@ -47,12 +49,22 @@ MissingH.Bits * Obtain individual bytes from a bitfield
MissingH.Cmd * Trap errors during calls to external programs
+MissingH.Checksum.* * Utilities for calculating checksums over strings
+
+MissingH.Compression.* * Compression/decompression algorithms
+
+MissingH.Compression. * The Inflate algorithm from unzip and
+ Inflate gunzip
+
MissingH.ConfigParser * Configuration file parser
* Interpolation supported
* Compatible with Python and OCaml ConfigParsers
MissingH.Either * Utilities for the Either type/Error monad
+MisssingH.FileArchive. * Support for analyzing and extracting
+ GZip GZip archives
+
MissingH.FiniteMap * Flip a finite map
MissingH.Hsemail * E-mail parsers
diff --git a/Setup.description b/Setup.description
index 98ec193..44e2802 100644
--- a/Setup.description
+++ b/Setup.description
@@ -24,10 +24,12 @@ Modules: MissingH.IO, MissingH.IO.Binary, MissingH.List,
MissingH.ConfigParser,
MissingH.ConfigParser.Types,
MissingH.ConfigParser.Parser,
+ MissingH.ConfigParser.Lexer,
MissingH.Printf, MissingH.Printf.Types, MissingH.Printf.Printer,
MissingH.Bits,
- MissingH.Checksum.CRC32,
+ MissingH.Checksum.CRC32.Posix, MissingH.Checksum.CRC32.GZip,
MissingH.Compression.Inflate,
+ MissingH.FileArchive.GZip,
MissingH.Wash.Mail.Email,
MissingH.Wash.Mail.EmailConfig,
MissingH.Wash.Mail.HeaderField,
diff --git a/debian/changelog b/debian/changelog
index dd0c632..c27537c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+missingh (0.7.3) unstable; urgency=low
+
+ * Adding missing ConfigParser.Lexer to Setup.Description.
+
+ -- John Goerzen <jgoerzen at complete.org> Sun, 5 Dec 2004 14:59:02 -0600
+
+missingh (0.7.2) unstable; urgency=low
+
+ * New modules: MissingH.FileArchive.GZip, MissingH.Checksum.CRC32.GZip,
+ MissingH.Checksum.CRC32.Posix, MissingH.Compression.Inflate
+
+ -- John Goerzen <jgoerzen at complete.org> Sat, 4 Dec 2004 17:25:25 -0600
+
missingh (0.7.1) unstable; urgency=low
* Applied some helpful patches from Einar Karttunen. The main feature
diff --git a/debian/libghc6-missingh-dev.postinst.debhelper b/debian/libghc6-missingh-dev.postinst.debhelper
deleted file mode 100644
index 6ab4b6a..0000000
--- a/debian/libghc6-missingh-dev.postinst.debhelper
+++ /dev/null
@@ -1,26 +0,0 @@
-# Automatically added by dh_haskell
-GHC=ghc-6.2.2
-CONFIGFILE=/usr/lib/haskell-packages/ghc6/lib/MissingH-0.6.0/installed-pkg-config
-
-
-case "$1" in
- configure)
- /usr/lib/$GHC/bin/ghc-pkg -g --add-package \
- < $CONFIGFILE
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-
-
-# arch-tag: haskell-devscripts generic GHC postinst template
-# End automatically added section
diff --git a/debian/libghc6-missingh-dev.prerm.debhelper b/debian/libghc6-missingh-dev.prerm.debhelper
deleted file mode 100644
index 7e31de7..0000000
--- a/debian/libghc6-missingh-dev.prerm.debhelper
+++ /dev/null
@@ -1,25 +0,0 @@
-# Automatically added by dh_haskell
-
-GHC=ghc-6.2.2
-CONFIGFILE=/usr/lib/haskell-packages/ghc6/lib/MissingH-0.6.0/installed-pkg-config
-CABALNAME=MissingH
-
-
-
-case "$1" in
- remove|upgrade|deconfigure)
- /usr/lib/$GHC/bin/ghc-pkg -r $CABALNAME
- rm -vf /usr/lib/haskell-packages/ghc6/lib/MissingH-0.6.0/HSMissingH-0.6.0.o
-
- ;;
- failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-
-# arch-tag: haskell-devscripts generic GHC prerm template
-# End automatically added section
diff --git a/libsrc/MissingH/FileArchive/GZip.hs b/libsrc/MissingH/FileArchive/GZip.hs
index d48cd44..d4a513b 100644
--- a/libsrc/MissingH/FileArchive/GZip.hs
+++ b/libsrc/MissingH/FileArchive/GZip.hs
@@ -41,6 +41,7 @@ module MissingH.FileArchive.GZip (
Footer(..),
-- * Whole-File Processing
decompress,
+ hDecompress,
read_sections,
-- * Section Processing
read_header,
@@ -56,6 +57,7 @@ import Control.Monad.Error
import Data.Char
import Data.Word
import MissingH.Bits
+import System.IO
data GZipError = CRCError -- ^ CRC-32 check failed
| NotGZIPFile -- ^ Couldn't find a GZip header
@@ -104,6 +106,24 @@ type Section = (Header, String, Footer)
split1 :: String -> (Char, String)
split1 s = (head s, tail s)
+{- | Read a GZip file, decompressing all sections found.
+
+Writes the decompressed data stream to the given output handle.
+
+Returns Nothing if the action was successful, or Just GZipError if there
+was a problem. If there was a problem, the data written to the output
+handle should be discarded.
+-}
+
+hDecompress :: Handle -- ^ Input handle
+ -> Handle -- ^ Output handle
+ -> IO (Maybe GZipError)
+hDecompress infd outfd =
+ do inc <- hGetContents infd
+ let (outstr, err) = decompress inc
+ hPutStr outfd outstr
+ return err
+
{- | Read a GZip file, decompressing all sections that are found.
Returns a decompresed data stream and Nothing, or an unreliable string
--
haskell-testpack
More information about the Pkg-haskell-commits
mailing list