[package-plan] 01/01: fix werewolf

[Clint Adams]

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

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

commit fc3bba80df36f2265700de96bc10564593435503
Author: Clint Adams <clint at debian.org>
Date:   Wed Jul 19 19:42:43 2017 -0400

    fix werewolf
---
 packages.txt                                       |  2 +-
 patches/werewolf/1.5.1.1/newer-aeson-and-lens      | 44 ++++++++++++++++++++++
 patches/werewolf/1.5.1.1/newer-directory           | 14 +++++++
 .../werewolf/1.5.1.1/newer-extra-and-monadrandom   | 24 ++++++++++++
 patches/werewolf/1.5.1.1/series                    |  3 ++
 5 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/packages.txt b/packages.txt
index c8a7af9..618cc7a 100644
--- a/packages.txt
+++ b/packages.txt
@@ -885,7 +885,7 @@ web-routes-hsp 0.24.6.1 key
 web-routes-th 0.22.6.1 key
 websockets 0.10.0.0
 weigh 0.0.4
-werewolf 1.5.1.1 ignore # BROKEN - LTS 8 - 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
new file mode 100644
index 0000000..eafa2a1
--- /dev/null
+++ b/patches/werewolf/1.5.1.1/newer-aeson-and-lens
@@ -0,0 +1,44 @@
+--- a/werewolf.cabal
++++ b/werewolf.cabal
+@@ -349,13 +349,13 @@
+         QuasiQuotes,
+         Rank2Types
+     build-depends:
+-        aeson >= 0.8 && < 0.12,
++        aeson >= 0.8 && < 1.1,
+         base >= 4.8 && < 5,
+         containers == 0.5.*,
+         directory > 1.2,
+         extra >= 1.4 && < 1.6,
+         filepath == 1.4.*,
+-        lens >= 4.12 && < 4.15,
++        lens >= 4.12 && < 4.16,
+         MonadRandom >= 0.4 && < 0.6,
+         mtl == 2.2.*,
+         optparse-applicative >= 0.11 && < 0.14,
+@@ -387,12 +387,12 @@
+         Rank2Types,
+         TemplateHaskell
+     build-depends:
+-        aeson >= 0.8 && < 0.12,
++        aeson >= 0.8 && < 1.1,
+         base >= 4.8 && < 5,
+         containers == 0.5.*,
+         extra >= 1.4 && < 1.6,
+         interpolate == 0.1.*,
+-        lens >= 4.12 && < 4.15,
++        lens >= 4.12 && < 4.16,
+         mtl == 2.2.*,
+         template-haskell >= 2.10 && < 2.12,
+         text == 1.2.*,
+--- a/src/Game/Werewolf/Game.hs
++++ b/src/Game/Werewolf/Game.hs
+@@ -131,7 +131,7 @@
+ makePrisms ''Stage
+ 
+ #if __GLASGOW_HASKELL__ >= 800
+-activity :: Contravariant f => (Activity -> f Activity) -> Stage -> f Stage
++activity :: (Functor f, Contravariant f) => (Activity -> f Activity) -> Stage -> f Stage
+ #else
+ activity :: Getter Stage Activity
+ #endif
diff --git a/patches/werewolf/1.5.1.1/newer-directory b/patches/werewolf/1.5.1.1/newer-directory
new file mode 100644
index 0000000..092c614
--- /dev/null
+++ b/patches/werewolf/1.5.1.1/newer-directory
@@ -0,0 +1,14 @@
+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
+@@ -352,7 +352,7 @@ executable werewolf
+         aeson >= 0.8 && < 0.12,
+         base >= 4.8 && < 5,
+         containers == 0.5.*,
+-        directory == 1.2.*,
++        directory > 1.2,
+         extra == 1.4.*,
+         filepath == 1.4.*,
+         lens >= 4.12 && < 4.15,
diff --git a/patches/werewolf/1.5.1.1/newer-extra-and-monadrandom b/patches/werewolf/1.5.1.1/newer-extra-and-monadrandom
new file mode 100644
index 0000000..111e734
--- /dev/null
+++ b/patches/werewolf/1.5.1.1/newer-extra-and-monadrandom
@@ -0,0 +1,24 @@
+--- a/werewolf.cabal
++++ b/werewolf.cabal
+@@ -353,10 +353,10 @@
+         base >= 4.8 && < 5,
+         containers == 0.5.*,
+         directory > 1.2,
+-        extra == 1.4.*,
++        extra >= 1.4 && < 1.6,
+         filepath == 1.4.*,
+         lens >= 4.12 && < 4.15,
+-        MonadRandom == 0.4.*,
++        MonadRandom >= 0.4 && < 0.6,
+         mtl == 2.2.*,
+         optparse-applicative >= 0.11 && < 0.14,
+         random-shuffle,
+@@ -390,7 +390,7 @@
+         aeson >= 0.8 && < 0.12,
+         base >= 4.8 && < 5,
+         containers == 0.5.*,
+-        extra == 1.4.*,
++        extra >= 1.4 && < 1.6,
+         interpolate == 0.1.*,
+         lens >= 4.12 && < 4.15,
+         mtl == 2.2.*,
diff --git a/patches/werewolf/1.5.1.1/series b/patches/werewolf/1.5.1.1/series
new file mode 100644
index 0000000..3094f7e
--- /dev/null
+++ b/patches/werewolf/1.5.1.1/series
@@ -0,0 +1,3 @@
+newer-directory
+newer-extra-and-monadrandom
+newer-aeson-and-lens

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