haskell-fb: staging conduit 1.1 transition

4 files changed, 12 insertions, 48 deletions

diff --git a/p/haskell-fb/debian/changelog b/p/haskell-fb/debian/changelog
index 9b99e7cfd..02c5a883d 100644
--- a/p/haskell-fb/debian/changelog
+++ b/p/haskell-fb/debian/changelog
@@ -1,3 +1,9 @@
+haskell-fb (1.0.1-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint@debian.org>  Fri, 06 Jun 2014 23:15:19 -0400
+
 haskell-fb (0.15.2-2) unstable; urgency=medium
 
   * Fix dependency on data-default-instances-base
diff --git a/p/haskell-fb/debian/control b/p/haskell-fb/debian/control
index 1eba890b4..bf954d941 100644
--- a/p/haskell-fb/debian/control
+++ b/p/haskell-fb/debian/control
@@ -14,9 +14,6 @@ Build-Depends: debhelper (>= 9)
   , libghc-attoparsec-dev (>= 0.10.4)
   , libghc-attoparsec-dev (<< 0.12)
   , libghc-attoparsec-prof
-  , libghc-attoparsec-conduit-dev (>= 1.0)
-  , libghc-attoparsec-conduit-dev (<< 1.1)
-  , libghc-attoparsec-conduit-prof
   , libghc-base16-bytestring-dev (>= 0.1)
   , libghc-base16-bytestring-prof
   , libghc-base64-bytestring-dev (>= 0.1.1)
@@ -24,8 +21,8 @@ Build-Depends: debhelper (>= 9)
   , libghc-cereal-dev (>= 0.3)
   , libghc-cereal-dev (<< 0.5)
   , libghc-cereal-prof
-  , libghc-conduit-dev (>= 1.0)
-  , libghc-conduit-dev (<< 1.1)
+  , libghc-conduit-dev (>= 1.1)
+  , libghc-conduit-dev (<< 1.2)
   , libghc-conduit-prof
   , libghc-crypto-api-dev (>= 0.11)
   , libghc-crypto-api-dev (<< 0.14)
@@ -35,12 +32,10 @@ Build-Depends: debhelper (>= 9)
   , libghc-cryptohash-cryptoapi-dev (>= 0.1)
   , libghc-cryptohash-cryptoapi-dev (<< 0.2)
   , libghc-cryptohash-cryptoapi-prof
-  , libghc-data-default-class-dev
-  , libghc-data-default-class-prof
-  , libghc-data-default-instances-base-dev
-  , libghc-data-default-instances-base-prof
+  , libghc-data-default-dev
+  , libghc-data-default-prof
   , libghc-http-conduit-dev (>= 2.0)
-  , libghc-http-conduit-dev (<< 2.1)
+  , libghc-http-conduit-dev (<< 2.2)
   , libghc-http-conduit-prof
   , libghc-http-types-dev
   , libghc-http-types-prof
@@ -57,7 +52,7 @@ Build-Depends: debhelper (>= 9)
   , libghc-text-dev (<< 1.2)
   , libghc-text-prof
   , libghc-transformers-dev (>= 0.2)
-  , libghc-transformers-dev (<< 0.4)
+  , libghc-transformers-dev (<< 0.5)
   , libghc-transformers-prof
   , libghc-transformers-base-dev
   , libghc-transformers-base-prof
@@ -70,7 +65,6 @@ Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: ghc-doc
   , libghc-aeson-doc
   , libghc-attoparsec-doc
-  , libghc-attoparsec-conduit-doc
   , libghc-base16-bytestring-doc
   , libghc-base64-bytestring-doc
   , libghc-cereal-doc
diff --git a/p/haskell-fb/debian/patches/newer-data-default.diff b/p/haskell-fb/debian/patches/newer-data-default.diff
deleted file mode 100644
index 581126a01..000000000
--- a/p/haskell-fb/debian/patches/newer-data-default.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/src/Facebook/Base.hs
-+++ b/src/Facebook/Base.hs
-@@ -15,7 +15,7 @@
- import Control.Monad (mzero)
- import Control.Monad.IO.Class (MonadIO)
- import Data.ByteString.Char8 (ByteString)
--import Data.Default (def)
-+import Data.Default.Class (def)
- import Data.Text (Text)
- import Data.Typeable (Typeable)
-
---- a/fb.cabal
-+++ b/fb.cabal
-@@ -72,7 +72,8 @@
-     , monad-control
-     , resourcet
-     , conduit              == 1.0.*
--    , data-default
-+    , data-default-class
-+    , data-default-instances-base
-     , http-types
-     , http-conduit         == 2.0.*
-     , attoparsec           >= 0.10.4  && < 0.12
---- a/src/Facebook/TestUsers.hs
-+++ b/src/Facebook/TestUsers.hs
-@@ -14,7 +14,8 @@
- import Control.Applicative ((<$>), (<*>))
- import Control.Monad (unless, mzero)
- import Control.Monad.Trans.Control (MonadBaseControl)
--import Data.Default
-+import Data.Default.Class
-+import Data.Default.Instances.Base ()
- import Data.Text
- import Data.Time (UTCTime(..), Day(..))
- import Data.Typeable (Typeable)
diff --git a/p/haskell-fb/debian/patches/series b/p/haskell-fb/debian/patches/series
deleted file mode 100644
index 62183b95d..000000000
--- a/p/haskell-fb/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-data-default.diff