[Pkg-haskell-commits] darcs: haskell-devscripts: Fix ".haddock file in -dev creates broken symlinks in /usr/share/doc/ghc6-doc/html/libraries/index.html" by moving .haddock file to -doc package. (Closes: #586723)
Marco Silva
marcot at marcot.eti.br
Fri Jan 14 15:03:17 UTC 2011
Fri Jan 14 14:48:13 UTC 2011 Marco Silva <marcot at marcot.eti.br>
* Fix ".haddock file in -dev creates broken symlinks in /usr/share/doc/ghc6-doc/html/libraries/index.html" by moving .haddock file to -doc package. (Closes: #586723)
Ignore-this: 49d95f936ea07acf94c50d4f904981f
M ./debian/changelog +8
M ./hlibrary.mk -5 +5
Fri Jan 14 14:48:13 UTC 2011 Marco Silva <marcot at marcot.eti.br>
* Fix ".haddock file in -dev creates broken symlinks in /usr/share/doc/ghc6-doc/html/libraries/index.html" by moving .haddock file to -doc package. (Closes: #586723)
Ignore-this: 49d95f936ea07acf94c50d4f904981f
diff -rN -u old-haskell-devscripts/debian/changelog new-haskell-devscripts/debian/changelog
--- old-haskell-devscripts/debian/changelog 2011-01-14 15:03:17.563442370 +0000
+++ new-haskell-devscripts/debian/changelog 2011-01-14 15:03:17.579443214 +0000
@@ -1,3 +1,11 @@
+haskell-devscripts (0.7.13) UNRELEASED; urgency=low
+
+ * Fix ".haddock file in -dev creates broken symlinks in
+ /usr/share/doc/ghc6-doc/html/libraries/index.html" by moving .haddock
+ file to -doc package. (Closes: #586723)
+
+ -- Marco Silva <marcot at debian.org> Fri, 14 Jan 2011 12:37:29 -0200
+
haskell-devscripts (0.7.12) unstable; urgency=low
* Send error messages to stdout
diff -rN -u old-haskell-devscripts/hlibrary.mk new-haskell-devscripts/hlibrary.mk
--- old-haskell-devscripts/hlibrary.mk 2011-01-14 15:03:17.559442159 +0000
+++ new-haskell-devscripts/hlibrary.mk 2011-01-14 15:03:17.567442581 +0000
@@ -85,7 +85,7 @@
$(BUILD_GHC6) --builddir=dist-ghc6
touch build-ghc6-stamp
-build/libghc6-$(CABAL_PACKAGE)-prof build/libghc6-$(CABAL_PACKAGE)-dev:: build-ghc6-stamp build-haddock-stamp
+build/libghc6-$(CABAL_PACKAGE)-prof build/libghc6-$(CABAL_PACKAGE)-dev:: build-ghc6-stamp
build-haddock-stamp:
[ ! -x /usr/bin/haddock ] || $(DEB_SETUP_BIN_NAME) haddock --builddir=dist-ghc6 $(DEB_HADDOCK_OPTS)
@@ -110,10 +110,6 @@
$(if $(HASKELL_HIDE_PACKAGES),sed -i 's/^exposed: True$$/exposed: False/' $$pkg_config;) \
install -Dm 644 $$pkg_config debian/$(notdir $@)/var/lib/ghc-$(GHC6_VERSION)/package.conf.d/$$pkg_config; \
rm -f $$pkg_config
- mkdir -p debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
- [ 0 = `ls debian/tmp-inst-ghc6/$(DEB_HADDOCK_DIR)/ 2>/dev/null | wc -l` ] || \
- cp -r debian/tmp-inst-ghc6/$(DEB_HADDOCK_DIR)/*.haddock \
- debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
dh_haskell_provides -p$(notdir $@)
dh_haskell_depends -p$(notdir $@)
dh_haskell_shlibdeps -p$(notdir $@)
@@ -130,6 +126,10 @@
cd debian/tmp-inst-ghc6/ ; find ./$(DEB_HADDOCK_HTML_DIR)/ \
! -name "*.haddock" -exec install -Dm 644 '{}' \
../$(notdir $@)/'{}' ';'
+ mkdir -p debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
+ [ 0 = `ls debian/tmp-inst-ghc6/$(DEB_HADDOCK_DIR)/ 2>/dev/null | wc -l` ] || \
+ cp -r debian/tmp-inst-ghc6/$(DEB_HADDOCK_DIR)/*.haddock \
+ debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
dh_haskell_depends -p$(notdir $@)
install/libhugs-$(CABAL_PACKAGE):: $(DEB_SETUP_BIN_NAME) dist-hugs
More information about the Pkg-haskell-commits
mailing list