[agda] 02/04: Cherry-pick upstream patch to build with cpphs 1.19

[Iain Lane]

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

laney pushed a commit to branch master
in repository agda.

commit 570458a6b36d15c9c68e157ca99fa644eb3fdaf6
Author: Iain Lane <laney at debian.org>
Date:   Tue Aug 4 14:07:49 2015 +0100

    Cherry-pick upstream patch to build with cpphs 1.19
---
 debian/control                                     |  4 ++--
 .../0001-.cabal-Supporting-only-cpphs-1.19.patch   | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 0459eaf..9c32f0f 100644
--- a/debian/control
+++ b/debian/control
@@ -37,8 +37,8 @@ Build-Depends: debhelper (>= 9),
                libghc-text-dev (<< 1.3),
                libghc-quickcheck2-dev (>= 2.7.5),
                libghc-quickcheck2-dev (<< 2.8),
-               cpphs (>= 1.18.6),
-               cpphs (<< 1.19),
+               cpphs (>= 1.19),
+               cpphs (<< 1.20),
                happy (>= 1.19.3),
                happy (<< 2),
                alex (>= 3.1.0),
diff --git a/debian/patches/0001-.cabal-Supporting-only-cpphs-1.19.patch b/debian/patches/0001-.cabal-Supporting-only-cpphs-1.19.patch
new file mode 100644
index 0000000..bcc8cc8
--- /dev/null
+++ b/debian/patches/0001-.cabal-Supporting-only-cpphs-1.19.patch
@@ -0,0 +1,22 @@
+From f41911c09ee8f8c81bde21710cc7ce205cda02f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9s=20Sicard-Ram=C3=ADrez?= <asr at eafit.edu.co>
+Date: Mon, 30 Mar 2015 11:41:40 -0500
+Subject: [PATCH] [ .cabal ] Supporting only cpphs >= 1.19.
+
+---
+ Agda.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/Agda.cabal
+===================================================================
+--- a/Agda.cabal
++++ b/Agda.cabal
+@@ -408,7 +408,7 @@
+                     -fwarn-warnings-deprecations
+ 
+   if flag(cpphs)
+-    build-tools: cpphs >= 1.18.6 && < 1.19
++    build-tools: cpphs >= 1.19 && < 1.20
+     ghc-options: -pgmPcpphs -optP--cpp
+ 
+   -- The Cabal-generated module Paths_Agda triggers a warning under
diff --git a/debian/patches/series b/debian/patches/series
index 62c828c..030ccaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+0001-.cabal-Supporting-only-cpphs-1.19.patch
 hashtables-dep

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