[Pkg-haskell-commits] darcs: haskell-devscripts: Install hoogle .txt files to DEB_HOOGLE_TXT_DIR with a filename derived from the Debian package name, and not the Cabal name. This avoid problems when packaging a library also shipped by GHC (such as Cabal).
Joachim Breitner
mail at joachim-breitner.de
Mon Jun 9 10:01:18 UTC 2014
Sun Jun 8 16:04:43 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* Install hoogle .txt files to DEB_HOOGLE_TXT_DIR with a filename derived from the Debian package name, and not the Cabal name. This avoid problems when packaging a library also shipped by GHC (such as Cabal).
M ./debian/changelog +8
M ./hlibrary.mk -1 +1
Sun Jun 8 16:04:43 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* Install hoogle .txt files to DEB_HOOGLE_TXT_DIR with a filename derived from the Debian package name, and not the Cabal name. This avoid problems when packaging a library also shipped by GHC (such as Cabal).
diff -rN -u old-haskell-devscripts/debian/changelog new-haskell-devscripts/debian/changelog
--- old-haskell-devscripts/debian/changelog 2014-06-09 10:01:18.157929106 +0000
+++ new-haskell-devscripts/debian/changelog 2014-06-09 10:01:18.169929100 +0000
@@ -1,3 +1,11 @@
+haskell-devscripts (0.8.21) UNRELEASED; urgency=medium
+
+ * Install hoogle .txt files to DEB_HOOGLE_TXT_DIR with a filename derived
+ from the Debian package name, and not the Cabal name. This avoid problems
+ when packaging a library also shipped by GHC (such as Cabal).
+
+ -- Joachim Breitner <nomeata at debian.org> Sun, 08 Jun 2014 17:36:52 +0200
+
haskell-devscripts (0.8.20.0) unstable; urgency=medium
* Added ghc-version substvar
diff -rN -u old-haskell-devscripts/hlibrary.mk new-haskell-devscripts/hlibrary.mk
--- old-haskell-devscripts/hlibrary.mk 2014-06-09 10:01:18.157929106 +0000
+++ new-haskell-devscripts/hlibrary.mk 2014-06-09 10:01:18.169929100 +0000
@@ -191,7 +191,7 @@
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
+ -printf "%p $(DEB_HOOGLE_TXT_DIR)/$(notdir $@).txt\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 $@)
More information about the Pkg-haskell-commits
mailing list