[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 ffb67452f93419703d1bd91b0b830fe4e40d1097
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Dec 3 10:14:00 2006 +0100

    Renamed MissingH.Quantity to Data.Quantity, refs #1

diff --git a/MissingH.cabal b/MissingH.cabal
index a9ed86c..a0227ed 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -22,7 +22,7 @@ Exposed-Modules: MissingH.Str, System.IO, System.IO.Binary, Data.List.Utils,
   System.Cmd.Utils,
   Data.Progress.Tracker,
   Data.Progress.Meter,
-  MissingH.Quantity,
+  Data.Quantity,
   Data.Map.Utils, System.Path, System.Path.NameManip,
     System.Path.FilePath, System.Path.WildMatch, System.Path.Glob,
   MissingH.Time, MissingH.Time.ParseDate,
diff --git a/src/Data/Progress/Meter.hs b/src/Data/Progress/Meter.hs
index 6790b85..ddd0856 100644
--- a/src/Data/Progress/Meter.hs
+++ b/src/Data/Progress/Meter.hs
@@ -55,7 +55,7 @@ import Control.Concurrent
 import Control.Monad(when)
 import MissingH.Str
 import MissingH.Time
-import MissingH.Quantity
+import Data.Quantity
 import System.IO
 import Control.Monad(filterM)
 
@@ -77,7 +77,7 @@ type ProgressMeter = MVar ProgressMeterR
 
 * Width 80
 
-* MissingH.Quantity.renderNums binaryOpts 1
+* Data.Quantity.renderNums binaryOpts 1
 
 * Unit inticator @"B"@
 
diff --git a/MissingH/Quantity.hs b/src/Data/Quantity.hs
similarity index 90%
rename from MissingH/Quantity.hs
rename to src/Data/Quantity.hs
index cd0ec8e..9685a14 100644
--- a/MissingH/Quantity.hs
+++ b/src/Data/Quantity.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : MissingH.Quantity
+   Module     : Data.Quantity
    Copyright  : Copyright (C) 2006 John Goerzen
    License    : GNU GPL, version 2 or above
 
@@ -29,7 +29,7 @@ Tools for rendering sizes
 
 Written by John Goerzen, jgoerzen\@complete.org -}
 
-module MissingH.Quantity (
+module Data.Quantity (
                           renderNum,
                           renderNums,
                           quantifyNum,
@@ -108,24 +108,24 @@ digits to the right of the decimal point), and you get a string output.
 
 Here are some examples:
 
-> MissingH.Quantity> renderNum binaryOpts 0 1048576
+> Data.Quantity> renderNum binaryOpts 0 1048576
 > "1M"
-> MissingH.Quantity> renderNum binaryOpts 2 10485760
+> Data.Quantity> renderNum binaryOpts 2 10485760
 > "10.00M"
-> MissingH.Quantity> renderNum binaryOpts 3 1048576
+> Data.Quantity> renderNum binaryOpts 3 1048576
 > "1.000M"
-> MissingH.Quantity> renderNum binaryOpts 3 1500000
+> Data.Quantity> renderNum binaryOpts 3 1500000
 > "1.431M"
-> MissingH.Quantity> renderNum binaryOpts 2 (1500 ** 3)
+> Data.Quantity> renderNum binaryOpts 2 (1500 ** 3)
 > "3.14G"
 
-> MissingH.Quantity> renderNum siOpts 2 1024
+> Data.Quantity> renderNum siOpts 2 1024
 > "1.02k"
-> MissingH.Quantity> renderNum siOpts 2 1048576
+> Data.Quantity> renderNum siOpts 2 1048576
 > "1.05M"
-> MissingH.Quantity> renderNum siOpts 2 0.001
+> Data.Quantity> renderNum siOpts 2 0.001
 > "1.00m"
-> MissingH.Quantity> renderNum siOpts 2 0.0001
+> Data.Quantity> renderNum siOpts 2 0.0001
 > "100.00u"
 
 If you want more control over the output, see 'quantifyNum'. -}
@@ -148,9 +148,9 @@ Also, unlike 'renderNum', the %f instead of %g printf format is used so that
 
 Examples:
 
-> *MissingH.Quantity> renderNums binaryOpts 3 [1500000, 10240, 104857600]
+> *Data.Quantity> renderNums binaryOpts 3 [1500000, 10240, 104857600]
 > ["1.431M","0.010M","100.000M"]
-> *MissingH.Quantity> renderNums binaryOpts 3 [1500, 10240, 104857600]
+> *Data.Quantity> renderNums binaryOpts 3 [1500, 10240, 104857600]
 > ["1.465K","10.000K","102400.000K"]
 
 -}

-- 
haskell-testpack