[DHG_packages] 05/05: monad-logger: Upgrading from 0.3.18 to 0.3.19

[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 0f1ae71cc9d2aa9113b1d4f36aab3086e8a11837
Author: Clint Adams <clint at debian.org>
Date:   Tue Jul 12 16:58:06 2016 -0400

    monad-logger: Upgrading from 0.3.18 to 0.3.19
---
 p/haskell-monad-logger/debian/changelog            |  6 +++++
 .../debian/patches/use-template-haskell-loc        | 27 +++++++++++-----------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/p/haskell-monad-logger/debian/changelog b/p/haskell-monad-logger/debian/changelog
index 79f77ff..031eedc 100644
--- a/p/haskell-monad-logger/debian/changelog
+++ b/p/haskell-monad-logger/debian/changelog
@@ -1,3 +1,9 @@
+haskell-monad-logger (0.3.19-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint at debian.org>  Tue, 12 Jul 2016 16:58:06 -0400
+
 haskell-monad-logger (0.3.18-1) unstable; urgency=medium
 
   * New upstream release
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 b52254c..040508c 100644
--- a/p/haskell-monad-logger/debian/patches/use-template-haskell-loc
+++ b/p/haskell-monad-logger/debian/patches/use-template-haskell-loc
@@ -1,10 +1,8 @@
 Author: Joachim Breitner <nomeata at debian.org>
 
-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 @@
+--- a/Control/Monad/Logger.hs
++++ b/Control/Monad/Logger.hs
+@@ -93,6 +93,8 @@
  
  #if WITH_TEMPLATE_HASKELL
  import Language.Haskell.TH.Syntax (Lift (lift), Q, Exp, Loc (..), qLocation)
@@ -13,7 +11,7 @@ Index: haskell-monad-logger/Control/Monad/Logger.hs
  #endif
  
  import Data.Monoid (Monoid)
-@@ -159,16 +161,6 @@
+@@ -185,16 +187,6 @@
      lift LevelError = [|LevelError|]
      lift (LevelOther x) = [|LevelOther $ pack $(lift $ unpack x)|]
  
@@ -30,17 +28,20 @@ Index: haskell-monad-logger/Control/Monad/Logger.hs
  #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 @@
+--- a/monad-logger.cabal
++++ b/monad-logger.cabal
+@@ -44,13 +44,11 @@
                       , bytestring
                       , blaze-builder
                       , exceptions
--  if flag(template_haskell)
--     build-depends:     template-haskell
 +                     , template-haskell
  
+   if impl(ghc >= 8.0.1)
+      cpp-options: -DWITH_CALLSTACK
+      exposed-modules:  Control.Monad.Logger.CallStack
+ 
    if flag(template_haskell)
+-     build-depends:     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