[DHG_packages] 01/01: werewolf: patch for newer aeson and lens

[Clint Adams]

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

clint pushed a commit to branch master
in repository DHG_packages.

commit 724196268e8e1e633a5f811c065d9d6be48568c4
Author: Clint Adams <clint at debian.org>
Date:   Wed Jul 19 19:10:35 2017 -0400

    werewolf: patch for newer aeson and lens
---
 p/haskell-werewolf/debian/changelog                |  6 +++
 p/haskell-werewolf/debian/control                  |  4 +-
 .../debian/patches/newer-aeson-and-lens            | 44 ++++++++++++++++++++++
 p/haskell-werewolf/debian/patches/series           |  1 +
 4 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/p/haskell-werewolf/debian/changelog b/p/haskell-werewolf/debian/changelog
index 280949a..6dce9be 100644
--- a/p/haskell-werewolf/debian/changelog
+++ b/p/haskell-werewolf/debian/changelog
@@ -1,3 +1,9 @@
+haskell-werewolf (1.5.1.1-7) unstable; urgency=medium
+
+  * Patch for newer aeson and lens.  closes: #868629.
+
+ -- Clint Adams <clint at debian.org>  Wed, 19 Jul 2017 18:52:37 -0400
+
 haskell-werewolf (1.5.1.1-6) unstable; urgency=medium
 
   * Fix patch for newer extra.  closes: #867872.
diff --git a/p/haskell-werewolf/debian/control b/p/haskell-werewolf/debian/control
index 8c819e1..2455015 100644
--- a/p/haskell-werewolf/debian/control
+++ b/p/haskell-werewolf/debian/control
@@ -10,8 +10,8 @@ Build-Depends:
  ghc (>= 8),
  ghc-prof,
  haskell-devscripts (>= 0.13),
- libghc-aeson-dev (<< 0.12),
  libghc-aeson-dev (>= 0.8),
+ libghc-aeson-dev (<< 1.1),
  libghc-aeson-prof,
  libghc-extra-dev (>= 1.4),
  libghc-extra-dev (<< 1.6),
@@ -19,8 +19,8 @@ Build-Depends:
  libghc-interpolate-dev (<< 0.2),
  libghc-interpolate-dev (>= 0.1),
  libghc-interpolate-prof,
- libghc-lens-dev (<< 4.15),
  libghc-lens-dev (>= 4.12),
+ libghc-lens-dev (<< 4.16),
  libghc-lens-prof,
  libghc-monadrandom-dev (>= 0.4),
  libghc-monadrandom-dev (<< 0.6),
diff --git a/p/haskell-werewolf/debian/patches/newer-aeson-and-lens b/p/haskell-werewolf/debian/patches/newer-aeson-and-lens
new file mode 100644
index 0000000..eafa2a1
--- /dev/null
+++ b/p/haskell-werewolf/debian/patches/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/p/haskell-werewolf/debian/patches/series b/p/haskell-werewolf/debian/patches/series
index b347876..3094f7e 100644
--- a/p/haskell-werewolf/debian/patches/series
+++ b/p/haskell-werewolf/debian/patches/series
@@ -1,2 +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/DHG_packages.git