[Pkg-haskell-commits] darcs: haskell-warp: Merge from unstable

[Joachim Breitner]

Mon Mar 11 13:32:04 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
  Ignore-this: 57f63d05e428bb7808f279728c65550a

    M ./changelog +36
    M ./control -4 +4

Mon Mar 11 13:32:04 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
  Ignore-this: 57f63d05e428bb7808f279728c65550a
diff -rN -u old-haskell-warp//changelog new-haskell-warp//changelog
--- old-haskell-warp//changelog	2013-03-11 13:32:16.279260609 +0000
+++ new-haskell-warp//changelog	2013-03-11 13:32:16.283182680 +0000
@@ -1,3 +1,39 @@
+haskell-warp (1.3.7.4-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Mon, 25 Feb 2013 23:46:30 -0500
+
+haskell-warp (1.3.7.2-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 07 Feb 2013 21:00:55 +0100
+
+haskell-warp (1.3.4.4-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Sat, 17 Nov 2012 20:32:40 -0500
+
+haskell-warp (1.3.4.1-1) experimental; urgency=low
+
+  [ Joachim Breitner ]
+  * Depend on haskell-devscripts 0.8.13 to ensure this package is built
+    against experimental
+  * Bump standards version, no change
+
+  [ Clint Adams ]
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Sat, 20 Oct 2012 14:59:11 -0400
+
+haskell-warp (1.2.1.1-2) unstable; urgency=low
+
+  * Cater for bogus blaze-builder-conduit version
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 11 Mar 2013 13:54:25 +0100
+
 haskell-warp (1.2.1.1-1) unstable; urgency=low
 
   * New upstream version.
diff -rN -u old-haskell-warp//control new-haskell-warp//control
--- old-haskell-warp//control	2013-03-11 13:32:16.271024545 +0000
+++ new-haskell-warp//control	2013-03-11 13:32:16.283182680 +0000
@@ -11,8 +11,8 @@
   , libghc-blaze-builder-dev (>> 0.2.1.4)
   , libghc-blaze-builder-dev (<< 0.4)
   , libghc-blaze-builder-prof
-  , libghc-blaze-builder-conduit-dev (>> 0.4)
-  , libghc-blaze-builder-conduit-dev (<< 0.5)
+  , libghc-blaze-builder-conduit-dev (>> 0.5)
+  , libghc-blaze-builder-conduit-dev (<< 1.1)
   , libghc-blaze-builder-conduit-prof
   , libghc-case-insensitive-dev (>> 0.2)
   , libghc-case-insensitive-prof
@@ -25,8 +25,8 @@
   , libghc-lifted-base-prof
   , libghc-network-dev (>> 2.3)
   , libghc-network-prof
-  , libghc-network-conduit-dev (>> 0.4)
-  , libghc-network-conduit-dev (<< 0.5)
+  , libghc-network-conduit-dev (>> 0.5)
+  , libghc-network-conduit-dev (<< 1.1)
   , libghc-network-conduit-prof
   , libghc-simple-sendfile-dev (>> 0.2.7)
   , libghc-simple-sendfile-dev (<< 0.3)