[DHG_packages] 01/01: Update haskell-cabal-install to cope when we try the 7.10 transition

[Daniel Silverstone]

This is an automated email from the git hooks/post-receive script.

dsilvers pushed a commit to branch master
in repository DHG_packages.

commit 359d3e92f76321ffa3c577d60680164dff55cad4
Author: Daniel Silverstone <dsilvers at digital-scurf.org>
Date:   Fri Aug 14 09:08:33 2015 +0200

    Update haskell-cabal-install to cope when we try the 7.10 transition
---
 p/haskell-cabal-install/debian/changelog | 10 ++++++++++
 p/haskell-cabal-install/debian/control   |  2 +-
 p/haskell-cabal-install/debian/rules     |  5 -----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/p/haskell-cabal-install/debian/changelog b/p/haskell-cabal-install/debian/changelog
index c765cf6..c852465 100644
--- a/p/haskell-cabal-install/debian/changelog
+++ b/p/haskell-cabal-install/debian/changelog
@@ -1,3 +1,13 @@
+haskell-cabal-install (1.22.0.1-4) UNRELEASED; urgency=medium
+
+  * Weaken the dependency rules for libghc-cabal-dev because otherwise
+    we can't install ghc 7.10 from experimental to prepare the transition.
+  * We believe this is okay because the frequency of configuration file
+    format changes is sufficiently low that we can manually bump revisions
+    should we encounter difficulty.
+
+ -- Daniel Silverstone <dsilvers at digital-scurf.org>  Thu, 13 Aug 2015 10:15:08 +0200
+
 haskell-cabal-install (1.22.0.1-3) unstable; urgency=medium
 
   * Lose dependency on libhc-cabal-dev to avoid binNMUs on every upload of
diff --git a/p/haskell-cabal-install/debian/control b/p/haskell-cabal-install/debian/control
index 6f75fe0..3a8cbb4 100644
--- a/p/haskell-cabal-install/debian/control
+++ b/p/haskell-cabal-install/debian/control
@@ -46,7 +46,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
  ${haskell:Depends},
  ${misc:Depends},
- ${cabal-dep},
+ libghc-cabal-dev (>= 1.22) | ghc (>= 7.10)
 Recommends: ${haskell:Recommends},
  ghc,
 Suggests: ${haskell:Suggests},
diff --git a/p/haskell-cabal-install/debian/rules b/p/haskell-cabal-install/debian/rules
index 4f03463..cab151a 100755
--- a/p/haskell-cabal-install/debian/rules
+++ b/p/haskell-cabal-install/debian/rules
@@ -5,12 +5,7 @@ DEB_ENABLE_TESTS = yes
 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)), \
-	libghc-cabal-dev (<< $(cabal_version).1)" >> debian/cabal-install.substvars

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git