argon2: build with ghc 8 in experimental

2 files changed, 28 insertions, 25 deletions

diff --git a/p/haskell-argon2/debian/changelog b/p/haskell-argon2/debian/changelog
index c7a7e5f8b..b695fe3a9 100644
--- a/p/haskell-argon2/debian/changelog
+++ b/p/haskell-argon2/debian/changelog
@@ -1,9 +1,13 @@
-haskell-argon2 (1.2.0-2) UNRELEASED; urgency=medium
+haskell-argon2 (1.2.0-2) experimental; urgency=medium
 
+  [ Sean Whitton ]
   * Copy public domain dedication from encoding.c to d/copyright.
     Thanks to ftp-master Chris Lamb.
 
- -- Sean Whitton <spwhitton@spwhitton.name>  Sat, 08 Oct 2016 09:43:05 -0700
+  [ Clint Adams ]
+  * Temporarily build-depend on ghc 8.
+
+ -- Clint Adams <clint@debian.org>  Fri, 14 Oct 2016 14:51:47 -0400
 
 haskell-argon2 (1.2.0-1) unstable; urgency=medium
 
diff --git a/p/haskell-argon2/debian/control b/p/haskell-argon2/debian/control
index 289e8c96e..1ab8bd307 100644
--- a/p/haskell-argon2/debian/control
+++ b/p/haskell-argon2/debian/control
@@ -3,16 +3,16 @@ Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.or
 Uploaders: Sean Whitton <spwhitton@spwhitton.name>
 Priority: extra
 Section: haskell
-Build-Depends: debhelper (>= 10),
- haskell-devscripts (>= 0.9),
+Build-Depends:
  cdbs,
- ghc,
+ debhelper (>= 10),
+ ghc (>= 8),
  ghc-prof,
+ haskell-devscripts (>= 0.9),
+ libargon2-0-dev,
  libghc-text-dev,
  libghc-text-prof,
- libargon2-0-dev,
-Build-Depends-Indep: ghc-doc,
- libghc-text-doc,
+Build-Depends-Indep: ghc-doc, libghc-text-doc
 Standards-Version: 3.9.8
 Homepage: https://github.com/ocharles/argon2.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-argon2
@@ -25,14 +25,15 @@ X-Description: Haskell bindings to the Argon2 password-hashing function
 
 Package: libghc-argon2-dev
 Architecture: any
-Depends: ${haskell:Depends},
+Depends:
+ libargon2-0-dev,
+ ${haskell:Depends},
  ${misc:Depends},
  ${shlibs:Depends},
- libargon2-0-dev,
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Conflicts: ${haskell:Conflicts},
-Provides: ${haskell:Provides},
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Conflicts: ${haskell:Conflicts}
+Provides: ${haskell:Provides}
 Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
  ${haskell:LongDescription}
  .
@@ -40,12 +41,11 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
 
 Package: libghc-argon2-prof
 Architecture: any
-Depends: ${haskell:Depends},
- ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Conflicts: ${haskell:Conflicts},
-Provides: ${haskell:Provides},
+Depends: ${haskell:Depends}, ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Conflicts: ${haskell:Conflicts}
+Provides: ${haskell:Provides}
 Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
  ${haskell:LongDescription}
  .
@@ -54,11 +54,10 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
 Package: libghc-argon2-doc
 Architecture: all
 Section: doc
-Depends: ${haskell:Depends},
- ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Conflicts: ${haskell:Conflicts},
+Depends: ${haskell:Depends}, ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Conflicts: ${haskell:Conflicts}
 Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
  ${haskell:LongDescription}
  .