zlib: build with ghc 8 in experimental

3 files changed, 27 insertions, 33 deletions

diff --git a/p/haskell-zlib/debian/changelog b/p/haskell-zlib/debian/changelog
index 6823d8a81..0e9cde917 100644
--- a/p/haskell-zlib/debian/changelog
+++ b/p/haskell-zlib/debian/changelog
@@ -1,14 +1,14 @@
-haskell-zlib (0.6.1.1-2) UNRELEASED; urgency=medium
+haskell-zlib (0.6.1.1-2) experimental; urgency=medium
 
   [ Dmitry Bogatov ]
   * Use secure (https) uri in Vcs-Git field in 'debian/control'
   * Bump standards version to 3.9.8 (no changes needed)
   * Convert `debian/copyright' to dep5 format
 
-  [ Gianfranco Costamagna ]
-  * Fix VCS fields
+  [ Clint Adams ]
+  * Temporarily build-depend on ghc 8.
 
- -- Dmitry Bogatov <KAction@gnu.org>  Tue, 10 May 2016 09:36:36 +0300
+ -- Clint Adams <clint@debian.org>  Fri, 14 Oct 2016 14:43:52 -0400
 
 haskell-zlib (0.6.1.1-1) unstable; urgency=medium
 
diff --git a/p/haskell-zlib/debian/control b/p/haskell-zlib/debian/control
index c12b8f0f1..d4b96508e 100644
--- a/p/haskell-zlib/debian/control
+++ b/p/haskell-zlib/debian/control
@@ -3,31 +3,29 @@ Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.or
 Uploaders: Joachim Breitner <nomeata@debian.org>
 Priority: extra
 Section: haskell
-Build-Depends: debhelper (>= 9),
+Build-Depends:
  cdbs,
- haskell-devscripts (>= 0.10),
- ghc,
+ debhelper (>= 9),
+ ghc (>= 8),
  ghc-prof,
+ haskell-devscripts (>= 0.10),
  zlib1g-dev,
-Build-Depends-Indep: ghc-doc,
+Build-Depends-Indep: ghc-doc
 Standards-Version: 3.9.8
 Homepage: http://hackage.haskell.org/package/zlib
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-zlib
 Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
 
 Package: libghc-zlib-dev
 Architecture: any
-Depends: zlib1g-dev,
- ${haskell:Depends},
- ${shlibs:Depends},
- ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+Depends: zlib1g-dev, ${haskell:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
 Description: Compression and decompression in the gzip and zlib formats${haskell:ShortBlurb}
  This package provides a pure interface for compressing and decompressing
  streams of data represented as lazy ByteStrings. It uses the zlib C library so
- it has high performance. It supports the \"zlib\", \"gzip\" and \"raw\"
+ it has high performance. It supports the "zlib", "gzip" and "raw"
  compression formats.
  .
  It provides a convenient high level API suitable for most tasks and for the
@@ -38,16 +36,14 @@ Description: Compression and decompression in the gzip and zlib formats${haskell
 
 Package: libghc-zlib-prof
 Architecture: any
-Depends: ${haskell:Depends},
- ${shlibs:Depends},
- ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+Depends: ${haskell:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
 Description: Compression and decompression in the gzip and zlib formats${haskell:ShortBlurb}
  This package provides a pure interface for compressing and decompressing
  streams of data represented as lazy ByteStrings. It uses the zlib C library so
- it has high performance. It supports the \"zlib\", \"gzip\" and \"raw\"
+ it has high performance. It supports the "zlib", "gzip" and "raw"
  compression formats.
  .
  It provides a convenient high level API suitable for most tasks and for the
@@ -59,17 +55,16 @@ Description: Compression and decompression in the gzip and zlib formats${haskell
 Package: libghc-zlib-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends},
- ${haskell:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Conflicts: haskell-zlib-doc (<< 0.5.2.0-3),
-Provides: haskell-zlib-doc,
-Replaces: haskell-zlib-doc (<< 0.5.2.0-3),
+Depends: ${haskell:Depends}, ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Conflicts: haskell-zlib-doc (<< 0.5.2.0-3)
+Provides: haskell-zlib-doc
+Replaces: haskell-zlib-doc (<< 0.5.2.0-3)
 Description: Compression and decompression in the gzip and zlib formats${haskell:ShortBlurb}
  This package provides a pure interface for compressing and decompressing
  streams of data represented as lazy ByteStrings. It uses the zlib C library so
- it has high performance. It supports the \"zlib\", \"gzip\" and \"raw\"
+ it has high performance. It supports the "zlib", "gzip" and "raw"
  compression formats.
  .
  It provides a convenient high level API suitable for most tasks and for the
diff --git a/p/haskell-zlib/debian/copyright b/p/haskell-zlib/debian/copyright
index 4cccfaebd..2d35f8f2f 100644
--- a/p/haskell-zlib/debian/copyright
+++ b/p/haskell-zlib/debian/copyright
@@ -55,4 +55,3 @@ License: zlib
  2. Altered source versions must be plainly marked as such, and must not be
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
-