[DHG_packages] 02/02: trifecta: fix patches

[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 d39be093f486318ca10c37a45209e1f266d592ba
Author: Clint Adams <clint at debian.org>
Date:   Mon Dec 7 10:32:11 2015 -0500

    trifecta: fix patches
---
 .../debian/patches/extend-dependency-ranges              | 16 ----------------
 p/haskell-trifecta/debian/patches/fix-doctest.diff       | 10 +++++-----
 p/haskell-trifecta/debian/patches/series                 |  1 -
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/p/haskell-trifecta/debian/patches/extend-dependency-ranges b/p/haskell-trifecta/debian/patches/extend-dependency-ranges
deleted file mode 100644
index 367843d..0000000
--- a/p/haskell-trifecta/debian/patches/extend-dependency-ranges
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: trifecta-1.5.1.3/trifecta.cabal
-===================================================================
---- trifecta-1.5.1.3.orig/trifecta.cabal	2015-07-01 23:53:07.318093649 +0200
-+++ trifecta-1.5.1.3/trifecta.cabal	2015-07-01 23:53:18.002303097 +0200
-@@ -45,9 +45,9 @@
-     ansi-terminal        >= 0.6     && < 0.7,
-     array                >= 0.3.0.2 && < 0.6,
-     base                 >= 4.4     && < 5,
--    blaze-builder        >= 0.3.0.1 && < 0.4,
-+    blaze-builder        >= 0.3.0.1 && < 0.5,
-     blaze-html           >= 0.5     && < 0.9,
--    blaze-markup         >= 0.5     && < 0.7,
-+    blaze-markup         >= 0.5     && < 0.8,
-     bytestring           >= 0.9.1   && < 0.11,
-     charset              >= 0.3.5.1 && < 1,
-     comonad              >= 4       && < 5,
diff --git a/p/haskell-trifecta/debian/patches/fix-doctest.diff b/p/haskell-trifecta/debian/patches/fix-doctest.diff
index b16f6ec..0e7ab69 100644
--- a/p/haskell-trifecta/debian/patches/fix-doctest.diff
+++ b/p/haskell-trifecta/debian/patches/fix-doctest.diff
@@ -1,15 +1,15 @@
-Index: trifecta-1.5.1.3/tests/doctests.hs
-===================================================================
---- trifecta-1.5.1.3.orig/tests/doctests.hs	2015-06-15 14:18:09.316264169 +0200
-+++ trifecta-1.5.1.3/tests/doctests.hs	2015-06-15 14:18:09.312264088 +0200
-@@ -11,9 +11,9 @@
+--- a/tests/doctests.hs
++++ b/tests/doctests.hs
+@@ -14,10 +14,10 @@
  main :: IO ()
  main = getSources >>= \sources -> doctest $
      "-isrc"
 -  : "-idist/build/autogen"
 +  : "-idist-ghc/build/autogen"
    : "-optP-include"
+   : "-fobject-code"
 -  : "-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-trifecta/debian/patches/series b/p/haskell-trifecta/debian/patches/series
index 8d6a21f..3970eaa 100644
--- a/p/haskell-trifecta/debian/patches/series
+++ b/p/haskell-trifecta/debian/patches/series
@@ -1,3 +1,2 @@
 disable-doctests
 fix-doctest.diff
-extend-dependency-ranges

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