[Pkg-haskell-commits] [SCM] Data type conversions branch, master, updated. debian/1.0.11.0-2-1-g62cac71

[Clint Adams]

The following commit has been merged in the master branch:
commit 62cac71ed73ebb1774b3bd4688bfc024728ef790
Author: Clint Adams <clint at debian.org>
Date:   Thu Feb 9 15:31:48 2012 -0500

    Update 0001-Relax-build-dependency-on-time.patch for GHC 7.4.1.

diff --git a/debian/changelog b/debian/changelog
index 857ab78..6f8ae64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+haskell-convertible (1.0.11.0-3) unstable; urgency=low
+
+  * Update 0001-Relax-build-dependency-on-time.patch for GHC 7.4.1.
+
+ -- Clint Adams <clint at debian.org>  Thu, 09 Feb 2012 15:31:19 -0500
+
 haskell-convertible (1.0.11.0-2) unstable; urgency=low
 
   * Add necessary haskell subst variables 
diff --git a/debian/patches/0001-Relax-build-dependency-on-time.patch b/debian/patches/0001-Relax-build-dependency-on-time.patch
index 2ac2c27..c39a47e 100644
--- a/debian/patches/0001-Relax-build-dependency-on-time.patch
+++ b/debian/patches/0001-Relax-build-dependency-on-time.patch
@@ -15,7 +15,7 @@ GHC's version works fine.
  library
    if flag(splitBase)
 -    Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4 && <=1.2.0.5,
-+    Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4 && <1.3.0.0,
++    Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4 && <1.4.1.0,
       bytestring, containers, old-locale
      if flag(time_gte_113)
        Build-Depends: time>=1.1.3

-- 
Data type conversions