[Pkg-haskell-commits] darcs: haskell-platform: Merge changelog entries.

[Joachim Breitner]

Sun May 13 09:40:42 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Merge changelog entries.
  Ignore-this: d90adb32e1b556f4848a9fb9effe235f

    M ./debian/changelog +13

Sun May 13 09:40:42 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Merge changelog entries.
  Ignore-this: d90adb32e1b556f4848a9fb9effe235f
diff -rN -u old-haskell-platform//debian/changelog new-haskell-platform//debian/changelog
--- old-haskell-platform//debian/changelog	2012-05-13 10:18:14.597635760 +0000
+++ new-haskell-platform//debian/changelog	2012-05-13 10:18:14.645539587 +0000
@@ -1,3 +1,16 @@
+haskell-platform (2012.1.0.0~debian2) unstable; urgency=low
+
+  * Bump stm, network, syb to converge to the version set that will be the
+    official platform 2012.2.0.0.
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 13 May 2012 11:38:16 +0200
+
+haskell-platform (2012.1.0.0~debian1) unstable; urgency=low
+
+  * Another unofficial release, supporting GHC 7.4.1's cabal version.
+
+ -- Iain Lane <laney at debian.org>  Wed, 18 Apr 2012 22:22:02 +0100
+
 haskell-platform (2012.1.0.0~debian) unstable; urgency=low
 
   * Unofficial release, to be able to install a platform on Debian with GHC