[Pkg-haskell-commits] darcs: haskell-wai-test: Merge from unstable

[Joachim Breitner]

Mon Mar 11 13:29:21 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
  Ignore-this: ed8049890a72a8b6b83b97d3a64c2da1

    M ./changelog +24
    M ./control -2 +2

Mon Mar 11 13:29:21 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
  Ignore-this: ed8049890a72a8b6b83b97d3a64c2da1
diff -rN -u old-haskell-wai-test//changelog new-haskell-wai-test//changelog
--- old-haskell-wai-test//changelog	2013-03-11 13:29:37.350026085 +0000
+++ new-haskell-wai-test//changelog	2013-03-11 13:29:37.354024510 +0000
@@ -1,3 +1,27 @@
+haskell-wai-test (1.3.0.1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Fri, 08 Feb 2013 15:10:44 +0100
+
+haskell-wai-test (1.3.0-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 21:12:04 -0400
+
+haskell-wai-test (1.2.0.2-2) unstable; urgency=low
+
+  * Cater for bogus blaze-builder-conduit version
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 11 Mar 2013 13:35:59 +0100
+
 haskell-wai-test (1.2.0.2-1) unstable; urgency=low
 
   * New upstream version.
diff -rN -u old-haskell-wai-test//control new-haskell-wai-test//control
--- old-haskell-wai-test//control	2013-03-11 13:29:37.350026085 +0000
+++ new-haskell-wai-test//control	2013-03-11 13:29:37.358024191 +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 (<< 0.6)
   , libghc-blaze-builder-conduit-prof
   , libghc-case-insensitive-dev (>> 0.2)
   , libghc-case-insensitive-prof