[Pkg-haskell-commits] darcs: ghc: patches/no-missing-haddock-file-warning: Quench warning, as it is quite common on Debian installations.

[Joachim Breitner]

Sat Mar 10 18:32:30 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * patches/no-missing-haddock-file-warning: Quench warning, as it is quite common on Debian installations.
  Ignore-this: 835a54eaf254a8983623524711bf250c

    M ./changelog -1 +3
    A ./patches/no-missing-haddock-file-warning
    M ./patches/series +1

Sat Mar 10 18:32:30 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * patches/no-missing-haddock-file-warning: Quench warning, as it is quite common on Debian installations.
  Ignore-this: 835a54eaf254a8983623524711bf250c
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2012-03-10 18:33:02.083245656 +0000
+++ new-ghc//changelog	2012-03-10 18:33:02.115247255 +0000
@@ -21,8 +21,10 @@
   * Also conflict with any provided libghc-*-dev packages. Thus, if a packages
     is moved _into_ ghc that was outside before, no external package can be
     installed (as was the case with binary).
+  * patches/no-missing-haddock-file-warning: Quench warning, as it is quite
+    common on Debian installations.
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 11 Feb 2012 23:38:11 +0100
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 10 Mar 2012 18:10:57 +0100
 
 ghc (7.4.1-1) unstable; urgency=low
 
diff -rN -u old-ghc//patches/no-missing-haddock-file-warning new-ghc//patches/no-missing-haddock-file-warning
--- old-ghc//patches/no-missing-haddock-file-warning	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc//patches/no-missing-haddock-file-warning	2012-03-10 18:33:02.135248251 +0000
@@ -0,0 +1,20 @@
+Description: Do not emit a warning if the .haddock file is missing
+ As it is quite common on Debian installations to install the -dev package
+ without the -doc package.
+Author: Joachim Breitner <nomeata at debian.org>
+
+--- ghc-7.4.1.orig/utils/ghc-pkg/Main.hs
++++ ghc-7.4.1/utils/ghc-pkg/Main.hs
+@@ -1346,8 +1346,10 @@ checkPackageConfig pkg db_stack auto_ghc
+   mapM_ (checkDir True  "library-dirs") (libraryDirs pkg)
+   mapM_ (checkDir True  "include-dirs") (includeDirs pkg)
+   mapM_ (checkDir True  "framework-dirs") (frameworkDirs pkg)
+-  mapM_ (checkFile   True "haddock-interfaces") (haddockInterfaces pkg)
+-  mapM_ (checkDirURL True "haddock-html")       (haddockHTMLs pkg)
++  -- In Debian, it is quite normal that the package is installed without the
++  -- documentation. Do not print a warning there.
++  -- mapM_ (checkFile   True "haddock-interfaces") (haddockInterfaces pkg)
++  -- mapM_ (checkDirURL True "haddock-html")       (haddockHTMLs pkg)
+   checkModules pkg
+   mapM_ (checkHSLib (libraryDirs pkg) auto_ghci_libs) (hsLibraries pkg)
+   -- ToDo: check these somehow?
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2012-03-10 18:33:02.067245781 +0000
+++ new-ghc//patches/series	2012-03-10 18:33:02.139247730 +0000
@@ -9,3 +9,4 @@
 armhf_llvm_abi
 ARM-VFPv3D16
 hurd-is-ELF
+no-missing-haddock-file-warning