haskell-warp: New upstream version 1.3.9.

4 files changed, 12 insertions, 48 deletions

diff --git a/p/haskell-warp/debian/changelog b/p/haskell-warp/debian/changelog
index d13eab0c3..2c257afc3 100644
--- a/p/haskell-warp/debian/changelog
+++ b/p/haskell-warp/debian/changelog
@@ -1,3 +1,9 @@
+haskell-warp (1.3.9-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint@debian.org>  Thu, 01 Aug 2013 21:46:04 -0400
+
 haskell-warp (1.3.7.4-4) unstable; urgency=low
 
   * On kFreeBSD, -DSENDFILEFD doesn't work; 'struct sf_hdtr' has no
diff --git a/p/haskell-warp/debian/control b/p/haskell-warp/debian/control
index c4fd05db0..c59a991ad 100644
--- a/p/haskell-warp/debian/control
+++ b/p/haskell-warp/debian/control
@@ -19,6 +19,8 @@ Build-Depends: debhelper (>= 9)
   , libghc-conduit-dev (>> 0.5)
   , libghc-conduit-dev (<< 1.1)
   , libghc-conduit-prof
+  , libghc-http-attoparsec-dev
+  , libghc-http-attoparsec-prof
   , libghc-http-types-dev (>> 0.7)
   , libghc-http-types-prof
   , libghc-lifted-base-dev (>> 0.1)
@@ -36,6 +38,8 @@ Build-Depends: debhelper (>= 9)
   , libghc-transformers-prof
   , libghc-unix-compat-dev (>> 0.2)
   , libghc-unix-compat-prof
+  , libghc-void-dev
+  , libghc-void-prof
   , libghc-wai-dev (>> 1.3)
   , libghc-wai-dev (<< 1.5)
   , libghc-wai-prof
@@ -48,6 +52,7 @@ Build-Depends-Indep: ghc-doc
   , libghc-blaze-builder-conduit-doc
   , libghc-case-insensitive-doc
   , libghc-conduit-doc
+  , libghc-http-attoparsec-doc
   , libghc-http-types-doc
   , libghc-lifted-base-doc
   , libghc-network-doc
@@ -55,6 +60,7 @@ Build-Depends-Indep: ghc-doc
   , libghc-simple-sendfile-doc
   , libghc-transformers-doc
   , libghc-unix-compat-doc
+  , libghc-void-doc
   , libghc-wai-doc
 Standards-Version: 3.9.4
 Homepage: http://hackage.haskell.org/package/warp
diff --git a/p/haskell-warp/debian/patches/kfreebsd.patch b/p/haskell-warp/debian/patches/kfreebsd.patch
deleted file mode 100644
index f14a243a9..000000000
--- a/p/haskell-warp/debian/patches/kfreebsd.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Add allow-sendfilefd flag for Debian GNU/kFreeBSD
- On Debian GNU/kFreeBSD (FreeBSD kernel plus glibc), the BSD flavour of
- sendfile is not usable, but Cabal treats kfreebsdgnu as os(freebsd) so I
- had to add a flag to simple-sendfile.cabal to make it possible to select
- the fallback implementation.  See
- https://github.com/kazu-yamamoto/simple-sendfile/pull/13 for more details.
- .
- warp.cabal reflects the availability of interfaces from simple-sendfile,
- and so I believe it needs a matching flag to make it possible to forcibly
- disable the use of -DSENDFILEFD.
-Author: Colin Watson <cjwatson@debian.org>
-Forwarded: https://github.com/yesodweb/wai/pull/164
-Last-Update: 2013-06-15
-
-Index: b/warp.cabal
-===================================================================
---- a/warp.cabal
-+++ b/warp.cabal
-@@ -20,6 +20,10 @@
- Flag network-bytestring
-     Default: False
-
-+Flag allow-sendfilefd
-+    Description: Allow use of sendfileFd (not available on GNU/kFreeBSD)
-+    Default:     True
-+
- Library
-   Build-Depends:     base                      >= 3        && < 5
-                    , blaze-builder             >= 0.2.1.4  && < 0.4
-@@ -53,7 +57,7 @@
-                      Network.Wai.Handler.Warp.Types
-                      Paths_warp
-   Ghc-Options:       -Wall
--  if os(linux) || os(freebsd) || os(darwin)
-+  if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
-       Cpp-Options:   -DSENDFILEFD
-       Build-Depends: hashable
-       Other-modules: Network.Wai.Handler.Warp.FdCache
-@@ -92,7 +96,7 @@
-     -- Yes, this means that the test suite will no longer work on Windows.
-     -- Unfortunately there is a bug in older versions of cabal, and this conditional
-     -- will therefore break older systems.
--  --if os(linux) || os(freebsd) || os(darwin)
-+  --if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
-     Cpp-Options:   -DSENDFILEFD
-     Build-Depends: unix
-                    , hashable
diff --git a/p/haskell-warp/debian/patches/series b/p/haskell-warp/debian/patches/series
deleted file mode 100644
index 26238c9c3..000000000
--- a/p/haskell-warp/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kfreebsd.patch