[Pkg-haskell-commits] darcs: haskell-devscripts: Run dh_haskell_blurbs on all packages

[Joachim Breitner]

Sun Feb  9 12:48:37 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Run dh_haskell_blurbs on all packages 

    M ./debian/changelog +6
    M ./dh_haskell_blurbs -13
    M ./hlibrary.mk -4 +4

Sun Feb  9 12:48:37 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Run dh_haskell_blurbs on all packages 
diff -rN -u old-haskell-devscripts/debian/changelog new-haskell-devscripts/debian/changelog
--- old-haskell-devscripts/debian/changelog	2014-02-09 12:50:35.998920765 +0000
+++ new-haskell-devscripts/debian/changelog	2014-02-09 12:50:35.998920765 +0000
@@ -1,3 +1,9 @@
+haskell-devscripts (0.8.19.3) UNRELEASED; urgency=medium
+
+  * Run dh_haskell_blurbs on all packages (Closes: #721461)
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 09 Feb 2014 12:39:16 +0000
+
 haskell-devscripts (0.8.19.2) unstable; urgency=medium
 
   * Remove the final newline from haskell:LongDescription, now that
diff -rN -u old-haskell-devscripts/dh_haskell_blurbs new-haskell-devscripts/dh_haskell_blurbs
--- old-haskell-devscripts/dh_haskell_blurbs	2014-02-09 12:50:35.994920765 +0000
+++ new-haskell-devscripts/dh_haskell_blurbs	2014-02-09 12:50:36.002920765 +0000
@@ -7,19 +7,6 @@
 set -e 
 
 for pkg in `dh_listpackages $args`; do
-    case "$pkg" in
-	libghc-*-dev)
-	    what=Dev
-	    ;;
-	libghc-*-prof)
-	    what=Prof
-	    ;;
-	libghc-*-doc)
-	    what=Doc
-	    ;;
-    esac 
-    if [ -z "$what" ]; then continue; fi
-
     sfile=debian/$pkg.substvars
     touch $sfile
 
diff -rN -u old-haskell-devscripts/hlibrary.mk new-haskell-devscripts/hlibrary.mk
--- old-haskell-devscripts/hlibrary.mk	2014-02-09 12:50:35.994920765 +0000
+++ new-haskell-devscripts/hlibrary.mk	2014-02-09 12:50:36.006920765 +0000
@@ -162,7 +162,6 @@
 	dh_haskell_provides -p$(notdir $@)
 	dh_haskell_depends -p$(notdir $@)
 	dh_haskell_shlibdeps -p$(notdir $@)
-	dh_haskell_blurbs -p$(notdir $@)
 
 install/libghc-$(CABAL_PACKAGE)-prof:: debian/tmp-inst-ghc install/libghc-$(CABAL_PACKAGE)-dev debian/extra-depends
 	cd debian/tmp-inst-ghc ; find usr/lib/haskell-packages/ghc/lib/ \
@@ -170,7 +169,6 @@
 		-exec install -Dm 644 '{}' ../$(notdir $@)/'{}' ';'
 	dh_haskell_provides -p$(notdir $@)
 	dh_haskell_depends -p$(notdir $@)
-	dh_haskell_blurbs -p$(notdir $@)
 
 install/haskell-$(CABAL_PACKAGE)-doc install/libghc-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc build-haddock-stamp debian/extra-depends
 	mkdir -p debian/$(notdir $@)/$(DEB_HADDOCK_HTML_DIR)
@@ -187,13 +185,15 @@
 	sed -i s,^debian/libghc-$(CABAL_PACKAGE)-doc,, debian/libghc-$(CABAL_PACKAGE)-doc.links
 endif
 	dh_haskell_depends -p$(notdir $@)
-	dh_haskell_blurbs -p$(notdir $@)
 
 install/libhugs-$(CABAL_PACKAGE):: $(DEB_SETUP_BIN_NAME) dist-hugs debian/extra-depends
 	$(DEB_SETUP_BIN_NAME) copy --destdir=debian/libhugs-$(CABAL_PACKAGE) --builddir=dist-hugs
 	rm -rf debian/libhugs-$(CABAL_PACKAGE)/usr/share/doc/*
 	dh_haskell_depends -p$(notdir $@)
-	dh_haskell_blurbs -p$(notdir $@)
+
+# Run dh_haskell_blurbs on all packags, useful e.g. for binary packages
+$(patsubst %,install/%,$(DEB_PACKAGES)) :: install/%:
+	dh_haskell_blurbs -p$(cdbs_curpkg)
 
 
 # Support for installing executables