diff --git a/.version b/.version index c068b2447..a423214c7 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.4 +1.4.99 diff --git a/doc/lib.m4 b/doc/lib.m4 index 1c9e60372..6f8251d92 100644 --- a/doc/lib.m4 +++ b/doc/lib.m4 @@ -7,8 +7,8 @@ m4_define({{_webseparate_}}, m4_ifdef({{WEB && SEPARATE}},{{$1}}) )m4_dnl m4_define({{_webcombined_}}, m4_ifdef({{WEB && COMBINED}},{{$1}}) )m4_dnl m4_dnl m4_define({{_author_}}, {{}})m4_dnl -m4_define({{_monthyear_}}, {{September 2017}})m4_dnl -m4_define({{_version_}}, {{1.4}})m4_dnl +m4_define({{_monthyear_}}, {{December 2017}})m4_dnl +m4_define({{_version_}}, {{1.4.99}})m4_dnl m4_dnl m4_dnl Links to dev and recent release versions of a manual. m4_dnl $1 is the manual's web slug: hledger, hledger-ui, journal, csv etc. diff --git a/hledger-api/hledger-api.hs b/hledger-api/hledger-api.hs index c5cdd8ab7..2debff8c2 100644 --- a/hledger-api/hledger-api.hs +++ b/hledger-api/hledger-api.hs @@ -36,12 +36,12 @@ import Text.Printf import Hledger.Query import Hledger.Cli hiding (Reader, version) -hledgerApiVersion="1.4" +hledgerApiVersion="1.4.99" -- https://github.com/docopt/docopt.hs#readme doc :: Docopt doc = [docopt| -hledger-api 1.4 +hledger-api 1.4.99 Serves hledger data and reports as a JSON web API. diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml index 2ed1fc0d1..13e720c1e 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -1,5 +1,5 @@ name: hledger-api -version: '1.4' +version: '1.4.99' synopsis: Web API server for the hledger accounting tool description: | This is a simple web API server for hledger data. @@ -32,8 +32,8 @@ data-files: - hledger-api.info dependencies: -- hledger-lib >= 1.4 && < 1.5 -- hledger >= 1.4 && < 1.5 +- hledger-lib >= 1.4.99 && < 1.5 +- hledger >= 1.4.99 && < 1.5 - base >=4.8 && <5 - aeson - bytestring @@ -57,4 +57,4 @@ executables: hledger-api: main: hledger-api.hs ghc-options: -threaded - cpp-options: -DVERSION="1.4" + cpp-options: -DVERSION="1.4.99" diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index bbd7e0fc4..31760a780 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -1,5 +1,5 @@ name: hledger-lib -version: '1.4' +version: '1.4.99' synopsis: Core data types, parsers and functionality for the hledger accounting tools description: | This is a reusable library containing hledger's core functionality. diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index 6e78dbfb9..e23406591 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -1,5 +1,5 @@ name : hledger-ui -version : '1.4' +version : '1.4.99' synopsis : Curses-style user interface for the hledger accounting tool description : | This is hledger's curses-style interface. @@ -37,11 +37,11 @@ flags: manual: false default: true -cpp-options: -DVERSION="1.4" +cpp-options: -DVERSION="1.4.99" dependencies: - - hledger >= 1.4 && < 1.5 - - hledger-lib >= 1.4 && < 1.5 + - hledger >= 1.4.99 && < 1.5 + - hledger-lib >= 1.4.99 && < 1.5 - ansi-terminal >= 0.6.2.3 && < 0.8 - async - base >= 4.8 && < 5 diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index a6b73fadf..8cc350864 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -1,5 +1,5 @@ name: hledger-web -version: '1.4' +version: '1.4.99' synopsis: Web interface for the hledger accounting tool description: | This is hledger's web interface. @@ -62,8 +62,8 @@ flags: default: true dependencies: -- hledger-lib >= 1.4 && < 1.5 -- hledger >= 1.4 && < 1.5 +- hledger-lib >= 1.4.99 && < 1.5 +- hledger >= 1.4.99 && < 1.5 - base >=4.8 && <5 - base-compat >=0.8.1 - blaze-html @@ -114,7 +114,7 @@ ghc-options: - -fno-warn-orphans library: - cpp-options: -DVERSION="1.4" + cpp-options: -DVERSION="1.4.99" exposed-modules: - Application - Foundation @@ -137,7 +137,7 @@ executables: hledger-web: source-dirs: app main: main.hs - cpp-options: -DVERSION="1.4" + cpp-options: -DVERSION="1.4.99" dependencies: - hledger-web when: @@ -150,7 +150,7 @@ tests: test: source-dirs: tests main: main.hs - cpp-options: -DVERSION="1.4" + cpp-options: -DVERSION="1.4.99" dependencies: - hledger-web - hspec diff --git a/hledger/package.yaml b/hledger/package.yaml index d76457b56..e7139cd1a 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -1,5 +1,5 @@ name: hledger -version: '1.4' +version: '1.4.99' synopsis: Command-line interface for the hledger accounting tool description: | This is hledger's command-line interface. @@ -87,7 +87,7 @@ dependencies: - tabular >=0.2 && <0.3 - time >=1.5 - utility-ht >= 0.0.13 -- hledger-lib >= 1.4 && < 1.5 +- hledger-lib >= 1.4.99 && < 1.5 when: - condition: (!(os(windows))) && (flag(terminfo)) @@ -95,7 +95,7 @@ when: - terminfo library: - cpp-options: -DVERSION="1.4" + cpp-options: -DVERSION="1.4.99" exposed-modules: - Hledger.Cli - Hledger.Cli.Main @@ -155,7 +155,7 @@ executables: hledger: source-dirs: app main: hledger-cli.hs - cpp-options: -DVERSION="1.4" + cpp-options: -DVERSION="1.4.99" when: - condition: flag(threaded) ghc-options: -threaded @@ -185,7 +185,7 @@ tests: test: source-dirs: test main: test.hs - cpp-options: -DVERSION="1.4" + cpp-options: -DVERSION="1.4.99" dependencies: - hledger - bytestring