[Pkg-haskell-commits] darcs: haskell-devscripts: Remove support for obsolete doc package prefix 'haskell-'

[David Fox]

Tue Mar 31 17:16:35 UTC 2015  David Fox <dsf at seereason.com>
  * Remove support for obsolete doc package prefix 'haskell-'

    M ./dh_haskell_depends -1 +1
    M ./hlibrary.mk -2 +2

Tue Mar 31 17:16:35 UTC 2015  David Fox <dsf at seereason.com>
  * Remove support for obsolete doc package prefix 'haskell-'
diff -rN -u old-haskell-devscripts/dh_haskell_depends new-haskell-devscripts/dh_haskell_depends
--- old-haskell-devscripts/dh_haskell_depends	2015-03-31 17:25:43.350417300 +0000
+++ new-haskell-devscripts/dh_haskell_depends	2015-03-31 17:25:43.386417351 +0000
@@ -118,7 +118,7 @@
             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 -rN -u old-haskell-devscripts/hlibrary.mk new-haskell-devscripts/hlibrary.mk
--- old-haskell-devscripts/hlibrary.mk	2015-03-31 17:25:43.346417293 +0000
+++ new-haskell-devscripts/hlibrary.mk	2015-03-31 17:25:43.386417351 +0000
@@ -150,7 +150,7 @@
 	  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)
@@ -194,7 +194,7 @@
 	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 '{}' \