[DHG_packages] 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 DHG_packages.

commit 1b8293393acdc695793e21277c3ce93ea676f8a8
Author: Ilias Tsitsimpis <iliastsi at debian.org>
Date:   Tue Nov 7 11:26:24 2017 +0200

    werewolf: Update build-deps to build with newer aeson
    
    Closes: #881017
---
 p/haskell-werewolf/debian/changelog                        |  6 ++++--
 p/haskell-werewolf/debian/control                          |  2 +-
 p/haskell-werewolf/debian/patches/newer-aeson-and-lens     | 14 +++++++++-----
 p/haskell-werewolf/debian/patches/newer-directory          |  6 ++++--
 .../debian/patches/newer-extra-and-monadrandom             |  6 ++++--
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/p/haskell-werewolf/debian/changelog b/p/haskell-werewolf/debian/changelog
index 9d63230..b35d1bc 100644
--- a/p/haskell-werewolf/debian/changelog
+++ b/p/haskell-werewolf/debian/changelog
@@ -1,12 +1,14 @@
-haskell-werewolf (1.5.1.1-8) UNRELEASED; urgency=medium
+haskell-werewolf (1.5.1.1-8) unstable; urgency=medium
 
   * Change Priority to optional. Since Debian Policy version 4.0.1,
     priority extra has been deprecated.
   * Use the HTTPS form of the copyright-format URL
   * Modify d/watch and Source field in d/copyright to use HTTPS
   * Declare compliance with Debian policy 4.1.1
+  * Update build-deps to build with newer version of haskell-aeson
+    Thanks to Steve Langasek for the patch (Closes: #881017)
 
- -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 01 Nov 2017 12:15:38 +0200
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Tue, 07 Nov 2017 11:26:06 +0200
 
 haskell-werewolf (1.5.1.1-7) unstable; urgency=medium
 
diff --git a/p/haskell-werewolf/debian/control b/p/haskell-werewolf/debian/control
index 151a7a5..665be49 100644
--- a/p/haskell-werewolf/debian/control
+++ b/p/haskell-werewolf/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  ghc-prof,
  haskell-devscripts (>= 0.13),
  libghc-aeson-dev (>= 0.8),
- libghc-aeson-dev (<< 1.1),
+ libghc-aeson-dev (<< 1.2),
  libghc-aeson-prof,
  libghc-extra-dev (>= 1.4),
  libghc-extra-dev (<< 1.6),
diff --git a/p/haskell-werewolf/debian/patches/newer-aeson-and-lens b/p/haskell-werewolf/debian/patches/newer-aeson-and-lens
index eafa2a1..331223a 100644
--- a/p/haskell-werewolf/debian/patches/newer-aeson-and-lens
+++ b/p/haskell-werewolf/debian/patches/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/p/haskell-werewolf/debian/patches/newer-directory b/p/haskell-werewolf/debian/patches/newer-directory
index 092c614..ba67184 100644
--- a/p/haskell-werewolf/debian/patches/newer-directory
+++ b/p/haskell-werewolf/debian/patches/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/p/haskell-werewolf/debian/patches/newer-extra-and-monadrandom b/p/haskell-werewolf/debian/patches/newer-extra-and-monadrandom
index 111e734..94bbd8b 100644
--- a/p/haskell-werewolf/debian/patches/newer-extra-and-monadrandom
+++ b/p/haskell-werewolf/debian/patches/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/DHG_packages.git