[Pkg-haskell-commits] darcs: haskell-http-conduit: Merge from unstable

[Joachim Breitner]

Sun Mar 10 21:13:50 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
  Ignore-this: f22b2a612987711d37767708cee5244e

    M ./changelog +47
    M ./control -2 +1

Sun Mar 10 21:13:50 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
  Ignore-this: f22b2a612987711d37767708cee5244e
diff -rN -u old-haskell-http-conduit//changelog new-haskell-http-conduit//changelog
--- old-haskell-http-conduit//changelog	2013-03-10 21:14:31.707088505 +0000
+++ new-haskell-http-conduit//changelog	2013-03-10 21:14:31.711046875 +0000
@@ -1,3 +1,50 @@
+haskell-http-conduit (1.9.0-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Mon, 25 Feb 2013 23:26:17 -0500
+
+haskell-http-conduit (1.8.7.1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 07 Feb 2013 20:56:38 +0100
+
+haskell-http-conduit (1.8.3-2) experimental; urgency=low
+
+  * Rebuild, no change
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 07 Feb 2013 20:37:08 +0100
+
+haskell-http-conduit (1.8.3-1) experimental; urgency=low
+
+  * New upstream version.
+  * Enable test suite.
+
+ -- Clint Adams <clint at debian.org>  Sat, 17 Nov 2012 21:55:29 -0500
+
+haskell-http-conduit (1.6.1.2-1) experimental; urgency=low
+
+  [ Giovanni Mascellani ]
+  * Team upload.
+  * Fix Homepage: link
+
+  [ Joachim Breitner ]
+  * Depend on haskell-devscripts 0.8.13 to ensure this packages is built
+    against experimental
+  * Bump standards version, no change
+
+  [ Clint Adams ]
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Sat, 20 Oct 2012 20:39:46 -0400
+
+haskell-http-conduit (1.4.1.6-2) unstable; urgency=low
+
+  * Allow strange version in libghc-blaze-builder-conduit-dev dependency 
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 10 Mar 2013 22:00:03 +0100
+
 haskell-http-conduit (1.4.1.6-1) unstable; urgency=low
 
   * New upstream version.
diff -rN -u old-haskell-http-conduit//control new-haskell-http-conduit//control
--- old-haskell-http-conduit//control	2013-03-10 21:14:31.695022992 +0000
+++ new-haskell-http-conduit//control	2013-03-10 21:14:31.711046875 +0000
@@ -18,8 +18,7 @@
   , libghc-base64-bytestring-prof
   , libghc-blaze-builder-dev (>> 0.2.1)
   , 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-prof
   , libghc-case-insensitive-dev (>> 0.2)
   , libghc-case-insensitive-prof