control: tag -1 +patch Hello,
On Mon, May 09, 2016 at 04:59:33PM +0200, Joachim Breitner wrote:
> it runs
> run rm -f debian/libghc-${CABAL_PACKAGE}-doc.links
> debian/libghcjs-${CABAL_PACKAGE}-doc.links
> which in clean, which explains the problem, and writes to the file in
> the install target for the -dev package.
>
> if [ "${DEB_ENABLE_HOOGLE}" = "yes" ]
> then
> run find debian/${PKG}/${htmldir} -name "*.txt" \
> -printf "%p ${hoogle}/${PKG}.txt\n" >>
> debian/lib${hc}-${CABAL_PACKAGE}-doc.links
> run sed -i s,^debian/lib${hc}-${CABAL_PACKAGE}-doc,,
> debian/lib${hc}-${CABAL_PACKAGE}-doc.links
> fi
>
> What is a saner way of doing this? Calling dh_link directly with all
> required links as arguments?
Thanks for tracking this down. The attached patch seems to work (I've
tested it with my propellor package).
--
Sean Whitton
From a9c906582dbd572423059f9f1ea920d481e7fdec Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhit...@spwhitton.name>
Date: Mon, 9 May 2016 17:22:23 -0700
Subject: [PATCH] Respect the user's debian/libghc-*-doc.links
---
Dh_Haskell.sh | 8 ++++----
debian/changelog | 5 +++++
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Dh_Haskell.sh b/Dh_Haskell.sh
index 1c187fd..beaf372 100644
--- a/Dh_Haskell.sh
+++ b/Dh_Haskell.sh
@@ -351,7 +351,6 @@ clean_recipe(){
run rm -f configure-ghc-stamp configure-ghcjs-stamp build-ghc-stamp build-ghcjs-stamp build-hugs-stamp build-haddock-stamp
run rm -rf debian/tmp-inst-ghc debian/tmp-inst-ghcjs
run rm -f debian/extra-depends-ghc debian/extra-depends-ghcjs
- run rm -f debian/libghc-${CABAL_PACKAGE}-doc.links debian/libghcjs-${CABAL_PACKAGE}-doc.links
if [ -f ${DEB_LINTIAN_OVERRIDES_FILE} ] ; then
run sed -i '/binary-or-shlib-defines-rpath/ d' ${DEB_LINTIAN_OVERRIDES_FILE}
run find ${DEB_LINTIAN_OVERRIDES_FILE} -empty -delete;
@@ -505,9 +504,10 @@ install_doc_recipe(){
run cp -r debian/tmp-inst-${hc}/${docdir}/*.haddock debian/${PKG}/${docdir}
if [ "${DEB_ENABLE_HOOGLE}" = "yes" ]
then
- run find debian/${PKG}/${htmldir} -name "*.txt" \
- -printf "%p ${hoogle}/${PKG}.txt\n" >> debian/lib${hc}-${CABAL_PACKAGE}-doc.links
- run sed -i s,^debian/lib${hc}-${CABAL_PACKAGE}-doc,, debian/lib${hc}-${CABAL_PACKAGE}-doc.links
+ links=`run find debian/${PKG}/${htmldir} -name "*.txt" \
+ -printf "%p ${hoogle}/${PKG}.txt\n" >> debian/lib${hc}-${CABAL_PACKAGE}-doc.links \
+ | sed -i s,^debian/lib${hc}-${CABAL_PACKAGE}-doc,, debian/lib${hc}-${CABAL_PACKAGE}-doc.links`
+ run dh_link $links
fi
run dh_haskell_depends -p${PKG}
# PS4=$PS5
diff --git a/debian/changelog b/debian/changelog
index ef23643..f1b342f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
haskell-devscripts (0.10.2.4) UNRELEASED; urgency=medium
+ [ James McCoy ]
* Fix “Unescaped left brace in regex” warnings in dh_haskell_blurbs.
+ [ Sean Whitton ]
+ * Respect user's debian/libghc-*-doc.links. (Closes: #823689)
+ Call dh_link rather than just overwriting debian/libghc-*-doc.links.
+
-- James McCoy <james...@debian.org> Sun, 01 May 2016 11:01:02 -0400
haskell-devscripts (0.10.2.3) unstable; urgency=medium
--
2.8.1
signature.asc
Description: PGP signature
