[Pkg-haskell-commits] darcs: ghc: Do not create system-wide documentation index if /usr/share/doc is missing. (Closes: #709911)

Joachim Breitner mail at joachim-breitner.de
Wed Jun 5 22:40:09 UTC 2013


Wed Jun  5 18:53:27 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Do not create system-wide documentation index if /usr/share/doc is missing. (Closes: #709911)
  Ignore-this: e33eb32450e280f14e1292122d550f97

    M ./changelog +2
    M ./gen_contents_index +3

Wed Jun  5 18:53:27 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Do not create system-wide documentation index if /usr/share/doc is missing. (Closes: #709911)
  Ignore-this: e33eb32450e280f14e1292122d550f97
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2013-06-05 22:40:08.823041629 +0000
+++ new-ghc//changelog	2013-06-05 22:40:08.923040380 +0000
@@ -4,6 +4,8 @@
     patch by Colin Watson
   * Disable GHCi on arm, as it is severly borken (for more information see
     http://hackage.haskell.org/trac/ghc/ticket/7794)
+  * Do not create system-wide documentation index if /usr/share/doc is
+    missing. (Closes: #709911)
 
  -- Joachim Breitner <nomeata at debian.org>  Wed, 05 Jun 2013 20:48:20 +0200
 
diff -rN -u old-ghc//gen_contents_index new-ghc//gen_contents_index
--- old-ghc//gen_contents_index	2013-06-05 22:40:08.823041629 +0000
+++ new-ghc//gen_contents_index	2013-06-05 22:40:08.851040271 +0000
@@ -6,6 +6,9 @@
 my @ifaces;
 my %pkgs;
 
+# Only do something if we actually have /usr/share/doc
+exit 0 unless (-d "/usr/share/doc/ghc-doc/html/libraries/" and -r "/usr/share/doc/ghc-doc/html/libraries/prologue.txt");
+
 # Add everything from the global Cabal registry to index.
 if (-e '/usr/bin/ghc-pkg') {
     open CABAL, 'ghc-pkg dump --global |' or warn "ghc-pkg dump failed: $!";





More information about the Pkg-haskell-commits mailing list