[Pkg-haskell-commits] darcs: haskell-cabal-install: Lose dependency generation in rules

[Sven Bartscher]

Sun May 10 20:00:31 UTC 2015  Sven Bartscher <sven.bartscher at weltraumschlangen.de>
  * Lose dependency generation in rules

    M ./rules -2 +5

Sun May 10 20:00:31 UTC 2015  Sven Bartscher <sven.bartscher at weltraumschlangen.de>
  * Lose dependency generation in rules
diff -rN -u old-haskell-cabal-install/rules new-haskell-cabal-install/rules
--- old-haskell-cabal-install/rules	2015-05-13 16:52:12.867680939 +0000
+++ new-haskell-cabal-install/rules	2015-05-13 16:52:12.875680944 +0000
@@ -1,13 +1,16 @@
 #!/usr/bin/make -f
 
 DEB_ENABLE_TESTS = yes
-cabal_version = $(shell dpkg-query --showformat='$${version}' --show libghc-cabal-dev)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
+cabal_version = $(shell dpkg-query --showformat='$${version}' --show \
+		libghc-cabal-dev | egrep -o ".*-" | egrep -o "[^-]*")
+
 build/cabal-install:: build-ghc-stamp
 
 binary-post-install/cabal-install::
 	dh_bash-completion
-	echo "cabal-dep=libghc-cabal-dev (= $(cabal_version))" >> debian/cabal-install.substvars
+	echo "cabal-dep=libghc-cabal-dev (>= $(cabal_version)), \
+	libghc-cabal-dev (<< $(cabal_version).1)" >> debian/cabal-install.substvars