Agda: Upgrading from 2.5.2 to 2.5.3

4 files changed, 54 insertions, 26 deletions

diff --git a/p/agda/debian/changelog b/p/agda/debian/changelog
index 26899efe4..6efa44044 100644
--- a/p/agda/debian/changelog
+++ b/p/agda/debian/changelog
@@ -1,3 +1,11 @@
+agda (2.5.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Drop bump-ieee754-bounds.patch
+    Merged upstream.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Sat, 16 Sep 2017 12:53:41 -0700
+
 agda (2.5.2-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/p/agda/debian/control b/p/agda/debian/control
index 41c4014ce..0cb2cb235 100644
--- a/p/agda/debian/control
+++ b/p/agda/debian/control
@@ -14,6 +14,17 @@ Build-Depends:
  ghc (>= 8),
  happy,
  haskell-devscripts (>= 0.13),
+ ghc-prof,
+ libghc-edisoncore-dev (>= 1.3.1.1),
+ libghc-edisoncore-dev (<< 1.3.2),
+ libghc-edisoncore-prof,
+ libghc-async-dev (>= 2.0.2),
+ libghc-async-dev (<< 2.2),
+ libghc-async-prof,
+ libghc-blaze-html-dev (>= 0.8),
+ libghc-blaze-html-dev (<< 0.10),
+ libghc-blaze-html-prof,
+ libghc-boxes-dev (>= 0.1.3),
  libghc-boxes-dev (<< 0.2),
  libghc-boxes-dev (>= 0.1.3),
  libghc-data-hash-dev (<< 0.3),
@@ -21,7 +32,8 @@ Build-Depends:
  libghc-edison-core-dev (<< 1.3.2),
  libghc-edison-core-dev (>= 1.3.1.1),
  libghc-edit-distance-dev (<< 0.3),
- libghc-edit-distance-dev (>= 0.2.1.2),
+ libghc-edit-distance-prof,
+ libghc-equivalence-dev (>= 0.3.2),
  libghc-equivalence-dev (<< 0.4),
  libghc-equivalence-dev (>= 0.2.5),
  libghc-filemanip-dev (<< 0.4),
@@ -35,27 +47,46 @@ Build-Depends:
  libghc-hashtables-dev,
  libghc-ieee754-dev (<< 0.9),
  libghc-ieee754-dev (>= 0.7.8),
- libghc-monadplus-dev (<< 1.5),
+ libghc-ieee754-dev (<< 0.9),
+ libghc-ieee754-prof,
  libghc-monadplus-dev (>= 1.4),
+ libghc-monadplus-dev (<< 1.5),
+ libghc-monadplus-prof,
+ libghc-mtl-dev (>= 2.2.1),
+ libghc-mtl-dev (<< 2.3),
+ libghc-mtl-prof,
+ libghc-murmur-hash-dev (>= 0.1),
  libghc-murmur-hash-dev (<< 0.2),
  libghc-murmur-hash-dev (>= 0.1),
  libghc-mtl-dev,
  libghc-parallel-dev (<< 3.3),
  libghc-parallel-dev (>= 3.2.0.4),
  libghc-regex-tdfa-dev (<< 1.3),
- libghc-regex-tdfa-dev (>= 1.2.2),
- libghc-strict-dev (<< 0.4),
+ libghc-regex-tdfa-prof,
+ libghc-stm-dev (>= 2.4.4),
+ libghc-stm-dev (<< 2.5),
+ libghc-stm-prof,
  libghc-strict-dev (>= 0.3.2),
- libghc-transformers-compat-dev (<< 0.6),
- libghc-transformers-compat-dev (>= 0.3.3.3),
- libghc-transformers-dev,
- libghc-unordered-containers-dev (<< 0.3),
+ libghc-strict-dev (<< 0.4),
+ libghc-strict-prof,
+ libghc-text-dev (>= 0.11.3.1),
+ libghc-text-dev (<< 1.3),
+ libghc-text-prof,
  libghc-unordered-containers-dev (>= 0.2.5.0),
- libghc-zlib-dev (<< 0.7),
+ libghc-unordered-containers-dev (<< 0.3),
+ libghc-unordered-containers-prof,
+ libghc-uri-encode-dev (>= 1.5.0.4),
+ libghc-uri-encode-dev (<< 1.6),
+ libghc-uri-encode-prof,
  libghc-zlib-dev (>= 0.4.0.1),
- libncurses5-dev,
-Build-Depends-Indep:
- ghc-doc,
+ libghc-zlib-dev (<< 0.7),
+ libghc-zlib-prof,
+ alex,
+ happy,
+Build-Depends-Indep: ghc-doc,
+ libghc-edisoncore-doc,
+ libghc-async-doc,
+ libghc-blaze-html-doc,
  libghc-boxes-doc,
  libghc-data-hash-doc,
  libghc-edison-core-doc,
@@ -71,10 +102,11 @@ Build-Depends-Indep:
  libghc-murmur-hash-doc,
  libghc-parallel-doc,
  libghc-regex-tdfa-doc,
+ libghc-stm-doc,
  libghc-strict-doc,
- libghc-transformers-compat-doc,
- libghc-transformers-doc,
+ libghc-text-doc,
  libghc-unordered-containers-doc,
+ libghc-uri-encode-doc,
  libghc-zlib-doc,
 Standards-Version: 4.0.0
 Homepage: http://wiki.portal.chalmers.se/agda/
diff --git a/p/agda/debian/patches/bump-ieee754-bounds.patch b/p/agda/debian/patches/bump-ieee754-bounds.patch
deleted file mode 100644
index ebe0621fe..000000000
--- a/p/agda/debian/patches/bump-ieee754-bounds.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- agda-2.5.2.orig/Agda.cabal
-+++ agda-2.5.2/Agda.cabal
-@@ -160,7 +160,7 @@ library
-                 -- some cases.
-                 , hashtables >= 1.0.1.8 && < 1.2 || >= 1.2.0.2 && < 1.3
-                 , haskeline >= 0.7.1.3 && < 0.8
--                , ieee754 >= 0.7.8 && < 0.8
-+                , ieee754 >= 0.7.8 && < 0.9
-                 , monadplus >= 1.4 && < 1.5
-                 -- mtl-2.1 contains a severe bug.
-                 --
diff --git a/p/agda/debian/patches/series b/p/agda/debian/patches/series
index 89acf6d94..e69de29bb 100644
--- a/p/agda/debian/patches/series
+++ b/p/agda/debian/patches/series
@@ -1 +0,0 @@
-bump-ieee754-bounds.patch