[Git][haskell-team/DHG_packages][master] hgettext: Upgrading from 0.1.30 to 0.1.31.0

[Clint Adams]

Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
b52d9457 by Clint Adams at 2018-04-15T11:10:16-04:00
hgettext: Upgrading from 0.1.30 to 0.1.31.0

- - - - -


5 changed files:

- p/haskell-hgettext/debian/changelog
- p/haskell-hgettext/debian/control
- − p/haskell-hgettext/debian/patches/newer-src-exts
- − p/haskell-hgettext/debian/patches/remove-useless-TemplateHaskell
- − p/haskell-hgettext/debian/patches/series


Changes:

=====================================
p/haskell-hgettext/debian/changelog
=====================================
--- a/p/haskell-hgettext/debian/changelog
+++ b/p/haskell-hgettext/debian/changelog
@@ -1,3 +1,9 @@
+haskell-hgettext (0.1.31.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint at debian.org>  Sun, 15 Apr 2018 11:07:05 -0400
+
 haskell-hgettext (0.1.30-16) unstable; urgency=medium
 
   [ Ilias Tsitsimpis ]


=====================================
p/haskell-hgettext/debian/control
=====================================
--- a/p/haskell-hgettext/debian/control
+++ b/p/haskell-hgettext/debian/control
@@ -10,10 +10,13 @@ Build-Depends:
  ghc (>= 8),
  ghc-prof,
  haskell-devscripts (>= 0.13),
- libghc-setlocale-dev,
+ libghc-setlocale-dev (>= 0.0.3),
+ libghc-setlocale-dev (<< 1.1),
  libghc-setlocale-prof,
  libghc-src-exts-dev (>= 1.18),
- libghc-uniplate-dev,
+ libghc-src-exts-dev (<< 1.21),
+ libghc-uniplate-dev (>= 1.6.12),
+ libghc-uniplate-dev (<< 1.7),
 Build-Depends-Indep:
  ghc-doc,
  libghc-setlocale-doc,


=====================================
p/haskell-hgettext/debian/patches/newer-src-exts deleted
=====================================
--- a/p/haskell-hgettext/debian/patches/newer-src-exts
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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


=====================================
p/haskell-hgettext/debian/patches/remove-useless-TemplateHaskell deleted
=====================================
--- a/p/haskell-hgettext/debian/patches/remove-useless-TemplateHaskell
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Remove unnecessary use of the TemplateHaskell extension
- The patch is not submitted upstream, as the change is very
- simple. The bug has been reported upstream, though.
-Bug: https://github.com/vasylp/hgettext/issues/9
-Origin: commit:586e11c10910538ae754e25e3f426f82fd0770b9
-Forwarded: no
-Author: Joachim Breitner <nomeata at debian.org>
-Reviewed-by: Sven Bartscher <sven.bartscher at weltraumschlangen.de>
-Last-Update: 2015-12-27
-
-Index: hgettext-0.1.30/hgettext.cabal
-===================================================================
---- hgettext-0.1.30.orig/hgettext.cabal	2015-06-15 22:26:25.801060283 +0200
-+++ hgettext-0.1.30/hgettext.cabal	2015-06-15 22:27:57.632493244 +0200
-@@ -24,7 +24,6 @@
- 
- Executable hgettext
-         Main-Is:                hgettext.hs
--        Extensions:             TemplateHaskell
-         Hs-Source-Dirs:         src        
-         Build-Depends:          base>=3.0.3.0 && <5, uniplate, haskell-src-exts
-         Other-Modules:          Paths_hgettext


=====================================
p/haskell-hgettext/debian/patches/series deleted
=====================================
--- a/p/haskell-hgettext/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-remove-useless-TemplateHaskell
-newer-src-exts



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/b52d945738d30b9a5ef3d19b00cb1acfe61ecda8

---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/b52d945738d30b9a5ef3d19b00cb1acfe61ecda8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180415/7f943426/attachment-0001.html>