From 0708afb764c061ffd2b667a15d10ea7deaf7b660 Mon Sep 17 00:00:00 2001
From: Giovanni Mascellani <gio@debian.org>
Date: Thu, 10 May 2012 01:33:39 +0400
Subject: haskell-filestore: Remove patch that fix dependencies in .cabal
 (merged upstream).

---
 p/haskell-filestore/debian/changelog           |  1 +
 p/haskell-filestore/debian/patches/ghc741.diff | 24 ------------------------
 p/haskell-filestore/debian/patches/series      |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 p/haskell-filestore/debian/patches/ghc741.diff
 delete mode 100644 p/haskell-filestore/debian/patches/series

(limited to 'p/haskell-filestore')

diff --git a/p/haskell-filestore/debian/changelog b/p/haskell-filestore/debian/changelog
index d3124ab88..e152c2742 100644
--- a/p/haskell-filestore/debian/changelog
+++ b/p/haskell-filestore/debian/changelog
@@ -3,6 +3,7 @@ haskell-filestore (0.4.2-1) UNRELEASED; urgency=low
   * New upstream release.
   * Fix some lintian warnings.
   * Slight updates in debian/copyright.
+  * Remove patch that fix dependencies in .cabal (merged upstream).
 
  -- Giovanni Mascellani <gio@debian.org>  Wed, 09 May 2012 23:07:46 +0200
 
diff --git a/p/haskell-filestore/debian/patches/ghc741.diff b/p/haskell-filestore/debian/patches/ghc741.diff
deleted file mode 100644
index 05fc8ca6a..000000000
--- a/p/haskell-filestore/debian/patches/ghc741.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/filestore.cabal
-+++ b/filestore.cabal
-@@ -34,11 +34,11 @@
-     Build-depends:       base >= 4 && < 5,
-                          bytestring >= 0.9 && < 1.0,
-                          utf8-string >= 0.3 && < 0.4,
--                         filepath >= 1.1 && < 1.3,
-+                         filepath >= 1.1 && < 1.4,
-                          directory >= 1.0 && < 1.2,
-                          parsec >= 2 && < 3.2,
-                          process >= 1.0 && < 1.2,
--                         time >= 1.1 && < 1.3,
-+                         time >= 1.1 && < 1.5,
-                          xml >= 1.3 && < 1.4,
-                          split >= 0.1 && < 0.2,
-                          Diff >= 0.1.2 && < 0.2,
-@@ -48,6 +48,7 @@
-                          -- Data.FileStore.Sqlite3,
-                          Data.FileStore.Utils, Data.FileStore.Generic
-     Other-modules:       Paths_filestore, Data.FileStore.DarcsXml
-+    extensions:          FlexibleInstances
-
-     if flag(maxcount)
-         cpp-options: -DUSE_MAXCOUNT
diff --git a/p/haskell-filestore/debian/patches/series b/p/haskell-filestore/debian/patches/series
deleted file mode 100644
index a257eeac0..000000000
--- a/p/haskell-filestore/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-ghc741.diff
-- 
cgit v1.2.3