[DHG_packages] 02/16: monad-logger: Further improvements on that patch

[Joachim Breitner]

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

nomeata pushed a commit to branch jessie-backports
in repository DHG_packages.

commit d54bb7cd18b5d1e3c40278accec4de401ec825dc
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Jul 24 09:32:16 2015 +0200

    monad-logger: Further improvements on that patch
---
 p/haskell-monad-logger/debian/changelog            |  6 ++++++
 .../debian/patches/use-template-haskell-loc        | 24 ++++++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/p/haskell-monad-logger/debian/changelog b/p/haskell-monad-logger/debian/changelog
index 7f34e92..14e75b9 100644
--- a/p/haskell-monad-logger/debian/changelog
+++ b/p/haskell-monad-logger/debian/changelog
@@ -1,3 +1,9 @@
+haskell-monad-logger (0.3.13.2-4) unstable; urgency=medium
+
+  * Further improvements on that patch 
+
+ -- Joachim Breitner <nomeata at debian.org>  Fri, 24 Jul 2015 09:32:11 +0200
+
 haskell-monad-logger (0.3.13.2-3) unstable; urgency=medium
 
   * Even without Template Haskell, use the data types from the
diff --git a/p/haskell-monad-logger/debian/patches/use-template-haskell-loc b/p/haskell-monad-logger/debian/patches/use-template-haskell-loc
index 2652c9e..b52254c 100644
--- a/p/haskell-monad-logger/debian/patches/use-template-haskell-loc
+++ b/p/haskell-monad-logger/debian/patches/use-template-haskell-loc
@@ -1,8 +1,10 @@
 Author: Joachim Breitner <nomeata at debian.org>
 
---- haskell-monad-logger-0.3.13.2.orig/Control/Monad/Logger.hs
-+++ haskell-monad-logger-0.3.13.2/Control/Monad/Logger.hs
-@@ -74,6 +74,8 @@ module Control.Monad.Logger
+Index: haskell-monad-logger/Control/Monad/Logger.hs
+===================================================================
+--- haskell-monad-logger.orig/Control/Monad/Logger.hs	2015-07-23 23:30:03.000000000 +0200
++++ haskell-monad-logger/Control/Monad/Logger.hs	2015-07-23 23:30:03.000000000 +0200
+@@ -74,6 +74,8 @@
  
  #if WITH_TEMPLATE_HASKELL
  import Language.Haskell.TH.Syntax (Lift (lift), Q, Exp, Loc (..), qLocation)
@@ -11,7 +13,7 @@ Author: Joachim Breitner <nomeata at debian.org>
  #endif
  
  import Data.Monoid (Monoid)
-@@ -159,16 +161,6 @@ instance Lift LogLevel where
+@@ -159,16 +161,6 @@
      lift LevelError = [|LevelError|]
      lift (LevelOther x) = [|LevelOther $ pack $(lift $ unpack x)|]
  
@@ -28,3 +30,17 @@ Author: Joachim Breitner <nomeata at debian.org>
  #endif
  
  -- | A @Monad@ which has the ability to log messages in some manner.
+Index: haskell-monad-logger/monad-logger.cabal
+===================================================================
+--- haskell-monad-logger.orig/monad-logger.cabal	2015-07-07 04:17:06.000000000 +0200
++++ haskell-monad-logger/monad-logger.cabal	2015-07-24 09:31:58.217637791 +0200
+@@ -43,8 +43,7 @@
+                      , bytestring
+                      , blaze-builder
+                      , exceptions
+-  if flag(template_haskell)
+-     build-depends:     template-haskell
++                     , template-haskell
+ 
+   if flag(template_haskell)
+      cpp-options: -DWITH_TEMPLATE_HASKELL

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