[Git][haskell-team/DHG_packages][master] distributive: patch for newer doctest

[Clint Adams]

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


Commits:
5246978c by Clint Adams at 2018-04-14T00:24:22-04:00
distributive: patch for newer doctest

- - - - -


5 changed files:

- p/haskell-distributive/debian/changelog
- p/haskell-distributive/debian/control
- + p/haskell-distributive/debian/patches/newer-deps-from-hackage
- − p/haskell-distributive/debian/patches/no-transformers-compat.diff
- p/haskell-distributive/debian/patches/series


Changes:

=====================================
p/haskell-distributive/debian/changelog
=====================================
--- a/p/haskell-distributive/debian/changelog
+++ b/p/haskell-distributive/debian/changelog
@@ -1,3 +1,9 @@
+haskell-distributive (0.5.3-3) unstable; urgency=medium
+
+  * Patch for newer doctest.
+
+ -- Clint Adams <clint at debian.org>  Sat, 14 Apr 2018 00:21:09 -0400
+
 haskell-distributive (0.5.3-2) unstable; urgency=medium
 
   [ Ilias Tsitsimpis ]


=====================================
p/haskell-distributive/debian/control
=====================================
--- a/p/haskell-distributive/debian/control
+++ b/p/haskell-distributive/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9),
  cdbs,
  ghc (>= 8),
  ghc-prof,
- libghc-base-orphans-dev (>= 0.5),
+ libghc-base-orphans-dev (>= 0.5.2),
  libghc-base-orphans-dev (<< 1),
  libghc-base-orphans-prof,
  libghc-tagged-dev (>= 0.7),
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 9),
  libghc-transformers-compat-dev (<< 1),
  libghc-transformers-compat-prof,
  libghc-doctest-dev (>= 0.11.1),
- libghc-doctest-dev (<< 0.13),
+ libghc-doctest-dev (<< 0.16),
  libghc-generic-deriving-dev (>= 1.11),
  libghc-generic-deriving-dev (<< 2),
  libghc-hspec-dev (>= 2),


=====================================
p/haskell-distributive/debian/patches/newer-deps-from-hackage
=====================================
--- /dev/null
+++ b/p/haskell-distributive/debian/patches/newer-deps-from-hackage
@@ -0,0 +1,29 @@
+--- a/distributive.cabal
++++ b/distributive.cabal
+@@ -51,7 +51,7 @@
+ library
+   build-depends:
+     base                >= 4   && < 5,
+-    base-orphans        >= 0.5 && < 1,
++    base-orphans        >= 0.5.2 && < 1,
+     transformers        >= 0.2 && < 0.6,
+     transformers-compat >= 0.3 && < 1
+ 
+@@ -70,7 +70,7 @@
+ 
+   if impl(ghc < 8.0)
+     if flag(semigroups)
+-      build-depends: semigroups >= 0.11 && < 1
++      build-depends: semigroups >= 0.13 && < 1
+ 
+   if impl(ghc < 7.8)
+     hs-source-dirs: src-compat
+@@ -85,7 +85,7 @@
+   build-depends:
+     base      >= 4,
+     distributive,
+-    doctest   >= 0.11.1 && <0.13
++    doctest   >= 0.11.1 && <0.16
+   ghc-options: -Wall -threaded
+   hs-source-dirs: tests
+ 


=====================================
p/haskell-distributive/debian/patches/no-transformers-compat.diff deleted
=====================================
--- a/p/haskell-distributive/debian/patches/no-transformers-compat.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/distributive.cabal
-+++ b/distributive.cabal
-@@ -52,8 +52,7 @@ library
-   build-depends:
-     base                >= 4   && < 5,
-     base-orphans        >= 0.5 && < 1,
--    transformers        >= 0.2 && < 0.6,
--    transformers-compat >= 0.3 && < 1
-+    transformers        >= 0.2 && < 0.6
- 
-   hs-source-dirs:  src
-   exposed-modules:


=====================================
p/haskell-distributive/debian/patches/series
=====================================
--- a/p/haskell-distributive/debian/patches/series
+++ b/p/haskell-distributive/debian/patches/series
@@ -1 +1 @@
-no-transformers-compat.diff
+newer-deps-from-hackage



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

---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/5246978c14301537521f9e493bb0dbbebc6ce65c
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/20180414/51143865/attachment-0001.html>