[DHG_packages] 05/05: hledger-web: patch for newer hledger and hledger-lib

[Clint Adams]

This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch experimental
in repository DHG_packages.

commit e5895c0012a3f72c3b47e78a94d895e91739920c
Author: Clint Adams <clint at debian.org>
Date:   Mon Oct 17 20:44:53 2016 -0400

    hledger-web: patch for newer hledger and hledger-lib
---
 p/haskell-hledger-web/debian/changelog             |  9 ++---
 p/haskell-hledger-web/debian/control               | 38 +++++++++++++---------
 p/haskell-hledger-web/debian/copyright             |  2 +-
 p/haskell-hledger-web/debian/patches/newer-hledger | 13 ++++++++
 p/haskell-hledger-web/debian/patches/series        |  1 +
 5 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/p/haskell-hledger-web/debian/changelog b/p/haskell-hledger-web/debian/changelog
index f32068a..b2109da 100644
--- a/p/haskell-hledger-web/debian/changelog
+++ b/p/haskell-hledger-web/debian/changelog
@@ -1,14 +1,15 @@
-haskell-hledger-web (0.27-2) UNRELEASED; urgency=medium
+haskell-hledger-web (0.27-2) experimental; urgency=medium
 
   [ Dmitry Bogatov ]
   * Use secure (https) uri in Vcs-Git field in 'debian/control'
   * Bump standards version to 3.9.8 (no changes needed)
   * Convert `debian/copyright' to dep5 format
 
-  [ Gianfranco Costamagna ]
-  * Fix VCS fields
+  [ Clint Adams ]
+  * Temporarily build-depend on ghc 8.
+  * Patch for newer hledger and hledger-lib.
 
- -- Dmitry Bogatov <KAction at gnu.org>  Tue, 10 May 2016 09:35:28 +0300
+ -- Clint Adams <clint at debian.org>  Mon, 17 Oct 2016 20:43:58 -0400
 
 haskell-hledger-web (0.27-1) unstable; urgency=medium
 
diff --git a/p/haskell-hledger-web/debian/control b/p/haskell-hledger-web/debian/control
index 3bc7d13..0bc5d53 100644
--- a/p/haskell-hledger-web/debian/control
+++ b/p/haskell-hledger-web/debian/control
@@ -1,32 +1,34 @@
 Source: haskell-hledger-web
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Uploaders: Clint Adams <clint at debian.org>
+Uploaders:
+ Clint Adams <clint at debian.org>,
 Priority: extra
 Section: haskell
-Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.10),
+Build-Depends:
  cdbs,
- ghc,
+ debhelper (>= 9),
+ ghc (>= 8),
  ghc-ghci,
- libghc-hunit-dev,
+ haskell-devscripts (>= 0.10),
  libghc-base-compat-dev (>= 0.8.1),
  libghc-blaze-html-dev,
  libghc-blaze-markup-dev,
  libghc-clientsession-dev,
- libghc-cmdargs-dev (>= 0.10),
  libghc-cmdargs-dev (<< 0.11),
+ libghc-cmdargs-dev (>= 0.10),
  libghc-conduit-extra-dev (>= 1.1),
  libghc-data-default-dev,
  libghc-hjsmin-dev,
  libghc-hjsmin-prof,
- libghc-hledger-dev (>= 0.27),
  libghc-hledger-dev (<< 0.28),
- libghc-hledger-prof,
- libghc-hledger-lib-dev (>= 0.27),
+ libghc-hledger-dev (>= 0.27),
  libghc-hledger-lib-dev (<< 0.28),
+ libghc-hledger-lib-dev (>= 0.27),
  libghc-hledger-lib-prof,
+ libghc-hledger-prof,
  libghc-http-client-dev,
  libghc-http-conduit-dev,
+ libghc-hunit-dev,
  libghc-json-dev,
  libghc-parsec3-dev (>= 3),
  libghc-safe-dev (>= 0.2),
@@ -37,9 +39,9 @@ Build-Depends: debhelper (>= 9),
  libghc-wai-handler-launch-dev (>= 1.3),
  libghc-warp-dev,
  libghc-yaml-dev,
- libghc-yesod-dev (>= 1.4),
- libghc-yesod-dev (<< 1.5),
  libghc-yesod-core-dev,
+ libghc-yesod-dev (<< 1.5),
+ libghc-yesod-dev (>= 1.4),
  libghc-yesod-form-dev,
  libghc-yesod-static-dev,
  libghc-yesod-static-prof,
@@ -51,12 +53,16 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
 
 Package: hledger-web
 Architecture: any
-Depends: ${haskell:Depends},
- ${shlibs:Depends},
+Depends:
+ ${haskell:Depends},
  ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+ ${shlibs:Depends},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
 Description: web interface for the hledger accounting tool
  hledger is a haskell port and friendly fork of John Wiegley's ledger
  accounting tool. This package provides a web interface as an alternative
diff --git a/p/haskell-hledger-web/debian/copyright b/p/haskell-hledger-web/debian/copyright
index 6585bc5..7da6435 100644
--- a/p/haskell-hledger-web/debian/copyright
+++ b/p/haskell-hledger-web/debian/copyright
@@ -58,4 +58,4 @@ License: MIT
  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
\ No newline at end of file
+ SOFTWARE.
diff --git a/p/haskell-hledger-web/debian/patches/newer-hledger b/p/haskell-hledger-web/debian/patches/newer-hledger
new file mode 100644
index 0000000..9739877
--- /dev/null
+++ b/p/haskell-hledger-web/debian/patches/newer-hledger
@@ -0,0 +1,13 @@
+--- a/hledger-web.cabal
++++ b/hledger-web.cabal
+@@ -129,8 +129,8 @@ library
+     if flag(dev) || flag(library-only)
+         cpp-options: -DDEVELOPMENT
+     build-depends:
+-          hledger-lib == 0.27
+-        , hledger == 0.27
++          hledger-lib == 0.27.1
++        , hledger == 0.27.1
+         , base               >= 4 && < 5
+         , base-compat        >= 0.8.1
+         , blaze-html
diff --git a/p/haskell-hledger-web/debian/patches/series b/p/haskell-hledger-web/debian/patches/series
new file mode 100644
index 0000000..c9ff34b
--- /dev/null
+++ b/p/haskell-hledger-web/debian/patches/series
@@ -0,0 +1 @@
+newer-hledger

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git