[Pkg-haskell-commits] darcs: ghc: Try to merge from experimental branch

[Joachim Breitner]

Sat Nov 19 17:15:36 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Try to merge from experimental branch
  Ignore-this: 1611004890eb791c22f6cb5eea5cd7d

    M ./changelog -2 +51
    M ./patches/series -1 +2

Sat Nov 19 17:15:36 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Try to merge from experimental branch
  Ignore-this: 1611004890eb791c22f6cb5eea5cd7d
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2012-02-03 16:37:32.418282073 +0000
+++ new-ghc//changelog	2012-02-03 16:37:34.986251606 +0000
@@ -1,9 +1,58 @@
-ghc (7.0.4-5) UNRELEASED; urgency=low
+ghc (7.2.0.20110728-1) UNRELEASED; urgency=low
+
+  * Install 7.2.1-rc1 to experimental. 
+  * Undo the symlink-workarounds introduced in 7.0.4-3. The -doc work-around
+    is still needed, as the haddock interface version did not change.
+
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 30 Jul 2011 16:09:07 +0200
+
+ghc (7.0.4-9) UNRELEASED; urgency=low
+
+  * Suggest llvm package
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 10 Nov 2011 19:19:41 +0100
+
+ghc (7.0.4-8) unstable; urgency=low
+
+  * Remove ghci support on powerpc (Closes: #631073)
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 30 Oct 2011 17:56:23 +0100
+
+ghc (7.0.4-7) unstable; urgency=low
+
+  [ Joachim Breitner ]
+  * patches/configure-s390x: Add s390x to the list of known architectures.
+  * add armhf in debian/rules (Patch by Riku Voipio, Closes: #640811)
+
+  [ Iain Lane ]
+  * Handle linker scripts for which dlopen returns "file too short" and/or
+    which contain INPUT statements (for example libncurses.so) (Closes:
+    #644591)
+  * Standards-Version → 3.9.2, no changes required 
+
+ -- Iain Lane <laney at debian.org>  Tue, 18 Oct 2011 17:09:39 +0100
+
+ghc (7.0.4-6) unstable; urgency=low
+
+  * Fix #609445 by actually removing the patch for #566331, not needed any
+    more since this upstream commit:
+
+      Sat Jul 31 12:55:06 BST 2010  Ian Lynagh <igloo at earth.li>
+      * Expose the functions haddock needs even when haddock is disabled; #3558
+
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 31 Aug 2011 08:44:33 +0200
+
+
+ghc (7.0.4-5) unstable; urgency=low
 
   * Remove ghc-doc dependency on ghc, it did not have the desired effect.
     Instead call ghc-pkg recache in ghc-doc’s trigger as well. 
+  * Fix missing instance documentation (Closes: #609445)
+    This was a Debian-specific regression, introduced in the fix for #566331
+    or later caused by it, and fixed by building haddock with -DGHCI.
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 23 Jul 2011 09:29:41 +0200
+ -- Joachim Breitner <nomeata at debian.org>  Tue, 30 Aug 2011 21:48:43 +0200
 
 ghc (7.0.4-4) unstable; urgency=low
 
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2012-02-03 16:37:32.353780610 +0000
+++ new-ghc//patches/series	2012-02-03 16:37:34.978251712 +0000
@@ -1,5 +1,4 @@
 system-libffi
-kfreebsd-_gnu_source-565818
 getallinfo-nothing-ghci-566331
 haddock-hardcode-ghc-paths
 use-debian-gen_contents_index
@@ -9,3 +8,5 @@
 autoconf
 haddock-expose-interface-version
 hash-version-number
+improve_linker_script_handling
+no_ghci_on_powerpc