[Pkg-haskell-commits] darcs: haskell-devscripts: Improve Setup register parsing

[David Fox]

Mon Jul 30 14:23:44 UTC 2012  David Fox <ddssff at gmail.com>
  * Improve Setup register parsing
  Ignore-this: c14c6eb2947e6b365f8e795521ebb175

    M ./hlibrary.mk -2 +2

Mon Jul 30 14:23:44 UTC 2012  David Fox <ddssff at gmail.com>
  * Improve Setup register parsing
  Ignore-this: c14c6eb2947e6b365f8e795521ebb175
diff -rN -u old-haskell-devscripts//hlibrary.mk new-haskell-devscripts//hlibrary.mk
--- old-haskell-devscripts//hlibrary.mk	2012-07-30 14:24:42.388841002 +0000
+++ new-haskell-devscripts//hlibrary.mk	2012-07-30 14:24:42.416827089 +0000
@@ -135,7 +135,7 @@
 	$(DEB_SETUP_BIN_NAME) copy --builddir=dist-ghc --destdir=debian/tmp-inst-ghc
 
 debian/extra-depends: debian/tmp-inst-ghc
-	pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | sed -r 's,.*: ,,'` ; \
+	pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | tr -d ' \n' | sed -r 's,^.*:,,'` ; \
 		dh_haskell_extra_depends $$pkg_config ; \
 		rm $$pkg_config
 
@@ -143,7 +143,7 @@
 	cd debian/tmp-inst-ghc ; find usr/lib/haskell-packages/ghc/lib/ \
 		\( ! -name "*_p.a" ! -name "*.p_hi" \) \
 		-exec install -Dm 644 '{}' ../$(notdir $@)/'{}' ';'
-	pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | sed -r 's,.*: ,,'`; \
+	pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | tr -d ' \n' | sed -r 's,^.*:,,'`; \
 		$(if $(HASKELL_HIDE_PACKAGES),sed -i 's/^exposed: True$$/exposed: False/' $$pkg_config;) \
 		install -Dm 644 $$pkg_config debian/$(notdir $@)/var/lib/ghc/package.conf.d/$$pkg_config; \
 		rm -f $$pkg_config