[DHG_packages] 22/34: darcs: Bump bounds for newer directory

[Ilias Tsitsimpis]

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

iliastsi-guest pushed a commit to branch ghc-8.0.2
in repository DHG_packages.

commit d390579dee16deee20973e09ff72cded2d2073ad
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date:   Wed Jan 25 21:25:18 2017 +0200

    darcs: Bump bounds for newer directory
---
 p/darcs/debian/changelog                   |  6 ++++++
 p/darcs/debian/patches/avoid-TH-in-Setup   | 10 +++++-----
 p/darcs/debian/patches/newer-directory     | 27 +++++++++++++++++++++++++++
 p/darcs/debian/patches/series              |  1 +
 p/darcs/debian/patches/use-sensible-editor |  6 +++++-
 5 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/p/darcs/debian/changelog b/p/darcs/debian/changelog
index 2d4544a..b62be6d 100644
--- a/p/darcs/debian/changelog
+++ b/p/darcs/debian/changelog
@@ -1,3 +1,9 @@
+darcs (2.12.4-3) unstable; urgency=medium
+
+  * Bump bounds for newer directory, shipped with ghc-8.0.2.
+
+ -- Ilias Tsitsimpis <i.tsitsimpis at gmail.com>  Wed, 25 Jan 2017 19:42:03 +0200
+
 darcs (2.12.4-2) unstable; urgency=medium
 
   * Upload to unstable as part of GHC 8 transition.
diff --git a/p/darcs/debian/patches/avoid-TH-in-Setup b/p/darcs/debian/patches/avoid-TH-in-Setup
index 4758429..43cfe7f 100644
--- a/p/darcs/debian/patches/avoid-TH-in-Setup
+++ b/p/darcs/debian/patches/avoid-TH-in-Setup
@@ -1,14 +1,14 @@
-Index: darcs/Setup.lhs
+Index: b/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
+--- a/Setup.lhs
++++ b/Setup.lhs
 @@ -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 @@
+@@ -78,17 +77,20 @@ import qualified Control.Exception as Ex
  catchAny f h = Exception.catch f (\e -> h (e :: Exception.SomeException))
  
  {- Template Haskell hackery for replHook while we want to support Cabal < 1.18 -}
@@ -30,7 +30,7 @@ Index: darcs/Setup.lhs
  addReplHook =
    $(if cabalVersion >= Version [1,18,0] []
          then
-@@ -101,6 +103,8 @@
+@@ -98,6 +100,8 @@ addReplHook =
                 lamE [varP hooks] (recUpdE (varE hooks) [return (replHook, app)])
          else [| \hooks -> hooks |]
     )
diff --git a/p/darcs/debian/patches/newer-directory b/p/darcs/debian/patches/newer-directory
new file mode 100644
index 0000000..8ec4a32
--- /dev/null
+++ b/p/darcs/debian/patches/newer-directory
@@ -0,0 +1,27 @@
+Description: Bump bounds for newer directory
+ Bump bounds for directory 1.3.0.0, shipped with ghc-8.0.2.
+Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
+Origin: no
+
+Index: b/darcs.cabal
+===================================================================
+--- a/darcs.cabal
++++ b/darcs.cabal
+@@ -421,7 +421,7 @@ Library
+     -- release notes of GHC 7.10.2 recommends to use text >= 1.2.1.3:
+     -- https://mail.haskell.org/pipermail/haskell/2015-July/024641.html
+                      text         >= 1.2.1.3 && < 1.3,
+-                     directory    >= 1.2.0.1 && < 1.3.0.0,
++                     directory    >= 1.2.0.1 && < 1.4,
+                      process      >= 1.1.0.2 && < 1.5.0.0,
+                      array        >= 0.4.0.1 && < 0.6,
+                      random       >= 1.0.1.1 && < 1.2,
+@@ -572,7 +572,7 @@ test-suite darcs-test
+                    shelly       >= 1.6.2 && < 1.7,
+                    split        >= 0.2.2 && < 0.3,
+                    text         >= 1.2.1.3 && < 1.3,
+-                   directory    >= 1.2.0.1 && < 1.3.0.0,
++                   directory    >= 1.2.0.1 && < 1.4,
+                    FindBin      >= 0.0 && < 0.1,
+                    QuickCheck   >= 2.6 && < 2.10,
+                    HUnit        >= 1.2.5.2 && < 1.4,
diff --git a/p/darcs/debian/patches/series b/p/darcs/debian/patches/series
index ead731b..54702c0 100644
--- a/p/darcs/debian/patches/series
+++ b/p/darcs/debian/patches/series
@@ -1,2 +1,3 @@
 use-sensible-editor
 avoid-TH-in-Setup
+newer-directory
diff --git a/p/darcs/debian/patches/use-sensible-editor b/p/darcs/debian/patches/use-sensible-editor
index e4274ae..7b4433b 100644
--- a/p/darcs/debian/patches/use-sensible-editor
+++ b/p/darcs/debian/patches/use-sensible-editor
@@ -9,6 +9,8 @@ Description:    use editor(1) and pager(1) instead of specific editors/pagers.
  uncheck the "standard" tasksel task.
  .
  Not forwarded because editor(1) and pager(1) are Debian-specific.
+Index: b/src/Darcs/UI/External.hs
+===================================================================
 --- a/src/Darcs/UI/External.hs
 +++ b/src/Darcs/UI/External.hs
 @@ -432,6 +432,7 @@ viewDocWith pr mode msg = do
@@ -40,9 +42,11 @@ Description:    use editor(1) and pager(1) instead of specific editors/pagers.
  
  catchall :: IO a
           -> IO a
+Index: b/src/Darcs/UI/Commands/Help.hs
+===================================================================
 --- a/src/Darcs/UI/Commands/Help.hs
 +++ b/src/Darcs/UI/Commands/Help.hs
-@@ -400,15 +400,13 @@ environmentHelpEditor = (["DARCS_EDITOR"
+@@ -399,15 +399,13 @@ environmentHelpEditor = (["DARCS_EDITOR"
   "To edit a patch description of email comment, Darcs will invoke an",
   "external editor.  Your preferred editor can be set as any of the",
   "environment variables $DARCS_EDITOR, $DARCSEDITOR, $VISUAL or $EDITOR.",

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