diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | src/Main.hs | 5 | ||||
| -rw-r--r-- | src/Text/Pandoc.hs | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 2ce7e58d7..dee489f59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -101,6 +101,9 @@ pandoc (0.45) unstable; urgency=low that a temp file is now always used, even when input comes from a local file or standard input. + * Removed 'version' constant from Main.hs; added 'pandocVersion' to + Text.Pandoc library. + * Fixed MacPorts Portfile: + Modified to install the pandoc library in addition to programs. diff --git a/src/Main.hs b/src/Main.hs index b3171c2b4..ae9f61f7f 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -42,9 +42,6 @@ import Data.List ( isPrefixOf ) import Data.Char ( toLower ) import Control.Monad ( (>>=) ) -version :: String -version = "0.45" - copyrightMessage :: String copyrightMessage = "\nCopyright (C) 2006-7 John MacFarlane\n\ \Web: http://johnmacfarlane.net/pandoc\n\ @@ -298,7 +295,7 @@ options = (NoArg (\_ -> do prg <- getProgName - hPutStrLn stderr (prg ++ " " ++ version ++ + hPutStrLn stderr (prg ++ " " ++ pandocVersion ++ copyrightMessage) exitWith $ ExitFailure 4)) "" -- "Print version" diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs index df73ed325..7633bf7ef 100644 --- a/src/Text/Pandoc.hs +++ b/src/Text/Pandoc.hs @@ -83,6 +83,8 @@ module Text.Pandoc , module Text.Pandoc.Writers.DefaultHeaders -- * Functions for converting to and from UTF-8 , module Text.Pandoc.UTF8 + -- * Version + , pandocVersion ) where import Text.Pandoc.Definition @@ -103,3 +105,6 @@ import Text.Pandoc.Writers.DefaultHeaders import Text.Pandoc.UTF8 import Text.Pandoc.Shared +-- | Version number of pandoc library. +pandocVersion :: String +pandocVersion = "0.45" |