[PATCH 03/11] Remove support for obsolete doc package prefix 'haskell-'

[David Fox <dsf@seereason.com>]

Keeping these would make the subsequent changes uglier.

---
 dh_haskell_depends | 2 +-
 hlibrary.mk        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dh_haskell_depends b/dh_haskell_depends
index b71cec4..4917092 100644
--- a/dh_haskell_depends
+++ b/dh_haskell_depends
@@ -118,7 +118,7 @@ for pkg in `dh_listpackages $args`; do
             echo "haskell:Recommends=" >> $sfile.tmp
             echo "haskell:Suggests=" >> $sfile.tmp
     ;;
-        libghc-*-doc|haskell-*-doc)
+        libghc-*-doc)
     grep -v \
                 -e ^haskell:Depends \
                 -e ^haskell:Recommends \
diff --git a/hlibrary.mk b/hlibrary.mk
index 5408863..20e831a 100644
--- a/hlibrary.mk
+++ b/hlibrary.mk
@@ -149,7 +149,7 @@ build-haddock-stamp:
   echo "Haddock failed (no modules?), creating empty documentation package."
  touch build-haddock-stamp

-build/haskell-$(CABAL_PACKAGE)-doc
build/libghc-$(CABAL_PACKAGE)-doc:: configure-ghc-stamp
build-haddock-stamp
+build/libghc-$(CABAL_PACKAGE)-doc:: configure-ghc-stamp build-haddock-stamp

 dist-hugs: $(DEB_SETUP_BIN_NAME)
  $(DEB_SETUP_BIN_NAME) configure --hugs --prefix=/usr -v2
--builddir=dist-hugs $(DEB_SETUP_HUGS_CONFIGURE_ARGS)
@@ -193,7 +193,7 @@ install/libghc-$(CABAL_PACKAGE)-prof::
debian/tmp-inst-ghc install/libghc-$(CABA
  dh_haskell_provides -p$(notdir $@)
  dh_haskell_depends -p$(notdir $@)

-install/haskell-$(CABAL_PACKAGE)-doc
install/libghc-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc
build-haddock-stamp debian/extra-depends
+install/libghc-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc
build-haddock-stamp debian/extra-depends
  mkdir -p debian/$(notdir $@)/$(DEB_HADDOCK_HTML_DIR)
  cd debian/tmp-inst-ghc/ ; find ./$(DEB_HADDOCK_HTML_DIR)/ \
  ! -name "*.haddock" -exec install -Dm 644 '{}' \
-- 
1.9.1