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

[Joachim Breitner]

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

    M ./changelog +34

Mon Mar 11 13:31:14 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
  Ignore-this: aa61258fa1a94fcf935473876768bad
diff -rN -u old-haskell-network-conduit//changelog new-haskell-network-conduit//changelog
--- old-haskell-network-conduit//changelog	2013-03-11 13:31:21.279022440 +0000
+++ new-haskell-network-conduit//changelog	2013-03-11 13:31:21.283086184 +0000
@@ -1,3 +1,37 @@
+haskell-network-conduit (1.0.0-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Mon, 25 Feb 2013 23:34:57 -0500
+
+haskell-network-conduit (0.6.1.1-2) experimental; urgency=low
+
+  * Actually upload to experimental this time.
+
+ -- Clint Adams <clint at debian.org>  Sat, 10 Nov 2012 13:14:59 -0500
+
+haskell-network-conduit (0.6.1.1.is.really.0.4.0.1-1) unstable; urgency=low
+
+  * Revert accidential upload to version in testing 
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 11 Mar 2013 13:57:58 +0100
+
+haskell-network-conduit (0.6.1.1-1) unstable; urgency=low
+
+  [ Giovanni Mascellani ]
+  * Team upload.
+  * Fix Homepage: link
+
+  [ 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 10:12:47 -0400
+
 haskell-network-conduit (0.4.0.1-2) unstable; urgency=low
 
   * Disable test suite.