haskell-yesod-test: staging conduit 1.1 transition

4 files changed, 87 insertions, 69 deletions

diff --git a/p/haskell-yesod-test/debian/changelog b/p/haskell-yesod-test/debian/changelog
index ce88bd6ad..434fa16e3 100644
--- a/p/haskell-yesod-test/debian/changelog
+++ b/p/haskell-yesod-test/debian/changelog
@@ -1,3 +1,9 @@
+haskell-yesod-test (1.2.2-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint@debian.org>  Sat, 07 Jun 2014 12:35:32 -0400
+
 haskell-yesod-test (1.2.1.5-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/p/haskell-yesod-test/debian/control b/p/haskell-yesod-test/debian/control
index 3846585b4..5ff92a99b 100644
--- a/p/haskell-yesod-test/debian/control
+++ b/p/haskell-yesod-test/debian/control
@@ -4,76 +4,76 @@ Section: haskell
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
 Uploaders: Clint Adams <clint@debian.org>
 Build-Depends: debhelper (>= 9)
-             , haskell-devscripts (>= 0.8.13)
-             , cdbs
-             , ghc
-             , ghc-prof
-             , libghc-attoparsec-dev (>> 0.10)
-             , libghc-attoparsec-prof
-             , libghc-blaze-builder-dev
-             , libghc-blaze-builder-prof
-             , libghc-blaze-html-dev (>> 0.5)
-             , libghc-blaze-html-prof
-             , libghc-blaze-markup-dev (>> 0.5.1)
-             , libghc-blaze-markup-prof
-             , libghc-case-insensitive-dev (>> 0.2)
-             , libghc-case-insensitive-prof
-             , libghc-cookie-dev
-             , libghc-cookie-prof
-             , libghc-hspec-dev (>> 1.4)
-             , libghc-hspec-prof
-             , libghc-html-conduit-dev (>> 1.0)
-             , libghc-html-conduit-prof
-             , libghc-http-types-dev (>> 0.7)
-             , libghc-http-types-prof
-             , libghc-hunit-dev (>> 1.2)
-             , libghc-hunit-prof
-             , libghc-monad-control-dev
-             , libghc-monad-control-prof
-             , libghc-network-dev (>> 2.2)
-             , libghc-network-prof
-             , libghc-persistent-dev (>> 1.0)
-             , libghc-persistent-prof
-             , libghc-text-dev
-             , libghc-text-prof
-             , libghc-transformers-dev (>> 0.2.2)
-             , libghc-transformers-prof
-             , libghc-wai-dev (>> 1.3)
-             , libghc-wai-prof
-             , libghc-wai-test-dev (>> 1.3)
-             , libghc-wai-test-prof
-             , libghc-xml-conduit-dev (>> 1.0)
-             , libghc-xml-conduit-prof
-             , libghc-xml-types-dev (>> 0.3)
-             , libghc-xml-types-prof
-             , libghc-yesod-core-dev (>> 1.2)
-             , libghc-yesod-core-prof
-             , libghc-wai-dev
-             , libghc-wai-prof
-             , libghc-yesod-form-dev
+  , haskell-devscripts (>= 0.8.13)
+  , cdbs
+  , ghc
+  , ghc-prof
+  , libghc-attoparsec-dev (>= 0.10)
+  , libghc-attoparsec-prof
+  , libghc-blaze-builder-dev
+  , libghc-blaze-builder-prof
+  , libghc-blaze-html-dev (>= 0.5)
+  , libghc-blaze-html-prof
+  , libghc-blaze-markup-dev (>= 0.5.1)
+  , libghc-blaze-markup-prof
+  , libghc-case-insensitive-dev (>= 0.2)
+  , libghc-case-insensitive-prof
+  , libghc-cookie-dev
+  , libghc-cookie-prof
+  , libghc-hspec-dev (>= 1.4)
+  , libghc-hspec-prof
+  , libghc-html-conduit-dev (>= 1.0)
+  , libghc-html-conduit-prof
+  , libghc-http-types-dev (>= 0.7)
+  , libghc-http-types-prof
+  , libghc-hunit-dev (>= 1.2)
+  , libghc-hunit-prof
+  , libghc-monad-control-dev
+  , libghc-monad-control-prof
+  , libghc-network-dev (>= 2.2)
+  , libghc-network-prof
+  , libghc-persistent-dev (>= 1.0)
+  , libghc-persistent-prof
+  , libghc-text-dev
+  , libghc-text-prof
+  , libghc-transformers-dev (>= 0.2.2)
+  , libghc-transformers-prof
+  , libghc-wai-dev (>= 1.3)
+  , libghc-wai-prof
+  , libghc-wai-extra-dev (>= 3.0)
+  , libghc-wai-extra-prof
+  , libghc-xml-conduit-dev (>= 1.0)
+  , libghc-xml-conduit-prof
+  , libghc-xml-types-dev (>= 0.3)
+  , libghc-xml-types-prof
+  , libghc-yesod-core-dev (>= 1.2)
+  , libghc-yesod-core-prof
+  , libghc-wai-dev
+  , libghc-wai-prof
+  , libghc-yesod-form-dev
 Build-Depends-Indep: ghc-doc
-                   , libghc-attoparsec-doc
-                   , libghc-blaze-builder-doc
-                   , libghc-blaze-html-doc
-                   , libghc-blaze-markup-doc
-                   , libghc-case-insensitive-doc
-                   , libghc-cookie-doc
-                   , libghc-hspec-doc
-                   , libghc-html-conduit-doc
-                   , libghc-http-types-doc
-                   , libghc-hunit-doc
-                   , libghc-monad-control-doc
-                   , libghc-network-doc
-                   , libghc-persistent-doc
-                   , libghc-text-doc
-                   , libghc-transformers-doc
-                   , libghc-wai-doc
-                   , libghc-wai-test-doc
-                   , libghc-xml-conduit-doc
-                   , libghc-xml-types-doc
-                   , libghc-yesod-core-doc
-                   , libghc-wai-doc
-Standards-Version: 3.9.4
+  , libghc-attoparsec-doc
+  , libghc-blaze-builder-doc
+  , libghc-blaze-html-doc
+  , libghc-blaze-markup-doc
+  , libghc-case-insensitive-doc
+  , libghc-cookie-doc
+  , libghc-hspec-doc
+  , libghc-html-conduit-doc
+  , libghc-http-types-doc
+  , libghc-hunit-doc
+  , libghc-monad-control-doc
+  , libghc-network-doc
+  , libghc-persistent-doc
+  , libghc-text-doc
+  , libghc-transformers-doc
+  , libghc-wai-doc
+  , libghc-wai-extra-doc
+  , libghc-xml-conduit-doc
+  , libghc-xml-types-doc
+  , libghc-yesod-core-doc
+  , libghc-wai-doc
+Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/yesod-test
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-yesod-test
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-yesod-test
diff --git a/p/haskell-yesod-test/debian/patches/no-wai-test.diff b/p/haskell-yesod-test/debian/patches/no-wai-test.diff
new file mode 100644
index 000000000..acc439669
--- /dev/null
+++ b/p/haskell-yesod-test/debian/patches/no-wai-test.diff
@@ -0,0 +1,11 @@
+--- a/yesod-test.cabal
++++ b/yesod-test.cabal
+@@ -19,7 +19,7 @@
+                    , persistent                >= 1.0
+                    , transformers              >= 0.2.2
+                    , wai                       >= 1.3
+-                   , wai-test                  >= 1.3
++                   , wai-extra                 >= 3.0
+                    , network                   >= 2.2
+                    , http-types                >= 0.7
+                    , HUnit                     >= 1.2
diff --git a/p/haskell-yesod-test/debian/patches/series b/p/haskell-yesod-test/debian/patches/series
new file mode 100644
index 000000000..191f029aa
--- /dev/null
+++ b/p/haskell-yesod-test/debian/patches/series
@@ -0,0 +1 @@
+no-wai-test.diff