[DHG_packages] 01/16: monad-logger: Even without Template Haskell, use the data types from the template-haskell library.

[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 a6dd1384622e4f1780baebd80ff5f4b0a422ec62
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Jul 23 23:30:55 2015 +0200

    monad-logger: Even without Template Haskell, use the data types from the template-haskell library.
---
 p/haskell-monad-logger/debian/changelog            |  7 +++++
 p/haskell-monad-logger/debian/patches/series       |  1 +
 .../debian/patches/use-template-haskell-loc        | 30 ++++++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/p/haskell-monad-logger/debian/changelog b/p/haskell-monad-logger/debian/changelog
index 4903554..7f34e92 100644
--- a/p/haskell-monad-logger/debian/changelog
+++ b/p/haskell-monad-logger/debian/changelog
@@ -1,3 +1,10 @@
+haskell-monad-logger (0.3.13.2-3) unstable; urgency=medium
+
+  * Even without Template Haskell, use the data types from the
+    template-haskell library.
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 23 Jul 2015 23:30:40 +0200
+
 haskell-monad-logger (0.3.13.2-2) unstable; urgency=medium
 
   * Enable template haskell code only conditionally, to allow building this
diff --git a/p/haskell-monad-logger/debian/patches/series b/p/haskell-monad-logger/debian/patches/series
new file mode 100644
index 0000000..e218465
--- /dev/null
+++ b/p/haskell-monad-logger/debian/patches/series
@@ -0,0 +1 @@
+use-template-haskell-loc
diff --git a/p/haskell-monad-logger/debian/patches/use-template-haskell-loc b/p/haskell-monad-logger/debian/patches/use-template-haskell-loc
new file mode 100644
index 0000000..2652c9e
--- /dev/null
+++ b/p/haskell-monad-logger/debian/patches/use-template-haskell-loc
@@ -0,0 +1,30 @@
+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
+ 
+ #if WITH_TEMPLATE_HASKELL
+ import Language.Haskell.TH.Syntax (Lift (lift), Q, Exp, Loc (..), qLocation)
++#else
++import Language.Haskell.TH.Syntax (Loc (..))
+ #endif
+ 
+ import Data.Monoid (Monoid)
+@@ -159,16 +161,6 @@ instance Lift LogLevel where
+     lift LevelError = [|LevelError|]
+     lift (LevelOther x) = [|LevelOther $ pack $(lift $ unpack x)|]
+ 
+-#else
+-
+-data Loc
+-  = Loc { loc_filename :: String
+-    , loc_package  :: String
+-    , loc_module   :: String
+-    , loc_start    :: CharPos
+-    , loc_end      :: CharPos }
+-type CharPos = (Int, Int)
+-
+ #endif
+ 
+ -- | A @Monad@ which has the ability to log messages in some manner.

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