[Pkg-haskell-commits] [SCM] Data type conversions branch, master, updated. debian/1.0.9-4-6-gfaf7cb1

[Clint Adams]

The following commit has been merged in the master branch:
commit 150741d49d9f682b19699392fc6887258a9e8cd0
Author: Clint Adams <clint at debian.org>
Date:   Sat Sep 10 17:41:32 2011 -0400

    Update 0001-Relax-build-dependency-on-time.patch for new version.

diff --git a/debian/patches/0001-Relax-build-dependency-on-time.patch b/debian/patches/0001-Relax-build-dependency-on-time.patch
index bada8f8..2ac2c27 100644
--- a/debian/patches/0001-Relax-build-dependency-on-time.patch
+++ b/debian/patches/0001-Relax-build-dependency-on-time.patch
@@ -8,17 +8,14 @@ GHC's version works fine.
  convertible.cabal |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/convertible.cabal b/convertible.cabal
-index b5fb604..ba4baa4 100644
 --- a/convertible.cabal
 +++ b/convertible.cabal
-@@ -50,7 +50,7 @@ flag time_gte_113
+@@ -50,7 +50,7 @@
  
  library
    if flag(splitBase)
--    Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4 && <=1.1.4,
+-    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,
       bytestring, containers, old-locale
      if flag(time_gte_113)
        Build-Depends: time>=1.1.3
--- 

-- 
Data type conversions