[Pkg-haskell-commits] darcs: haskell-devscripts: Symlink hoogle’s txt files to /usr/lib/ghc-doc/hoogle/

[Joachim Breitner]

Mon Oct  8 18:56:33 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Symlink hoogle[_\e2_][_\80_][_\99_]s txt files to /usr/lib/ghc-doc/hoogle/
  Ignore-this: aca6fbc20344e44e1a915cbaa8b234d8

    M ./debian/changelog +3
    M ./hlibrary.mk -5 +4

Mon Oct  8 18:56:33 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Symlink hoogle’s txt files to /usr/lib/ghc-doc/hoogle/
  Ignore-this: aca6fbc20344e44e1a915cbaa8b234d8
diff -rN -u old-haskell-devscripts//debian/changelog new-haskell-devscripts//debian/changelog
--- old-haskell-devscripts//debian/changelog	2012-10-08 19:16:19.818750211 +0000
+++ new-haskell-devscripts//debian/changelog	2012-10-08 19:16:19.878733714 +0000
@@ -9,6 +9,9 @@
   * Need --html option to fix bug that --hoogle option don't output html file.
   * Support to create /usr/lib/ghc-doc/hoogle/*.txt for hoogle package.
 
+  [ Joachim Breitner ]
+  * Symlink hoogle’s txt files to /usr/lib/ghc-doc/hoogle/
+
  -- Joachim Breitner <nomeata at debian.org>  Mon, 30 Jul 2012 16:24:09 +0200
 
 haskell-devscripts (0.8.12) unstable; urgency=low
diff -rN -u old-haskell-devscripts//hlibrary.mk new-haskell-devscripts//hlibrary.mk
--- old-haskell-devscripts//hlibrary.mk	2012-10-08 19:16:19.818750211 +0000
+++ new-haskell-devscripts//hlibrary.mk	2012-10-08 19:16:19.850733681 +0000
@@ -36,7 +36,7 @@
 
 NO_GHCI_FLAG = $(shell test -e /usr/bin/ghci || echo --ghc-option=-DDEBIAN_NO_GHCI; exit 0)
 
-DEB_COMPRESS_EXCLUDE += .haddock .hs
+DEB_COMPRESS_EXCLUDE += .haddock .hs .txt
 
 # TODO:
 # - some of this would probably be useful for generic Haskell programs,
@@ -85,6 +85,7 @@
 	rm -f build-ghc-stamp build-hugs-stamp build-haddock-stamp
 	rm -rf debian/tmp-inst-ghc
 	rm -f debian/extra-depends
+	rm -f debian/libghc-$(CABAL_PACKAGE)-doc.links
 	rm -f $(MAKEFILE)
 	rm -rf debian/dh_haskell_shlibdeps
 
@@ -173,10 +174,8 @@
 	[ 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)
-	mkdir -p debian/$(notdir $@)/$(DEB_HOOGLE_TXT_DIR)
-	find debian/$(notdir $@)/$(DEB_HADDOCK_HTML_DIR) -name "*.txt" | \
-	  /usr/bin/haddock-collect \
-	  debian/$(notdir $@) debian/$(notdir $@)/$(DEB_HOOGLE_TXT_DIR)
+	find debian/$(notdir $@)/$(DEB_HADDOCK_HTML_DIR) -name "*.txt" \
+		-printf "%p $(DEB_HOOGLE_TXT_DIR)/%f\n" >> debian/libghc-$(CABAL_PACKAGE)-doc.links
 	dh_haskell_depends -p$(notdir $@)
 
 install/libhugs-$(CABAL_PACKAGE):: $(DEB_SETUP_BIN_NAME) dist-hugs debian/extra-depends