[Pkg-haskell-commits] darcs: haskell-devscripts: Allow a package to disable the installation of the hoogle file (prepares the fix for #709771)

Joachim Breitner mail at joachim-breitner.de
Sun May 26 08:38:49 UTC 2013


Sun May 26 08:37:51 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Allow a package to disable the installation of the hoogle file (prepares the fix for #709771)
  Ignore-this: a8f7282f5c42716b514f393c8d273630

    M ./debian/changelog +7
    M ./hlibrary.mk +3

Sun May 26 08:37:51 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Allow a package to disable the installation of the hoogle file (prepares the fix for #709771)
  Ignore-this: a8f7282f5c42716b514f393c8d273630
diff -rN -u old-haskell-devscripts//debian/changelog new-haskell-devscripts//debian/changelog
--- old-haskell-devscripts//debian/changelog	2013-05-26 08:38:48.811039637 +0000
+++ new-haskell-devscripts//debian/changelog	2013-05-26 08:38:48.871039420 +0000
@@ -1,3 +1,10 @@
+haskell-devscripts (0.8.17) UNRELEASED; urgency=low
+
+  * Allow a package to disable the installation of the hoogle file (prepares
+    the fix for #709771)
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 26 May 2013 10:32:05 +0200
+
 haskell-devscripts (0.8.16) unstable; urgency=low
 
   * Remove some unnecssary build-depends version constraints (found by cme) 
diff -rN -u old-haskell-devscripts//hlibrary.mk new-haskell-devscripts//hlibrary.mk
--- old-haskell-devscripts//hlibrary.mk	2013-05-26 08:38:48.803039031 +0000
+++ new-haskell-devscripts//hlibrary.mk	2013-05-26 08:38:48.863040808 +0000
@@ -31,6 +31,7 @@
 CABAL_VERSION=$(shell cat *.cabal | egrep -i '^\s*version:' | head -n1 | sed -r 's,^\s*version:\s*,,i'| sed -r 's,\s*$$,,i')
 
 DEB_ENABLE_TESTS ?= no
+DEB_ENABLE_HOOGLE ?= yes
 
 DEB_DH_GENCONTROL_ARGS_libghc-$(CABAL_PACKAGE)-dev += -- '-DGHC-Package=$${haskell:ghc-package}'
 
@@ -180,9 +181,11 @@
 	[ 0 = `ls debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/ 2>/dev/null | wc -l` ] || \
 		cp -r debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/*.haddock \
 		debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
+ifeq ($(DEB_ENABLE_HOOGLE),yes)
 	find debian/$(notdir $@)/$(DEB_HADDOCK_HTML_DIR) -name "*.txt" \
 		-printf "%p $(DEB_HOOGLE_TXT_DIR)/%f\n" >> debian/libghc-$(CABAL_PACKAGE)-doc.links
 	sed -i s,^debian/libghc-$(CABAL_PACKAGE)-doc,, debian/libghc-$(CABAL_PACKAGE)-doc.links
+endif
 	dh_haskell_depends -p$(notdir $@)
 	dh_haskell_blurbs -p$(notdir $@)
 





More information about the Pkg-haskell-commits mailing list