[Pkg-haskell-commits] darcs: haskell-diagrams-lib: Merge

[Joachim Breitner]

Wed Jun  4 10:55:25 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Merge

    M ./changelog +13

Wed Jun  4 10:55:25 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Merge
diff -rN -u old-haskell-diagrams-lib/changelog new-haskell-diagrams-lib/changelog
--- old-haskell-diagrams-lib/changelog	2014-06-04 10:59:19.330481455 +0000
+++ new-haskell-diagrams-lib/changelog	2014-06-04 10:59:19.338481453 +0000
@@ -1,3 +1,16 @@
+haskell-diagrams-lib (1.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 04 Jun 2014 12:36:33 +0200
+
+haskell-diagrams-lib (1.1.0.6-2) unstable; urgency=medium
+
+  * Depend on ghc-ghci, as diagrams-lib now uses Template Haskell features (in
+    particular makeLenses)
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 18 May 2014 00:35:17 +0200
+
 haskell-diagrams-lib (1.1.0.6-1) unstable; urgency=medium
 
   * New upstream release