[Pkg-haskell-commits] darcs: haskell-hoogle: Ignore dead links and dont fail postinst if no hoogle databases were found (Closes: 711596)

[Joachim Breitner]

Wed Nov  6 08:51:09 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Ignore dead links and dont fail postinst if no hoogle databases were found (Closes: 711596)

    M ./changelog +7
    M ./files_hoogle/update-hoogle -3 +7

Wed Nov  6 08:51:09 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Ignore dead links and dont fail postinst if no hoogle databases were found (Closes: 711596)
diff -rN -u old-haskell-hoogle/changelog new-haskell-hoogle/changelog
--- old-haskell-hoogle/changelog	2013-11-06 08:54:29.226537300 +0000
+++ new-haskell-hoogle/changelog	2013-11-06 08:54:29.282539131 +0000
@@ -1,3 +1,10 @@
+haskell-hoogle (4.2.23-2) UNRELEASED; urgency=low
+
+  * Ignore dead links and dont fail postinst if no hoogle databases were found
+    (Closes: 711596)
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 06 Nov 2013 09:50:40 +0100
+
 haskell-hoogle (4.2.23-1) unstable; urgency=low
 
   [ Joachim Breitner ]
diff -rN -u old-haskell-hoogle/files_hoogle/update-hoogle new-haskell-hoogle/files_hoogle/update-hoogle
--- old-haskell-hoogle/files_hoogle/update-hoogle	2013-11-06 08:54:29.218538230 +0000
+++ new-haskell-hoogle/files_hoogle/update-hoogle	2013-11-06 08:54:29.242543959 +0000
@@ -25,10 +25,14 @@
 TXTFILES_SYM=`find /usr/lib/ghc-doc/hoogle/ -name "*.txt"`
 TXTFILES=`readlinks $TXTFILES_SYM`
 for i in $TXTFILES; do
-    echo -n "."
-    $HOOGLE convert $i $DATABASE_DIR/`basename $i`.hoo --addlocation >/dev/null 2>&1
+    if [ -r "$i"]
+    then
+        echo -n "."
+        $HOOGLE convert $i $DATABASE_DIR/`basename $i`.hoo --addlocation >/dev/null 2>&1
+    fi
 done
 echo " done"
 
 # combine
-cd $DATABASE_DIR/ && $HOOGLE combine *.hoo
+find $DATABASE_DIR -name \*.hoo -print0 |
+	xargs -0 -- hoogle combine -o $DATABASE_DIR/default.hoo