[Pkg-haskell-commits] [package-plan] 01/01: bump magic

[Joachim Breitner]

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

nomeata pushed a commit to branch ghc-7.8
in repository package-plan.

commit 378d912d821ce6e30908621eebfabf86f05afcf5
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Dec 22 18:24:27 2014 +0100

    bump magic
---
 packages.txt                                                |  2 +-
 patches/authenticate-oauth/1.5.0.1/no-blaze-builder-conduit | 13 +++++++++++++
 patches/authenticate-oauth/1.5.0.1/series                   |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages.txt b/packages.txt
index 669c848..60a731b 100644
--- a/packages.txt
+++ b/packages.txt
@@ -422,7 +422,7 @@ logict 0.6.0.2
 lrucache 1.1.1.4
 ltk 0.14.3.0
 maccatcher 2.1.5
-magic 1.0.8
+magic 1.1
 markdown 0.1.8
 markov-chain 0.0.3.3
 math-functions 0.1.5.2
diff --git a/patches/authenticate-oauth/1.5.0.1/no-blaze-builder-conduit b/patches/authenticate-oauth/1.5.0.1/no-blaze-builder-conduit
new file mode 100644
index 0000000..f2a6b6a
--- /dev/null
+++ b/patches/authenticate-oauth/1.5.0.1/no-blaze-builder-conduit
@@ -0,0 +1,13 @@
+Index: authenticate-oauth-1.5.0.1/authenticate-oauth.cabal
+===================================================================
+--- authenticate-oauth-1.5.0.1.orig/authenticate-oauth.cabal	2014-12-22 01:29:42.518174861 +0100
++++ authenticate-oauth-1.5.0.1/authenticate-oauth.cabal	2014-12-22 01:30:39.031312589 +0100
+@@ -27,7 +27,7 @@
+                    , random
+                    , http-types                    >= 0.6
+                    , blaze-builder
+-                   , blaze-builder-conduit         >= 0.4
++                   , conduit-extra
+     exposed-modules: Web.Authenticate.OAuth, Web.Authenticate.OAuth.IO
+     ghc-options:     -Wall
+ 
diff --git a/patches/authenticate-oauth/1.5.0.1/series b/patches/authenticate-oauth/1.5.0.1/series
new file mode 100644
index 0000000..128bd81
--- /dev/null
+++ b/patches/authenticate-oauth/1.5.0.1/series
@@ -0,0 +1 @@
+no-blaze-builder-conduit

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