[Pkg-haskell-commits] darcs: xmonad: Merge changes

[Joachim Breitner]

Tue Jan  1 15:37:33 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge changes
  Ignore-this: 825739b76dbcb83922ea030162b1dce7

    M ./changelog -1 +7
    M ./control +6

Tue Jan  1 15:37:33 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge changes
  Ignore-this: 825739b76dbcb83922ea030162b1dce7
diff -rN -u old-xmonad//changelog new-xmonad//changelog
--- old-xmonad//changelog	2013-01-01 16:00:49.910719231 +0000
+++ new-xmonad//changelog	2013-01-01 16:00:49.914721538 +0000
@@ -4,7 +4,13 @@
   * Change VCS fields back to regular
   * New upstream release
 
- -- Joachim Breitner <nomeata at debian.org>  Tue, 16 Oct 2012 10:01:23 +0200
+  [ Ryan Kavanagh ]
+  * Don't run GenerateManpage with runghc at build time, fixes FTBFS on
+    architectures without ghci.
+  * Build-depend on libghc-extensible-exceptions-* now that it's no longer
+    bundled in ghc
+
+ -- Joachim Breitner <nomeata at debian.org>  Tue, 01 Jan 2013 16:31:57 +0100
 
 xmonad (0.10.1~darcs20120707-2) experimental; urgency=low
 
diff -rN -u old-xmonad//control new-xmonad//control
--- old-xmonad//control	2013-01-01 16:00:49.906723896 +0000
+++ new-xmonad//control	2013-01-01 16:00:49.926723403 +0000
@@ -17,6 +17,12 @@
  libghc-x11-prof,
  libghc-mtl-dev,
  libghc-mtl-prof,
+ libghc-extensible-exceptions-dev,
+ libghc-extensible-exceptions-doc,
+ libghc-extensible-exceptions-prof,
+ libghc-utf8-string-dev (>= 0.3),
+ libghc-utf8-string-dev (<< 0.4),
+ libghc-utf8-string-prof,
  libghc-pandoc-dev,
  libghc-regex-posix-dev,
  pandoc