[Git][haskell-team/haskell-devscripts][master] Fix bug in install_doc_recipe() causing builds to fail

[Ilias Tsitsimpis]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / haskell-devscripts


Commits:
57fe7663 by Ilias Tsitsimpis at 2020-02-26T20:43:27+02:00
Fix bug in install_doc_recipe() causing builds to fail

- - - - -


2 changed files:

- Dh_Haskell.sh
- debian/changelog


Changes:

=====================================
Dh_Haskell.sh
=====================================
@@ -642,10 +642,12 @@ install_doc_recipe(){
         # either libghc-*-dev or all the binary packages, neither of
         # which is desirable (see dh_link (1)).  So we just create a
         # (policy-compliant) symlink ourselves
-        source=`find debian/${PKG}/${htmldir} -name "*.txt"`
+        source="debian/${PKG}/${htmldir}/${CABAL_PACKAGE}.txt"
         dest=debian/${PKG}${hoogle}${PKG}.txt
-        run mkdir -p `dirname $dest`
-        run ln -rs -T $source $dest
+        if [ -f ${source} ]; then
+            run mkdir -p `dirname $dest`
+            run ln -rs -T $source $dest
+        fi
     fi
     run dh_haskell_depends -p${PKG}
     # PS4=$PS5


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+haskell-devscripts (0.15.3) unstable; urgency=medium
+
+  * Fix bug in install_doc_recipe() which wrongly assumed that
+    ${CABAL_PACKAGE}.txt was the only txt file generated by haddock
+    (Closes: #952617).
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 26 Feb 2020 20:38:16 +0200
+
 haskell-devscripts (0.15.2) unstable; urgency=medium
 
   * Ensure build fails when dh_haskell_{depends,provides} fail



View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/commit/57fe76632d500e420e11adf4dc1a7e9206843973

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/commit/57fe76632d500e420e11adf4dc1a7e9206843973
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20200226/56535e5c/attachment-0001.html>