[Pkg-haskell-commits] [SCM] Haskell Database Connectivity branch, master, updated. debian/2.2.6-4-4-g5e446ed

Clint Adams clint at debian.org
Sun Feb 12 22:57:54 UTC 2012


The following commit has been merged in the master branch:
commit 2fe35e611ba9d8ff8ebe9a2c5aa4b6e4d73d27fe
Author: Clint Adams <clint at debian.org>
Date:   Sun Feb 12 17:52:05 2012 -0500

    Drop 0001-Support-for-time-1.2.0.3.patch.

diff --git a/debian/patches/0001-Support-for-time-1.2.0.3.patch b/debian/patches/0001-Support-for-time-1.2.0.3.patch
deleted file mode 100644
index 7e46d33..0000000
--- a/debian/patches/0001-Support-for-time-1.2.0.3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Michael Snoyman <michael at snoyman.com>
-Date: Fri, 16 Jul 2010 10:41:41 +0300
-Subject: Support for time-1.2.0.3
-
----
- HDBC.cabal |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/HDBC.cabal b/HDBC.cabal
-index b7ce839..6036f35 100644
---- a/HDBC.cabal
-+++ b/HDBC.cabal
-@@ -1,5 +1,5 @@
- Name: HDBC
--Version: 2.2.6
-+Version: 2.2.6.1
- License: LGPL
- Maintainer: John Goerzen <jgoerzen at complete.org>
- Author: John Goerzen
-@@ -29,7 +29,7 @@ flag time_gte_113
- 
- library
-   if flag(splitBase)
--    Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4 && <=1.1.4, bytestring, containers, old-locale
-+    Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4 && <=1.2.0.3, bytestring, containers, old-locale
-     if flag(time_gte_113)
-       Build-Depends: time>=1.1.3
-       CPP-OPTIONS: -DTIME_GT_113
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ff09792..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Support-for-time-1.2.0.3.patch

-- 
Haskell Database Connectivity



More information about the Pkg-haskell-commits mailing list