[DHG_packages] 01/01: hgettext: patch for haskell-src-exts 1.18

[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 aea8b0752b60246f552f3ed5a9b911bfb3c0bfe9
Author: Clint Adams <clint at debian.org>
Date:   Fri Jul 7 20:05:16 2017 -0400

    hgettext: patch for haskell-src-exts 1.18
---
 p/haskell-hgettext/debian/changelog              |  6 ++++++
 p/haskell-hgettext/debian/control                |  4 ++--
 p/haskell-hgettext/debian/patches/newer-src-exts | 20 ++++++++++++++++++++
 p/haskell-hgettext/debian/patches/series         |  1 +
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/p/haskell-hgettext/debian/changelog b/p/haskell-hgettext/debian/changelog
index 169d5f4..1cd73cf 100644
--- a/p/haskell-hgettext/debian/changelog
+++ b/p/haskell-hgettext/debian/changelog
@@ -1,3 +1,9 @@
+haskell-hgettext (0.1.30-15) unstable; urgency=medium
+
+  * Patch for haskell-src-exts 1.18.  closes: #867324.
+
+ -- Clint Adams <clint at debian.org>  Fri, 07 Jul 2017 20:03:08 -0400
+
 haskell-hgettext (0.1.30-14) unstable; urgency=medium
 
   * Upload to unstable as part of GHC 8 transition.
diff --git a/p/haskell-hgettext/debian/control b/p/haskell-hgettext/debian/control
index 9286862..c22148d 100644
--- a/p/haskell-hgettext/debian/control
+++ b/p/haskell-hgettext/debian/control
@@ -12,12 +12,12 @@ Build-Depends:
  haskell-devscripts (>= 0.13),
  libghc-setlocale-dev,
  libghc-setlocale-prof,
- libghc-src-exts-dev,
+ libghc-src-exts-dev (>= 1.18),
  libghc-uniplate-dev,
 Build-Depends-Indep:
  ghc-doc,
  libghc-setlocale-doc,
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Homepage: https://github.com/vasylp/hgettext
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-hgettext
 Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
diff --git a/p/haskell-hgettext/debian/patches/newer-src-exts b/p/haskell-hgettext/debian/patches/newer-src-exts
new file mode 100644
index 0000000..da47d2c
--- /dev/null
+++ b/p/haskell-hgettext/debian/patches/newer-src-exts
@@ -0,0 +1,20 @@
+--- a/src/hgettext.hs
++++ b/src/hgettext.hs
+@@ -49,8 +49,15 @@
+     where header = "Usage: hgettext [OPTION] [INPUTFILE] ..."
+ 
+ 
+-toTranslate :: String -> H.ParseResult H.Module -> [(Int, String)]
+-toTranslate f (H.ParseOk z) = nub [ (0, s) | H.App (H.Var (H.UnQual (H.Ident x))) (H.Lit (H.String s)) <- universeBi z, x == f]
++toTranslate :: String -> H.ParseResult (H.Module H.SrcSpanInfo) -> [(Int, String)]
++toTranslate f (H.ParseOk z) = nub [ (0, s)
++                                  | H.App _
++                                        (H.Var _
++                                            (H.UnQual _
++                                                (H.Ident  _ x)))
++                                        (H.Lit _
++                                            (H.String _ s _slit)) <- universeBi z :: [H.Exp H.SrcSpanInfo]
++                                  , x == f]
+ toTranslate _ _ = []
+ 
+ -- Create list of messages from a single file
diff --git a/p/haskell-hgettext/debian/patches/series b/p/haskell-hgettext/debian/patches/series
index 5552221..23ed1d6 100644
--- a/p/haskell-hgettext/debian/patches/series
+++ b/p/haskell-hgettext/debian/patches/series
@@ -1 +1,2 @@
 remove-useless-TemplateHaskell
+newer-src-exts

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