[DHG_packages] 02/06: refresh & drop haskell-distributive patches

[Sean Whitton]

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

spw-guest pushed a commit to branch LTS-6
in repository DHG_packages.

commit f5ed56b1e0f629f046485d8d5bdf063ea75045e1
Author: Sean Whitton <spwhitton at spwhitton.name>
Date:   Wed Jun 1 10:28:09 2016 +0900

    refresh & drop haskell-distributive patches
---
 p/haskell-distributive/debian/changelog                     |  6 +++++-
 p/haskell-distributive/debian/patches/doctest-pathfix.diff  | 13 -------------
 .../debian/patches/no-transformers-compat.diff              | 10 +++++-----
 p/haskell-distributive/debian/patches/series                |  1 -
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/p/haskell-distributive/debian/changelog b/p/haskell-distributive/debian/changelog
index e092055..ceb9155 100644
--- a/p/haskell-distributive/debian/changelog
+++ b/p/haskell-distributive/debian/changelog
@@ -7,7 +7,11 @@ haskell-distributive (0.5.0.2-1) unstable; urgency=medium
   [ Joachim Breitner ]
   * New upstream release
 
- -- Joachim Breitner <nomeata at debian.org>  Sun, 29 May 2016 11:57:56 +0200
+  [ Sean Whitton ]
+  * Refresh patch.
+  * Drop obsolete doctest-pathfix.diff patch.
+
+ -- Sean Whitton <spwhitton at spwhitton.name>  Wed, 01 Jun 2016 10:18:12 +0900
 
 haskell-distributive (0.4.4-5) unstable; urgency=medium
 
diff --git a/p/haskell-distributive/debian/patches/doctest-pathfix.diff b/p/haskell-distributive/debian/patches/doctest-pathfix.diff
deleted file mode 100644
index 07b6cdc..0000000
--- a/p/haskell-distributive/debian/patches/doctest-pathfix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/tests/doctests.hs
-+++ b/tests/doctests.hs
-@@ -11,9 +11,9 @@
- main :: IO ()
- main = getSources >>= \sources -> doctest $
-     "-isrc"
--  : "-idist/build/autogen"
-+  : "-idist-ghc/build/autogen"
-   : "-optP-include"
--  : "-optPdist/build/autogen/cabal_macros.h"
-+  : "-optPdist-ghc/build/autogen/cabal_macros.h"
-   : "-hide-all-packages"
-   : map ("-package="++) deps ++ sources
diff --git a/p/haskell-distributive/debian/patches/no-transformers-compat.diff b/p/haskell-distributive/debian/patches/no-transformers-compat.diff
index a0474a6..af246c4 100644
--- a/p/haskell-distributive/debian/patches/no-transformers-compat.diff
+++ b/p/haskell-distributive/debian/patches/no-transformers-compat.diff
@@ -1,12 +1,12 @@
 --- a/distributive.cabal
 +++ b/distributive.cabal
-@@ -34,8 +34,7 @@
+@@ -37,8 +37,7 @@ library
    build-depends:
      base                >= 4   && < 5,
-     tagged              >= 0.7 && < 1,
--    transformers        >= 0.2 && < 0.5,
+     base-orphans        >= 0.5 && < 1,
+-    transformers        >= 0.2 && < 0.6,
 -    transformers-compat >= 0.3 && < 1
-+    transformers        >= 0.3 && < 0.5
-
++    transformers        >= 0.2 && < 0.6
+ 
    hs-source-dirs:  src
    exposed-modules:
diff --git a/p/haskell-distributive/debian/patches/series b/p/haskell-distributive/debian/patches/series
index fc6e67a..d0b687c 100644
--- a/p/haskell-distributive/debian/patches/series
+++ b/p/haskell-distributive/debian/patches/series
@@ -1,2 +1 @@
 no-transformers-compat.diff
-doctest-pathfix.diff

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