fishfood 0.0.1.6 → 0.0.1.7
raw patch · 5 files changed
+21/−17 lines, 5 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- changelog.markdown +2/−0
- debian/DEBIAN/control +1/−1
- fishfood.cabal +12/−3
- fishfood.spec +1/−1
- src-exe/Main.hs +5/−12
changelog.markdown view
@@ -49,3 +49,5 @@ * Added file **.ghci**. * Replaced use of module **ToolShed.Defaultable** with **Data.Default**. * Tested with **ghc-8.0.1**.+## 0.0.1.7+* Removed dependency on **Distribution.Package.PackageName**
debian/DEBIAN/control view
@@ -1,5 +1,5 @@ Package: fishfood-Version: 0.0.1.6-1+Version: 0.0.1.7-1 Section: utils Priority: optional Architecture: amd64
fishfood.cabal view
@@ -14,7 +14,7 @@ -- along with FishFood. If not, see <http://www.gnu.org/licenses/>. Name: fishfood-Version: 0.0.1.6+Version: 0.0.1.7 Cabal-version: >= 1.10 Copyright: (C) 2013-2015 Dr. Alistair Ward License: GPL@@ -77,9 +77,13 @@ else GHC-prof-options: -auto-all -caf-all - if impl(ghc >= 7.0) && flag(llvm)- GHC-options: -fllvm+ if impl(ghc >= 7.0)+ if flag(llvm)+ GHC-options: -fllvm + if impl(ghc >= 8.0)+ GHC-options: -Wredundant-constraints+ Executable fishfood Default-language: Haskell2010 GHC-options: -Wall -fno-warn-tabs@@ -105,6 +109,9 @@ if flag(llvm) GHC-options: -fllvm + if impl(ghc >= 8.0)+ GHC-options: -Wredundant-constraints+ Test-Suite test Default-language: Haskell2010 GHC-options: -Wall -fno-warn-tabs@@ -127,3 +134,5 @@ QuickCheck, toolshed >= 0.17 + if impl(ghc >= 8.0)+ GHC-options: -Wredundant-constraints
fishfood.spec view
@@ -21,7 +21,7 @@ Summary: Calculates file-size frequency-distribution. Name: fishfood-Version: 0.0.1.6+Version: 0.0.1.7 Release: 1 License: GPLv3 # From '/usr/share/doc/packages/rpm/GROUPS'.
src-exe/Main.hs view
@@ -35,9 +35,6 @@ import qualified Data.List import qualified Data.Maybe import qualified Data.Version-import qualified Distribution.Package-import qualified Distribution.Text-import qualified Distribution.Version import qualified FishFood.Data.CommandOptions as Data.CommandOptions import qualified FishFood.Data.File as Data.File import qualified FishFood.Data.Verbosity as Data.Verbosity@@ -124,17 +121,13 @@ printVersion, printUsage :: IO CommandOptions printVersion = System.IO.hPutStrLn System.IO.stderr (- showString (Distribution.Text.display packageIdentifier) . showString "\nCompiled by " . shows compiler . showString ".\nWritten by " . shows author . showString ".\nCopyright (C) 2013-2015 " $ showString author ".\nThis program comes with ABSOLUTELY NO WARRANTY.\nThis is free software, and you are welcome to redistribute it under certain conditions."+ showString progName . showChar '-' . showsVersion Paths.version . showString "\n\nCompiled by " . showString System.Info.compilerName . showChar '-' . showsVersion System.Info.compilerVersion . showString ".\n\nCopyright (C) 2013-2017 " . showString author . showString ".\nThis program comes with ABSOLUTELY NO WARRANTY.\nThis is free software, and you are welcome to redistribute it under certain conditions.\n\nWritten by " $ showString author "." ) >> System.Exit.exitSuccess where- packageIdentifier :: Distribution.Package.PackageIdentifier- packageIdentifier = Distribution.Package.PackageIdentifier {- Distribution.Package.pkgName = Distribution.Package.PackageName progName, -- CAVEAT: coincidentally.- Distribution.Package.pkgVersion = Distribution.Version.Version (Data.Version.versionBranch Paths.version) []- }+ author :: String+ author = "Dr. Alistair Ward" - author, compiler :: String- author = "Dr. Alistair Ward"- compiler = System.Info.compilerName ++ "-" ++ Data.List.intercalate "." (map show $ Data.Version.versionBranch System.Info.compilerVersion)+ showsVersion :: Data.Version.Version -> ShowS+ showsVersion = foldr (.) id . Data.List.intersperse (showChar '.') . map shows . Data.Version.versionBranch printUsage = System.IO.hPutStrLn System.IO.stderr ("Usage:\t" ++ G.usageInfo progName optDescrList ++ " [<File-path> ...]") >> System.Exit.exitSuccess