taffybar: build with ghc 8 in experimental

2 files changed, 72 insertions, 48 deletions

diff --git a/p/taffybar/debian/changelog b/p/taffybar/debian/changelog
index 368c5411b..9a50404b9 100644
--- a/p/taffybar/debian/changelog
+++ b/p/taffybar/debian/changelog
@@ -1,3 +1,9 @@
+taffybar (0.4.6-4) experimental; urgency=medium
+
+  * Temporarily build-depend on ghc 8.
+
+ -- Clint Adams <clint@debian.org>  Mon, 17 Oct 2016 20:38:50 -0400
+
 taffybar (0.4.6-3) unstable; urgency=medium
 
   [ Dmitry Bogatov ]
diff --git a/p/taffybar/debian/control b/p/taffybar/debian/control
index 575eda2e9..700a706f4 100644
--- a/p/taffybar/debian/control
+++ b/p/taffybar/debian/control
@@ -1,54 +1,55 @@
 Source: taffybar
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
-Uploaders: Louis Bettens <louis@bettens.info>
+Uploaders:
+ Louis Bettens <louis@bettens.info>,
 Priority: extra
 Section: haskell
-Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.10),
+Build-Depends:
  cdbs,
- ghc,
+ debhelper (>= 9),
+ ghc (>= 8),
  ghc-prof,
- libghc-hstringtemplate-dev (>= 0.8),
- libghc-hstringtemplate-dev (<< 0.9),
- libghc-hstringtemplate-prof,
- libghc-http-dev,
- libghc-http-prof,
- libghc-x11-dev (>= 1.5.0.1),
- libghc-x11-prof,
+ haskell-devscripts (>= 0.10),
  libghc-cairo-dev,
  libghc-cairo-prof,
  libghc-containers-dev,
  libghc-containers-prof,
- libghc-dbus-dev (>= 0.10.1),
  libghc-dbus-dev (<< 1.0),
+ libghc-dbus-dev (>= 0.10.1),
  libghc-dbus-prof,
- libghc-dyre-dev (>= 0.8.6),
  libghc-dyre-dev (<< 0.9),
+ libghc-dyre-dev (>= 0.8.6),
  libghc-dyre-prof,
  libghc-enclosed-exceptions-dev (>= 1.0.0.1),
  libghc-enclosed-exceptions-prof,
  libghc-filepath-dev,
  libghc-filepath-prof,
- libghc-gtk-dev (>= 0.12.1),
  libghc-gtk-dev (<< 0.15),
+ libghc-gtk-dev (>= 0.12),
+ libghc-gtk-dev (>= 0.12.1),
  libghc-gtk-prof,
- libghc-gtk-traymanager-dev (>= 0.1.2),
  libghc-gtk-traymanager-dev (<< 0.2),
+ libghc-gtk-traymanager-dev (>= 0.1.2),
  libghc-gtk-traymanager-prof,
+ libghc-hstringtemplate-dev (<< 0.9),
+ libghc-hstringtemplate-dev (>= 0.8),
+ libghc-hstringtemplate-prof,
+ libghc-http-dev,
+ libghc-http-prof,
  libghc-mtl-dev (>= 2),
  libghc-mtl-prof,
- libghc-network-dev (>= 2.6),
  libghc-network-dev (<< 3),
+ libghc-network-dev (>= 2.6),
  libghc-network-prof,
- libghc-network-uri-dev (>= 2.6),
  libghc-network-uri-dev (<< 3),
+ libghc-network-uri-dev (>= 2.6),
  libghc-network-uri-prof,
  libghc-old-locale-dev,
  libghc-old-locale-prof,
  libghc-parsec3-dev (>= 3.1),
  libghc-parsec3-prof,
- libghc-safe-dev (>= 0.3),
  libghc-safe-dev (<< 1),
+ libghc-safe-dev (>= 0.3),
  libghc-safe-prof,
  libghc-split-dev (>= 0.1.4.2),
  libghc-split-prof,
@@ -56,25 +57,24 @@ Build-Depends: debhelper (>= 9),
  libghc-stm-prof,
  libghc-text-dev,
  libghc-text-prof,
- libghc-time-locale-compat-dev (>= 0.1),
  libghc-time-locale-compat-dev (<< 0.2),
+ libghc-time-locale-compat-dev (>= 0.1),
  libghc-time-locale-compat-prof,
  libghc-utf8-string-dev,
  libghc-utf8-string-prof,
- libghc-xdg-basedir-dev (>= 0.2),
+ libghc-x11-dev (>= 1.5.0.1),
+ libghc-x11-prof,
+ libghc-xdg-basedir-dev,
  libghc-xdg-basedir-dev (<< 0.3),
+ libghc-xdg-basedir-dev (>= 0.2),
  libghc-xdg-basedir-prof,
- libghc-xmonad-dev,
- libghc-xmonad-prof,
  libghc-xmonad-contrib-dev,
  libghc-xmonad-contrib-prof,
+ libghc-xmonad-dev,
+ libghc-xmonad-prof,
  libgtk2.0-dev,
- libghc-gtk-dev (>= 0.12),
- libghc-xdg-basedir-dev,
-Build-Depends-Indep: ghc-doc,
- libghc-hstringtemplate-doc,
- libghc-http-doc,
- libghc-x11-doc,
+Build-Depends-Indep:
+ ghc-doc,
  libghc-cairo-doc,
  libghc-containers-doc,
  libghc-dbus-doc,
@@ -83,6 +83,8 @@ Build-Depends-Indep: ghc-doc,
  libghc-filepath-doc,
  libghc-gtk-doc,
  libghc-gtk-traymanager-doc,
+ libghc-hstringtemplate-doc,
+ libghc-http-doc,
  libghc-mtl-doc,
  libghc-network-doc,
  libghc-network-uri-doc,
@@ -94,12 +96,13 @@ Build-Depends-Indep: ghc-doc,
  libghc-text-doc,
  libghc-time-locale-compat-doc,
  libghc-utf8-string-doc,
+ libghc-x11-doc,
  libghc-xdg-basedir-doc,
- libghc-xmonad-doc,
  libghc-xmonad-contrib-doc,
+ libghc-xmonad-doc,
 Standards-Version: 3.9.8
 Homepage: http://github.com/travitch/taffybar
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-taffybar
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/taffybar
 Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
 X-Description: desktop bar extensible in Haskell
  This bar is based on gtk2hs and provides several widgets (including a few
@@ -108,13 +111,17 @@ X-Description: desktop bar extensible in Haskell
 
 Package: libghc-taffybar-dev
 Architecture: any
-Depends: ${haskell:Depends},
- ${shlibs:Depends},
- ${misc:Depends},
+Depends:
  libgtk2.0-dev,
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+ ${haskell:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
 Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
  ${haskell:LongDescription}
  .
@@ -122,11 +129,15 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
 
 Package: libghc-taffybar-prof
 Architecture: any
-Depends: ${haskell:Depends},
+Depends:
+ ${haskell:Depends},
  ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
 Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
  ${haskell:LongDescription}
  .
@@ -135,10 +146,13 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
 Package: libghc-taffybar-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends},
+Depends:
  ${haskell:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
+ ${misc:Depends},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
 Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
  ${haskell:LongDescription}
  .
@@ -146,14 +160,18 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
 
 Package: taffybar
 Architecture: any
-Depends: ${haskell:Depends},
- ${shlibs:Depends},
+Depends:
+ ${haskell:Depends},
  ${misc:Depends},
-Recommends: ${haskell:Recommends},
+ ${shlibs:Depends},
+Recommends:
  libghc-taffybar-dev,
  libghc-taffybar-doc,
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
 Description: desktop bar extensible in Haskell
  This bar is based on gtk2hs and provides several widgets (including a few
  graphical ones).