[package-plan] 01/01: werewolf: Update build-deps to build with newer aeson

[Ilias Tsitsimpis]

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

iliastsi-guest pushed a commit to branch master
in repository package-plan.

commit c40f8a0d1e781edf8124c968efa8140e5ae3947b
Author: Ilias Tsitsimpis <iliastsi at debian.org>
Date:   Tue Nov 7 11:31:01 2017 +0200

    werewolf: Update build-deps to build with newer aeson
---
 packages.txt                                         |  2 +-
 patches/werewolf/1.5.1.1/newer-aeson-and-lens        | 14 +++++++++-----
 patches/werewolf/1.5.1.1/newer-directory             |  6 ++++--
 patches/werewolf/1.5.1.1/newer-extra-and-monadrandom |  6 ++++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/packages.txt b/packages.txt
index eea9ed3..af4ba2a 100644
--- a/packages.txt
+++ b/packages.txt
@@ -894,7 +894,7 @@ web-routes-hsp 0.24.6.1 key
 web-routes-th 0.22.6.2 key
 websockets 0.10.0.0
 weigh 0.0.5
-werewolf 1.5.1.1 ignore # BROKEN - LTS 9 - needs patching for newer aeson
+werewolf 1.5.1.1
 with-location 0.1.0
 wizards 1.0.2
 wl-pprint-extras 3.5.0.5
diff --git a/patches/werewolf/1.5.1.1/newer-aeson-and-lens b/patches/werewolf/1.5.1.1/newer-aeson-and-lens
index eafa2a1..331223a 100644
--- a/patches/werewolf/1.5.1.1/newer-aeson-and-lens
+++ b/patches/werewolf/1.5.1.1/newer-aeson-and-lens
@@ -1,11 +1,13 @@
+Index: b/werewolf.cabal
+===================================================================
 --- a/werewolf.cabal
 +++ b/werewolf.cabal
-@@ -349,13 +349,13 @@
+@@ -349,13 +349,13 @@ executable werewolf
          QuasiQuotes,
          Rank2Types
      build-depends:
 -        aeson >= 0.8 && < 0.12,
-+        aeson >= 0.8 && < 1.1,
++        aeson >= 0.8 && < 1.2,
          base >= 4.8 && < 5,
          containers == 0.5.*,
          directory > 1.2,
@@ -16,12 +18,12 @@
          MonadRandom >= 0.4 && < 0.6,
          mtl == 2.2.*,
          optparse-applicative >= 0.11 && < 0.14,
-@@ -387,12 +387,12 @@
+@@ -387,12 +387,12 @@ library
          Rank2Types,
          TemplateHaskell
      build-depends:
 -        aeson >= 0.8 && < 0.12,
-+        aeson >= 0.8 && < 1.1,
++        aeson >= 0.8 && < 1.2,
          base >= 4.8 && < 5,
          containers == 0.5.*,
          extra >= 1.4 && < 1.6,
@@ -31,9 +33,11 @@
          mtl == 2.2.*,
          template-haskell >= 2.10 && < 2.12,
          text == 1.2.*,
+Index: b/src/Game/Werewolf/Game.hs
+===================================================================
 --- a/src/Game/Werewolf/Game.hs
 +++ b/src/Game/Werewolf/Game.hs
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,7 @@ makeLenses ''Game
  makePrisms ''Stage
  
  #if __GLASGOW_HASKELL__ >= 800
diff --git a/patches/werewolf/1.5.1.1/newer-directory b/patches/werewolf/1.5.1.1/newer-directory
index 092c614..ba67184 100644
--- a/patches/werewolf/1.5.1.1/newer-directory
+++ b/patches/werewolf/1.5.1.1/newer-directory
@@ -1,8 +1,10 @@
 Description: Bump directory bounds on buildds.
 Author: Bhavani Shankar <bhavi at ubuntu.com>
 
---- haskell-werewolf-1.5.1.1.orig/werewolf.cabal
-+++ haskell-werewolf-1.5.1.1/werewolf.cabal
+Index: b/werewolf.cabal
+===================================================================
+--- a/werewolf.cabal
++++ b/werewolf.cabal
 @@ -352,7 +352,7 @@ executable werewolf
          aeson >= 0.8 && < 0.12,
          base >= 4.8 && < 5,
diff --git a/patches/werewolf/1.5.1.1/newer-extra-and-monadrandom b/patches/werewolf/1.5.1.1/newer-extra-and-monadrandom
index 111e734..94bbd8b 100644
--- a/patches/werewolf/1.5.1.1/newer-extra-and-monadrandom
+++ b/patches/werewolf/1.5.1.1/newer-extra-and-monadrandom
@@ -1,6 +1,8 @@
+Index: b/werewolf.cabal
+===================================================================
 --- a/werewolf.cabal
 +++ b/werewolf.cabal
-@@ -353,10 +353,10 @@
+@@ -353,10 +353,10 @@ executable werewolf
          base >= 4.8 && < 5,
          containers == 0.5.*,
          directory > 1.2,
@@ -13,7 +15,7 @@
          mtl == 2.2.*,
          optparse-applicative >= 0.11 && < 0.14,
          random-shuffle,
-@@ -390,7 +390,7 @@
+@@ -390,7 +390,7 @@ library
          aeson >= 0.8 && < 0.12,
          base >= 4.8 && < 5,
          containers == 0.5.*,

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