[Git][haskell-team/DHG_packages][master] werewolf: Upgrading from 1.5.1.1 to 1.5.2.0

Clint Adams gitlab at salsa.debian.org
Wed Apr 18 13:29:50 BST 2018


Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
0ee3bf5d by Clint Adams at 2018-04-18T08:29:19-04:00
werewolf: Upgrading from 1.5.1.1 to 1.5.2.0

- - - - -


7 changed files:

- p/haskell-werewolf/debian/changelog
- p/haskell-werewolf/debian/control
- − p/haskell-werewolf/debian/patches/newer-aeson-and-lens
- + p/haskell-werewolf/debian/patches/newer-deps
- − p/haskell-werewolf/debian/patches/newer-directory
- − p/haskell-werewolf/debian/patches/newer-extra-and-monadrandom
- p/haskell-werewolf/debian/patches/series


Changes:

=====================================
p/haskell-werewolf/debian/changelog
=====================================
--- a/p/haskell-werewolf/debian/changelog
+++ b/p/haskell-werewolf/debian/changelog
@@ -1,3 +1,9 @@
+haskell-werewolf (1.5.2.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint at debian.org>  Wed, 18 Apr 2018 08:10:38 -0400
+
 haskell-werewolf (1.5.1.1-9) unstable; urgency=medium
 
   [ Ilias Tsitsimpis ]


=====================================
p/haskell-werewolf/debian/control
=====================================
--- a/p/haskell-werewolf/debian/control
+++ b/p/haskell-werewolf/debian/control
@@ -11,28 +11,28 @@ Build-Depends:
  ghc-prof,
  haskell-devscripts (>= 0.13),
  libghc-aeson-dev (>= 0.8),
- libghc-aeson-dev (<< 1.2),
+ libghc-aeson-dev (<< 1.3),
  libghc-aeson-prof,
  libghc-extra-dev (>= 1.4),
- libghc-extra-dev (<< 1.6),
+ libghc-extra-dev (<< 1.7),
  libghc-extra-prof,
- libghc-interpolate-dev (<< 0.2),
  libghc-interpolate-dev (>= 0.1),
+ libghc-interpolate-dev (<< 0.3),
  libghc-interpolate-prof,
  libghc-lens-dev (>= 4.12),
- libghc-lens-dev (<< 4.16),
+ libghc-lens-dev (<< 4.17),
  libghc-lens-prof,
- libghc-monadrandom-dev (>= 0.4),
- libghc-monadrandom-dev (<< 0.6),
- libghc-mtl-dev (<< 2.3),
  libghc-mtl-dev (>= 2.2),
+ libghc-mtl-dev (<< 2.3),
  libghc-mtl-prof,
- libghc-optparse-applicative-dev (<< 0.14),
- libghc-optparse-applicative-dev (>= 0.11),
- libghc-random-shuffle-dev,
- libghc-text-dev (<< 1.3),
  libghc-text-dev (>= 1.2),
+ libghc-text-dev (<< 1.3),
  libghc-text-prof,
+ libghc-monadrandom-dev (>= 0.4),
+ libghc-monadrandom-dev (<< 0.6),
+ libghc-optparse-applicative-dev (>= 0.11),
+ libghc-optparse-applicative-dev (<< 0.15),
+ libghc-random-shuffle-dev,
 Build-Depends-Indep:
  ghc-doc,
  libghc-aeson-doc,


=====================================
p/haskell-werewolf/debian/patches/newer-aeson-and-lens deleted
=====================================
--- a/p/haskell-werewolf/debian/patches/newer-aeson-and-lens
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: b/werewolf.cabal
-===================================================================
---- a/werewolf.cabal
-+++ b/werewolf.cabal
-@@ -349,13 +349,13 @@ executable werewolf
-         QuasiQuotes,
-         Rank2Types
-     build-depends:
--        aeson >= 0.8 && < 0.12,
-+        aeson >= 0.8 && < 1.2,
-         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 @@ library
-         Rank2Types,
-         TemplateHaskell
-     build-depends:
--        aeson >= 0.8 && < 0.12,
-+        aeson >= 0.8 && < 1.2,
-         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.*,
-Index: b/src/Game/Werewolf/Game.hs
-===================================================================
---- a/src/Game/Werewolf/Game.hs
-+++ b/src/Game/Werewolf/Game.hs
-@@ -131,7 +131,7 @@ makeLenses ''Game
- 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


=====================================
p/haskell-werewolf/debian/patches/newer-deps
=====================================
--- /dev/null
+++ b/p/haskell-werewolf/debian/patches/newer-deps
@@ -0,0 +1,45 @@
+Description: Bump directory bounds on buildds.
+Author: Bhavani Shankar <bhavi at ubuntu.com>
+
+--- a/werewolf.cabal
++++ b/werewolf.cabal
+@@ -349,16 +349,16 @@
+         QuasiQuotes,
+         Rank2Types
+     build-depends:
+-        aeson >= 0.8 && < 1.2,
++        aeson >= 0.8 && < 1.3,
+         base >= 4.8 && < 5,
+         containers == 0.5.*,
+         directory > 1.2,
+-        extra >= 1.4 && < 1.6,
++        extra >= 1.4 && < 1.7,
+         filepath == 1.4.*,
+-        lens >= 4.12 && < 4.16,
++        lens >= 4.12 && < 4.17,
+         MonadRandom >= 0.4 && < 0.6,
+         mtl == 2.2.*,
+-        optparse-applicative >= 0.11 && < 0.14,
++        optparse-applicative >= 0.11 && < 0.15,
+         random-shuffle,
+         text == 1.2.*,
+         transformers >= 0.4 && < 0.6,
+@@ -387,13 +387,13 @@
+         Rank2Types,
+         TemplateHaskell
+     build-depends:
+-        aeson >= 0.8 && < 1.2,
++        aeson >= 0.8 && < 1.3,
+         base >= 4.8 && < 5,
+         containers == 0.5.*,
+-        extra >= 1.4 && < 1.6,
+-        interpolate == 0.1.*,
+-        lens >= 4.12 && < 4.16,
++        extra >= 1.4 && < 1.7,
++        interpolate >= 0.1,
++        lens >= 4.12 && < 4.17,
+         mtl == 2.2.*,
+-        template-haskell >= 2.10 && < 2.12,
++        template-haskell >= 2.10 && < 2.13,
+         text == 1.2.*,
+         transformers >= 0.4 && < 0.6


=====================================
p/haskell-werewolf/debian/patches/newer-directory deleted
=====================================
--- a/p/haskell-werewolf/debian/patches/newer-directory
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Bump directory bounds on buildds.
-Author: Bhavani Shankar <bhavi at ubuntu.com>
-
-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,
-         containers == 0.5.*,
--        directory == 1.2.*,
-+        directory > 1.2,
-         extra == 1.4.*,
-         filepath == 1.4.*,
-         lens >= 4.12 && < 4.15,


=====================================
p/haskell-werewolf/debian/patches/newer-extra-and-monadrandom deleted
=====================================
--- a/p/haskell-werewolf/debian/patches/newer-extra-and-monadrandom
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: b/werewolf.cabal
-===================================================================
---- a/werewolf.cabal
-+++ b/werewolf.cabal
-@@ -353,10 +353,10 @@ executable werewolf
-         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 @@ library
-         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.*,


=====================================
p/haskell-werewolf/debian/patches/series
=====================================
--- a/p/haskell-werewolf/debian/patches/series
+++ b/p/haskell-werewolf/debian/patches/series
@@ -1,3 +1 @@
-newer-directory
-newer-extra-and-monadrandom
-newer-aeson-and-lens
+newer-deps



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/0ee3bf5db84c642ffdb0b0311979b2b9e4b82a6d

---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/0ee3bf5db84c642ffdb0b0311979b2b9e4b82a6d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180418/0eab14d3/attachment-0001.html>


More information about the Pkg-haskell-commits mailing list