[Pkg-haskell-commits] [DHG_packages] 01/03: darcs: New upstream release

[Joachim Breitner]

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

nomeata pushed a commit to branch master
in repository DHG_packages.

commit 4f8a36927c89ef28b0a760deb4202d7125cf48d4
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Jul 15 19:08:08 2015 +0200

    darcs: New upstream release
---
 p/darcs/debian/changelog                         |  6 ++++
 p/darcs/debian/control                           |  4 +--
 p/darcs/debian/patches/avoid-TH-in-Setup         | 41 ++++++++++++++++++++++++
 p/darcs/debian/patches/relax-terminfo-dependency | 13 --------
 p/darcs/debian/patches/series                    |  2 +-
 5 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/p/darcs/debian/changelog b/p/darcs/debian/changelog
index fea514b..8b1fb22 100644
--- a/p/darcs/debian/changelog
+++ b/p/darcs/debian/changelog
@@ -1,3 +1,9 @@
+darcs (2.10.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 15 Jul 2015 19:11:47 +0200
+
 darcs (2.10.0-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/p/darcs/debian/control b/p/darcs/debian/control
index c8f528d..9e898e0 100644
--- a/p/darcs/debian/control
+++ b/p/darcs/debian/control
@@ -34,7 +34,7 @@ Build-Depends: cdbs, debhelper (>= 9), haskell-devscripts (>= 0.9),
  libghc-data-ordlist-dev (>= 0.4),
  libghc-data-ordlist-dev (<< 0.5),
  libghc-attoparsec-dev (>= 0.11),
- libghc-attoparsec-dev (<< 0.13),
+ libghc-attoparsec-dev (<< 0.14),
  libghc-zip-archive-dev (>= 0.2.3),
  libghc-zip-archive-dev (<< 0.3),
  libghc-text-dev (>= 0.11.2.0),
@@ -46,7 +46,7 @@ Build-Depends: cdbs, debhelper (>= 9), haskell-devscripts (>= 0.9),
  libghc-mmap-dev (>= 0.5),
  libghc-mmap-dev (<< 0.6),
  libghc-zlib-dev (>= 0.5.3.0),
- libghc-zlib-dev (<< 0.6.0.0),
+ libghc-zlib-dev (<< 0.7.0.0),
  libghc-dataenc-dev (>= 0.11),
  libghc-dataenc-dev (<< 0.15),
  libghc-unix-compat-dev (>= 0.1.2),
diff --git a/p/darcs/debian/patches/avoid-TH-in-Setup b/p/darcs/debian/patches/avoid-TH-in-Setup
new file mode 100644
index 0000000..4758429
--- /dev/null
+++ b/p/darcs/debian/patches/avoid-TH-in-Setup
@@ -0,0 +1,41 @@
+Index: darcs/Setup.lhs
+===================================================================
+--- darcs.orig/Setup.lhs	2015-07-09 18:48:56.000000000 +0200
++++ darcs/Setup.lhs	2015-07-15 19:07:44.318794915 +0200
+@@ -1,5 +1,4 @@
+ \begin{code}
+-{-# LANGUAGE TemplateHaskell #-}
+ -- copyright (c) 2008 Duncan Coutts
+ -- portions copyright (c) 2008 David Roundy
+ -- portions copyright (c) 2007-2009 Judah Jacobson
+@@ -81,17 +80,20 @@
+ catchAny f h = Exception.catch f (\e -> h (e :: Exception.SomeException))
+ 
+ {- Template Haskell hackery for replHook while we want to support Cabal < 1.18 -}
++{-
+ replVerbosity =
+   $(if cabalVersion >= Version [1,18,0] []
+         then varE (mkName "DSS.replVerbosity")
+         else [| error "This shouldn't be called" |]
+    )
++-}
+ 
+ replHookBody replHookSel =
+   \pkg lbi hooks flags args ->
+-    let verb = fromFlag $ replVerbosity flags
++    let verb = fromFlag $ DSS.replVerbosity flags
+     in commonBuildHook replHookSel pkg lbi hooks verb >>= (\f -> f flags args)
+ 
++{-
+ addReplHook =
+   $(if cabalVersion >= Version [1,18,0] []
+         then
+@@ -101,6 +103,8 @@
+                lamE [varP hooks] (recUpdE (varE hooks) [return (replHook, app)])
+         else [| \hooks -> hooks |]
+    )
++-}
++addReplHook = \hooks -> hooks { replHook = replHookBody replHook }
+ {- End of Template Haskell hackery -}
+ 
+ main :: IO ()
diff --git a/p/darcs/debian/patches/relax-terminfo-dependency b/p/darcs/debian/patches/relax-terminfo-dependency
deleted file mode 100644
index 7db1fbc..0000000
--- a/p/darcs/debian/patches/relax-terminfo-dependency
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: darcs-2.10.0/darcs.cabal
-===================================================================
---- darcs-2.10.0.orig/darcs.cabal	2015-05-25 12:04:42.223855913 +0200
-+++ darcs-2.10.0/darcs.cabal	2015-05-25 12:13:32.567727009 +0200
-@@ -501,7 +501,7 @@
-
-     -- The terminfo package cannot be built on Windows.
-     if flag(terminfo) && !os(windows)
--      build-depends:    terminfo == 0.3.*
-+      build-depends:    terminfo >= 0.3
-       cpp-options:      -DHAVE_TERMINFO
-
-     -- if true to work around cabal bug with flag ordering
diff --git a/p/darcs/debian/patches/series b/p/darcs/debian/patches/series
index f6a8538..ead731b 100644
--- a/p/darcs/debian/patches/series
+++ b/p/darcs/debian/patches/series
@@ -1,2 +1,2 @@
 use-sensible-editor
-relax-terminfo-dependency
+avoid-TH-in-Setup

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