From 33b5c5dc9452d616b507e729b31c93d2e8703a18 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 20 Apr 2016 12:44:47 -0700 Subject: [PATCH] declare generated docs as data-files, sync hpack yamls --- hledger-api/future-package.yaml | 6 +++ hledger-api/hledger-api.cabal | 10 +++-- hledger-lib/future-package.yaml | 6 +++ hledger-lib/hledger-lib.cabal | 13 +++--- hledger-ui/future-package.yaml | 5 +++ hledger-ui/hledger-ui.cabal | 7 +++- hledger-web/future-package.yaml | 71 +++++++------------------------- hledger-web/hledger-web.cabal | 72 +++++++-------------------------- hledger/future-package.yaml | 5 +++ hledger/hledger.cabal | 7 +++- 10 files changed, 72 insertions(+), 130 deletions(-) diff --git a/hledger-api/future-package.yaml b/hledger-api/future-package.yaml index 26cb531d2..1560974cf 100644 --- a/hledger-api/future-package.yaml +++ b/hledger-api/future-package.yaml @@ -34,8 +34,14 @@ bug-reports : http://bugs.hledger.org extra-source-files: - CHANGES + - README - examples/*.html +data-files: + - doc/*.1 + - doc/*.txt + - doc/*.info + # XXX not supported # flag threaded # Description: Build with support for multithreaded execution diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index c28cf8911..6afe22f79 100644 --- a/hledger-api/hledger-api.cabal +++ b/hledger-api/hledger-api.cabal @@ -28,10 +28,12 @@ cabal-version: >= 1.10 extra-source-files: CHANGES README - doc/hledger-api.1 - doc/hledger-api.1.txt - examples/01.html - examples/02.html + examples/*.html + +data-files: + doc/*.1 + doc/*.txt + doc/*.info source-repository head type: git diff --git a/hledger-lib/future-package.yaml b/hledger-lib/future-package.yaml index d0a2d0dde..23dc75e3a 100644 --- a/hledger-lib/future-package.yaml +++ b/hledger-lib/future-package.yaml @@ -33,6 +33,12 @@ tested-with : GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.1 extra-source-files: - CHANGES + - README + +data-files: + - doc/*.5 + - doc/*.txt + - doc/*.info # XXX not supported # flag double diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 062f6c7c2..f73823a03 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -28,14 +28,11 @@ tested-with: GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.2 extra-source-files: CHANGES README - doc/hledger_csv.5 - doc/hledger_csv.5.txt - doc/hledger_journal.5 - doc/hledger_journal.5.txt - doc/hledger_timedot.5 - doc/hledger_timedot.5.txt - doc/hledger_timeclock.5 - doc/hledger_timeclock.5.txt + +data-files: + doc/*.5 + doc/*.txt + doc/*.info source-repository head type: git diff --git a/hledger-ui/future-package.yaml b/hledger-ui/future-package.yaml index 44c7f3be1..706ad505f 100644 --- a/hledger-ui/future-package.yaml +++ b/hledger-ui/future-package.yaml @@ -37,6 +37,11 @@ extra-source-files: - CHANGES - README +data-files: + - doc/*.1 + - doc/*.txt + - doc/*.info + # XXX not supported # flag: # old-locale: diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 71e3231be..9ac787db6 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -30,8 +30,11 @@ tested-with: GHC==7.8.4, GHC==7.10.3 extra-source-files: CHANGES README - doc/hledger-ui.1 - doc/hledger-ui.1.txt + +data-files: + doc/*.1 + doc/*.txt + doc/*.info source-repository head type: git diff --git a/hledger-web/future-package.yaml b/hledger-web/future-package.yaml index 75aee67e1..f2078fa4f 100644 --- a/hledger-web/future-package.yaml +++ b/hledger-web/future-package.yaml @@ -35,69 +35,28 @@ tested-with : GHC==7.6.3, GHC==7.8.4, GHC==7.10.1 extra-source-files: - CHANGES + - README - config/favicon.ico - config/keter.yaml - config/robots.txt - config/routes - config/settings.yml - - messages/en.msg - - static/css/bootstrap-theme.css - - static/css/bootstrap-theme.css.map - - static/css/bootstrap-theme.min.css - - static/css/bootstrap.css - - static/css/bootstrap.css.map - - static/css/bootstrap.min.css - - static/fonts/glyphicons-halflings-regular.eot - - static/fonts/glyphicons-halflings-regular.svg - - static/fonts/glyphicons-halflings-regular.ttf - - static/fonts/glyphicons-halflings-regular.woff + - messages/*.msg + - static/css/*.css + - static/css/*.map + - static/fonts/*.eot + - static/fonts/*.svg + - static/fonts/*.ttf + - static/fonts/*.woff - static/hledger.css - static/hledger.js - - static/js/bootstrap.js - - static/js/bootstrap.min.js - - static/js/excanvas.js - - static/js/excanvas.min.js - - static/js/jquery.cookie.js - - static/js/jquery.flot.canvas.js - - static/js/jquery.flot.canvas.min.js - - static/js/jquery.flot.categories.js - - static/js/jquery.flot.categories.min.js - - static/js/jquery.flot.crosshair.js - - static/js/jquery.flot.crosshair.min.js - - static/js/jquery.flot.errorbars.js - - static/js/jquery.flot.errorbars.min.js - - static/js/jquery.flot.fillbetween.js - - static/js/jquery.flot.fillbetween.min.js - - static/js/jquery.flot.image.js - - static/js/jquery.flot.image.min.js - - static/js/jquery.flot.js - - static/js/jquery.flot.min.js - - static/js/jquery.flot.navigate.js - - static/js/jquery.flot.navigate.min.js - - static/js/jquery.flot.pie.js - - static/js/jquery.flot.pie.min.js - - static/js/jquery.flot.resize.js - - static/js/jquery.flot.resize.min.js - - static/js/jquery.flot.selection.js - - static/js/jquery.flot.selection.min.js - - static/js/jquery.flot.stack.js - - static/js/jquery.flot.stack.min.js - - static/js/jquery.flot.symbol.js - - static/js/jquery.flot.symbol.min.js - - static/js/jquery.flot.threshold.js - - static/js/jquery.flot.threshold.min.js - - static/js/jquery.flot.time.js - - static/js/jquery.flot.time.min.js - - static/js/jquery.flot.tooltip.js - - static/js/jquery.flot.tooltip.min.js - - static/js/jquery.hotkeys.js - - static/js/jquery.js - - static/js/jquery.min.js - - static/js/jquery.url.js - - static/js/typeahead.bundle.js - - static/js/typeahead.bundle.min.js - - templates/default-layout-wrapper.hamlet - - templates/default-layout.hamlet + - static/js/*.js + - templates/*.hamlet + +data-files: + - doc/*.1 + - doc/*.txt + - doc/*.info # XXX not supported # flag threaded diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 6a8e6ebcc..2a9d0438d 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -30,71 +30,27 @@ tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.2 extra-source-files: CHANGES README - doc/hledger-web.1 - doc/hledger-web.1.txt config/favicon.ico config/keter.yaml config/robots.txt config/routes config/settings.yml - messages/en.msg - static/css/bootstrap-theme.css - static/css/bootstrap-theme.css.map - static/css/bootstrap-theme.min.css - static/css/bootstrap.css - static/css/bootstrap.css.map - static/css/bootstrap.min.css - static/fonts/glyphicons-halflings-regular.eot - static/fonts/glyphicons-halflings-regular.svg - static/fonts/glyphicons-halflings-regular.ttf - static/fonts/glyphicons-halflings-regular.woff + messages/*.msg + static/css/*.css + static/css/*.map + static/fonts/*.eot + static/fonts/*.svg + static/fonts/*.ttf + static/fonts/*.woff static/hledger.css static/hledger.js - static/js/bootstrap.js - static/js/bootstrap.min.js - static/js/excanvas.js - static/js/excanvas.min.js - static/js/jquery.cookie.js - static/js/jquery.flot.canvas.js - static/js/jquery.flot.canvas.min.js - static/js/jquery.flot.categories.js - static/js/jquery.flot.categories.min.js - static/js/jquery.flot.crosshair.js - static/js/jquery.flot.crosshair.min.js - static/js/jquery.flot.errorbars.js - static/js/jquery.flot.errorbars.min.js - static/js/jquery.flot.fillbetween.js - static/js/jquery.flot.fillbetween.min.js - static/js/jquery.flot.image.js - static/js/jquery.flot.image.min.js - static/js/jquery.flot.js - static/js/jquery.flot.min.js - static/js/jquery.flot.navigate.js - static/js/jquery.flot.navigate.min.js - static/js/jquery.flot.pie.js - static/js/jquery.flot.pie.min.js - static/js/jquery.flot.resize.js - static/js/jquery.flot.resize.min.js - static/js/jquery.flot.selection.js - static/js/jquery.flot.selection.min.js - static/js/jquery.flot.stack.js - static/js/jquery.flot.stack.min.js - static/js/jquery.flot.symbol.js - static/js/jquery.flot.symbol.min.js - static/js/jquery.flot.threshold.js - static/js/jquery.flot.threshold.min.js - static/js/jquery.flot.time.js - static/js/jquery.flot.time.min.js - static/js/jquery.flot.tooltip.js - static/js/jquery.flot.tooltip.min.js - static/js/jquery.hotkeys.js - static/js/jquery.js - static/js/jquery.min.js - static/js/jquery.url.js - static/js/typeahead.bundle.js - static/js/typeahead.bundle.min.js - templates/default-layout-wrapper.hamlet - templates/default-layout.hamlet + static/js/*.js + templates/*.hamlet + +data-files: + doc/*.1 + doc/*.txt + doc/*.info source-repository head type: git diff --git a/hledger/future-package.yaml b/hledger/future-package.yaml index 7769cc58c..afb329ce5 100644 --- a/hledger/future-package.yaml +++ b/hledger/future-package.yaml @@ -38,6 +38,11 @@ extra-source-files: - README.md - test/test.hs +data-files: + - doc/*.1 + - doc/*.txt + - doc/*.info + # XXX not supported flags: threaded: diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 9de331071..14233c7b7 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -30,10 +30,13 @@ tested-with: GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.2 extra-source-files: CHANGES README.md - doc/hledger.1 - doc/hledger.1.txt test/test.hs +data-files: + doc/*.1 + doc/*.txt + doc/*.info + source-repository head type: git location: https://github.com/simonmichael/hledger