[DHG_packages] 01/01: cabal-install: switch back to GHC-bundled Cabal

[Clint Adams]

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

clint pushed a commit to branch master
in repository DHG_packages.

commit b1b02e1f85eb9062c4bd44ceed60fbf12a29899a
Author: Clint Adams <clint at debian.org>
Date:   Sat Jun 24 22:20:44 2017 -0400

    cabal-install: switch back to GHC-bundled Cabal
---
 p/haskell-cabal-install/debian/changelog              | 6 ++++++
 p/haskell-cabal-install/debian/control                | 6 ++----
 p/haskell-cabal-install/debian/patches/use-cryptohash | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/p/haskell-cabal-install/debian/changelog b/p/haskell-cabal-install/debian/changelog
index 042e46f..d2b09e8 100644
--- a/p/haskell-cabal-install/debian/changelog
+++ b/p/haskell-cabal-install/debian/changelog
@@ -1,3 +1,9 @@
+haskell-cabal-install (1.24.0.2-2) unstable; urgency=medium
+
+  * Switch back to GHC-bundled Cabal.
+
+ -- Clint Adams <clint at debian.org>  Sat, 24 Jun 2017 22:20:09 -0400
+
 haskell-cabal-install (1.24.0.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/p/haskell-cabal-install/debian/control b/p/haskell-cabal-install/debian/control
index 0d4cb48..c6ba0db 100644
--- a/p/haskell-cabal-install/debian/control
+++ b/p/haskell-cabal-install/debian/control
@@ -19,8 +19,6 @@ Build-Depends:
  libghc-async-dev (>= 2.0),
  libghc-base16-bytestring-dev (<< 0.2),
  libghc-base16-bytestring-dev (>= 0.1.1),
- libghc-cabal-dev (>= 1.24),
- libghc-cabal-dev (<< 1.25),
  libghc-cryptohash-dev,
  libghc-hackage-security-dev (>= 0.5.2.2-5~),
  libghc-hackage-security-dev (<< 0.6),
@@ -42,7 +40,7 @@ Build-Depends:
  libghc-tar-dev (<< 0.6),
  libghc-zlib-dev (<< 0.7),
  libghc-zlib-dev (>= 0.5.3),
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Homepage: http://www.haskell.org/cabal/
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-cabal-install
 Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
@@ -50,7 +48,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
 Package: cabal-install
 Architecture: any
 Depends:
- ghc (>= 8) | libghc-cabal-dev (>= 1.24),
+ ghc (>= 8)
  ${haskell:Depends},
  ${misc:Depends},
  ${shlibs:Depends},
diff --git a/p/haskell-cabal-install/debian/patches/use-cryptohash b/p/haskell-cabal-install/debian/patches/use-cryptohash
index be699e2..2c98197 100644
--- a/p/haskell-cabal-install/debian/patches/use-cryptohash
+++ b/p/haskell-cabal-install/debian/patches/use-cryptohash
@@ -1,8 +1,8 @@
 --- a/cabal-install.cabal
 +++ b/cabal-install.cabal
-@@ -253,7 +253,7 @@ executable cabal
+@@ -267,7 +267,7 @@
          bytestring >= 0.9      && < 1,
-         Cabal      >= 1.24     && < 1.25,
+         Cabal      >= 1.24.2 && < 1.25,
          containers >= 0.4      && < 0.6,
 -        cryptohash-sha256 >= 0.11 && < 0.12,
 +        cryptohash,

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