From 92d48ed0a204099edc70f7377f19e5718f54326e Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 26 Jan 2018 11:49:26 -0800 Subject: [PATCH] lib/ui/web/api: move manuals to extra-source-files in these pkgs too [ci skip] --- hledger-api/hledger-api.cabal | 6 ++---- hledger-api/package.yaml | 4 ++-- hledger-lib/hledger-lib.cabal | 6 ++---- hledger-lib/package.yaml | 4 ++-- hledger-ui/hledger-ui.cabal | 6 ++---- hledger-ui/package.yaml | 4 ++-- hledger-web/hledger-web.cabal | 10 ++++------ hledger-web/package.yaml | 4 ++-- 8 files changed, 18 insertions(+), 26 deletions(-) diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index 1ad95c996..3c3a667e4 100644 --- a/hledger-api/hledger-api.cabal +++ b/hledger-api/hledger-api.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 2ba06bc3009a704bd5e904823472d017379f40db355ae36b066113536467e03c +-- hash: 66e47e69f42abc82efc4dd262f42bffb6292f387520b5b75b6dd71ca0991128a name: hledger-api version: 1.5.99 @@ -32,12 +32,10 @@ extra-source-files: CHANGES examples/01.html examples/02.html - README - -data-files: hledger-api.1 hledger-api.info hledger-api.txt + README source-repository head type: git diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml index 2cc56b39b..47ab5a5b4 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -25,12 +25,12 @@ extra-source-files: - CHANGES - README - examples/*.html - -data-files: - hledger-api.1 - hledger-api.txt - hledger-api.info +#data-files: + dependencies: - hledger-lib >=1.5.99 && <1.6 - hledger >=1.5.99 && <1.6 diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index ed7932744..44bb45878 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 0359b7d353e59a15012d14a39fea7d133562b202c70969984a8fd918f27417e8 +-- hash: e19a6e513d9933c42207c22788118878eede237f4ec6f1fdc70983da44c8291d name: hledger-lib version: 1.5.99 @@ -29,9 +29,6 @@ cabal-version: >= 1.10 extra-source-files: CHANGES - README - -data-files: hledger_csv.5 hledger_csv.info hledger_csv.txt @@ -44,6 +41,7 @@ data-files: hledger_timedot.5 hledger_timedot.info hledger_timedot.txt + README source-repository head type: git diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index 5ee69f34c..9487e42fd 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -23,8 +23,6 @@ tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.1 extra-source-files: - CHANGES - README - -data-files: - hledger_csv.5 - hledger_csv.txt - hledger_csv.info @@ -38,6 +36,8 @@ data-files: - hledger_timeclock.txt - hledger_timeclock.info +#data-files: + dependencies: - base >=4.8 && <5 - base-compat >=0.8.1 diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 77e8f9d2d..89bf32d1f 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: dd0253057446851aae37d74a6f743e6365772780e2070e0e38f31d56a6610fdc +-- hash: f4bc380b9cd5f49af0f1534f8978ef8cd5f209c77fa81ca93444f0f8858ab49b name: hledger-ui version: 1.5.99 @@ -31,12 +31,10 @@ cabal-version: >= 1.10 extra-source-files: CHANGES - README - -data-files: hledger-ui.1 hledger-ui.info hledger-ui.txt + README source-repository head type: git diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index 918b901a7..f8ee4f237 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -25,12 +25,12 @@ tested-with : GHC==7.10.3, GHC==8.0 extra-source-files: - CHANGES - README - -data-files: - hledger-ui.1 - hledger-ui.txt - hledger-ui.info +#data-files: + flags: threaded: description: Build with support for multithreaded execution diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 526b23626..70d6f06ba 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: ab1ce07009282db56c0dd739039af340a8b2f2c8f710157c2c78cdbc1709dfdd +-- hash: 89c298d4ceea0cefabbf5896a13ca5fbc2dcb9602892d510f43c5ca40dd7dddf name: hledger-web version: 1.5.99 @@ -36,6 +36,9 @@ extra-source-files: config/robots.txt config/routes config/settings.yml + hledger-web.1 + hledger-web.info + hledger-web.txt messages/en.msg README static/css/bootstrap-datepicker.standalone.min.css @@ -98,11 +101,6 @@ extra-source-files: templates/default-layout-wrapper.hamlet templates/default-layout.hamlet -data-files: - hledger-web.1 - hledger-web.info - hledger-web.txt - source-repository head type: git location: https://github.com/simonmichael/hledger diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 5f7161b20..5604545a3 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -41,12 +41,12 @@ extra-source-files: - static/hledger.js - static/js/*.js - templates/*.hamlet - -data-files: - hledger-web.1 - hledger-web.txt - hledger-web.info +#data-files: + flags: library-only: description: Build for use with "yesod devel"