[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit c9651c65dfb430a0bda5c82f1fc0af795b666b63
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Jan 8 02:33:14 2008 +0100

    Make the former Data.String to Data.String.Utils
    
    
    Changed from the partial rename to Data.MissingHStr

diff --git a/MissingH.cabal b/MissingH.cabal
index b164955..85bcc84 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -23,7 +23,7 @@ Flag splitBase
 Library
  Hs-Source-Dirs: src
  Exposed-Modules:
-  Data.String, System.IO.Utils, System.IO.Binary, Data.List.Utils,
+  Data.String.Utils, System.IO.Utils, System.IO.Binary, Data.List.Utils,
   System.Daemon,
   Text.ParserCombinators.Parsec.Utils,
   Test.HUnit.Utils,
diff --git a/src/Data/Progress/Meter.hs b/src/Data/Progress/Meter.hs
index fd52aaf..a2d828b 100644
--- a/src/Data/Progress/Meter.hs
+++ b/src/Data/Progress/Meter.hs
@@ -52,7 +52,7 @@ module Data.Progress.Meter (-- * Types
 import Data.Progress.Tracker
 import Control.Concurrent
 import Control.Monad (when)
-import Data.MissingHString (join)
+import Data.String.Utils (join)
 import System.Time.Utils (renderSecs)
 import Data.Quantity (renderNums, binaryOpts)
 import System.IO
diff --git a/src/Data/MissingHString.hs b/src/Data/String/Utils.hs
similarity index 96%
rename from src/Data/MissingHString.hs
rename to src/Data/String/Utils.hs
index 39b5ca4..b709f87 100644
--- a/src/Data/MissingHString.hs
+++ b/src/Data/String/Utils.hs
@@ -17,8 +17,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : Data.String
-   Copyright  : Copyright (C) 2004-2006 John Goerzen
+   Module     : Data.String.Utils
+   Copyright  : Copyright (C) 2004-2008 John Goerzen
    License    : GNU GPL, version 2 or above
 
    Maintainer : John Goerzen <jgoerzen at complete.org>
@@ -30,7 +30,7 @@ This module provides various helpful utilities for dealing with strings.
 Written by John Goerzen, jgoerzen\@complete.org
 -}
 
-module Data.MissingHString
+module Data.String.Utils
                        (-- * Whitespace Removal
                         strip, lstrip, rstrip,
                         -- * Tests
diff --git a/src/System/Debian/ControlParser.hs b/src/System/Debian/ControlParser.hs
index 371fee4..596f4e9 100644
--- a/src/System/Debian/ControlParser.hs
+++ b/src/System/Debian/ControlParser.hs
@@ -35,7 +35,7 @@ module System.Debian.ControlParser(control, depPart)
     where
 
 import Text.ParserCombinators.Parsec
-import Data.MissingHString (split)
+import Data.String.Utils (split)
 
 eol, extline :: GenParser Char st String
 eol = (try (string "\r\n"))
diff --git a/src/System/Path/WildMatch.hs b/src/System/Path/WildMatch.hs
index b29d7df..cdb15de 100644
--- a/src/System/Path/WildMatch.hs
+++ b/src/System/Path/WildMatch.hs
@@ -65,7 +65,7 @@ module System.Path.WildMatch (-- * Wildcard matching
     where
 
 import Text.Regex
-import Data.MissingHString
+import Data.String.Utils
 
 {- | Convert a wildcard to an (uncompiled) regular expression.
 
diff --git a/testsrc/Strtest.hs b/testsrc/Strtest.hs
index e4cd8f6..33f64fe 100644
--- a/testsrc/Strtest.hs
+++ b/testsrc/Strtest.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 module Strtest(tests) where
 import Test.HUnit
-import Data.String
+import Data.String.Utils
 import Test.HUnit.Utils
 import Text.Regex
 import Data.Char

-- 
haskell-testpack