[Pkg-haskell-commits] [agda] 01/02: Fix dependency on hashtables

[Joachim Breitner]

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

nomeata pushed a commit to branch master
in repository agda.

commit a4109c2c88ab582bbc3141cd9a87373c3509c97b
Author: Joachim Breitner <nomeata at debian.org>
Date:   Wed Jul 1 19:26:20 2015 +0200

    Fix dependency on hashtables
---
 Agda.cabal                    |  3 ++-
 debian/changelog              |  6 ++++++
 debian/control                |  4 ++--
 debian/patches/hashtables-dep | 37 +++++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 5 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/Agda.cabal b/Agda.cabal
index 56c6023..47c0db6 100644
--- a/Agda.cabal
+++ b/Agda.cabal
@@ -98,7 +98,8 @@ library
     -- fixed in hashable 1.2.1.0.
     -- https://github.com/tibbe/hashable/issues/57.
     , hashable >= 1.1.2.3 && < 1.2 || >= 1.2.1.0 && < 1.3
-    , hashtables >= 1.0 && < 1.2
+    -- http://hackage.haskell.org/package/Agda-2.4.2.2/revisions/
+    , hashtables >=1.0 && <1.2 || >=1.2.0.2 && <1.3
     , haskeline >= 0.7 && < 0.8
     , haskell-src-exts >= 1.9.6 && < 1.17
     -- mtl-2.1 contains a severe bug.
diff --git a/debian/changelog b/debian/changelog
index af0a0f0..7f02ffa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+agda (2.4.2.2-3) UNRELEASED; urgency=medium
+
+  * Fix dependency on hashtables
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 01 Jul 2015 19:26:08 +0200
+
 agda (2.4.2.2-2) unstable; urgency=medium
 
   * [d5cf60f] Depend on ${shlibs:Depends}, to get libc (& maybe other) deps
diff --git a/debian/control b/debian/control
index 2f617bd..0459eaf 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Build-Depends: debhelper (>= 9),
                libghc-geniplate-dev (<< 0.7),
                libghc-hashable-dev (>= 1.2.1.0),
                libghc-hashable-dev (<< 1.3),
-               libghc-hashtables-dev (>= 1.0),
-               libghc-hashtables-dev (<< 1.2),
+               libghc-hashtables-dev (>= 1.2.0.2),
+               libghc-hashtables-dev (<< 1.3),
                libghc-mtl-dev (>= 2.1.1),
                libghc-mtl-dev (<< 2.1.3.2),
                libghc-parallel-dev (<< 3.3),
diff --git a/debian/patches/hashtables-dep b/debian/patches/hashtables-dep
new file mode 100644
index 0000000..df8711b
--- /dev/null
+++ b/debian/patches/hashtables-dep
@@ -0,0 +1,37 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ agda (2.4.2.2-3) unstable; urgency=medium
+ .
+   * Fix dependency on hashtables
+Author: Joachim Breitner <nomeata at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- agda-2.4.2.2.orig/Agda.cabal
++++ agda-2.4.2.2/Agda.cabal
+@@ -98,7 +98,8 @@ library
+     -- fixed in hashable 1.2.1.0.
+     -- https://github.com/tibbe/hashable/issues/57.
+     , hashable >= 1.1.2.3 && < 1.2 || >= 1.2.1.0 && < 1.3
+-    , hashtables >= 1.0 && < 1.2
++    -- http://hackage.haskell.org/package/Agda-2.4.2.2/revisions/
++    , hashtables >=1.0 && <1.2 || >=1.2.0.2 && <1.3
+     , haskeline >= 0.7 && < 0.8
+     , haskell-src-exts >= 1.9.6 && < 1.17
+     -- mtl-2.1 contains a severe bug.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..62c828c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+hashtables-dep

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