[DHG_packages] 02/03: xmonad-contrib: Upgrading from 0.12 to 0.13

Clint Adams clint at moszumanska.debian.org
Thu Jul 6 02:29:05 UTC 2017


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

clint pushed a commit to branch master
in repository DHG_packages.

commit e726adcae51fa774b1de866e8660f7cced1a9efb
Author: Clint Adams <clint at debian.org>
Date:   Wed Jul 5 22:20:40 2017 -0400

    xmonad-contrib: Upgrading from 0.12 to 0.13
---
 p/xmonad-contrib/debian/changelog                  |  6 +++
 p/xmonad-contrib/debian/control                    | 16 +++---
 .../a681e6860295089f66210f93ff2db3a5047f59b5.patch | 61 ----------------------
 p/xmonad-contrib/debian/patches/series             |  1 -
 4 files changed, 14 insertions(+), 70 deletions(-)

diff --git a/p/xmonad-contrib/debian/changelog b/p/xmonad-contrib/debian/changelog
index 1d22598..6474745 100644
--- a/p/xmonad-contrib/debian/changelog
+++ b/p/xmonad-contrib/debian/changelog
@@ -1,3 +1,9 @@
+xmonad-contrib (0.13-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint at debian.org>  Wed, 05 Jul 2017 22:20:40 -0400
+
 xmonad-contrib (0.12-4) unstable; urgency=medium
 
   [ Ilias Tsitsimpis ]
diff --git a/p/xmonad-contrib/debian/control b/p/xmonad-contrib/debian/control
index bae62aa..e16dfa9 100644
--- a/p/xmonad-contrib/debian/control
+++ b/p/xmonad-contrib/debian/control
@@ -11,6 +11,11 @@ Build-Depends:
  ghc (>= 8),
  ghc-prof,
  haskell-devscripts (>= 0.13),
+ libghc-x11-dev (>= 1.6.1),
+ libghc-x11-dev (<< 1.9),
+ libghc-x11-prof,
+ libghc-x11-xft-dev (>= 0.2),
+ libghc-x11-xft-prof,
  libghc-extensible-exceptions-dev,
  libghc-extensible-exceptions-prof,
  libghc-mtl-dev (<< 3),
@@ -24,13 +29,8 @@ Build-Depends:
  libghc-random-prof,
  libghc-utf8-string-dev,
  libghc-utf8-string-prof,
- libghc-x11-dev (<< 1.7),
- libghc-x11-dev (>= 1.6.1),
- libghc-x11-prof,
- libghc-x11-xft-dev (>= 0.2),
- libghc-x11-xft-prof,
- libghc-xmonad-dev (<< 0.13),
- libghc-xmonad-dev (>= 0.12),
+ libghc-xmonad-dev (>= 0.13),
+ libghc-xmonad-dev (<< 0.14),
  libghc-xmonad-prof,
  libx11-dev,
  libxinerama-dev,
@@ -43,7 +43,7 @@ Build-Depends-Indep:
  libghc-x11-doc,
  libghc-x11-xft-doc,
  libghc-xmonad-doc,
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Homepage: http://xmonad.org/
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/xmonad-contrib
 Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
diff --git a/p/xmonad-contrib/debian/patches/a681e6860295089f66210f93ff2db3a5047f59b5.patch b/p/xmonad-contrib/debian/patches/a681e6860295089f66210f93ff2db3a5047f59b5.patch
deleted file mode 100644
index 4e520cf..0000000
--- a/p/xmonad-contrib/debian/patches/a681e6860295089f66210f93ff2db3a5047f59b5.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-## Description: add some description
-## Origin/Author: add some origin or author
-## Bug: bug URL
-From a681e6860295089f66210f93ff2db3a5047f59b5 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <siarheit at google.com>
-Date: Sun, 27 Nov 2016 10:03:17 +0000
-Subject: [PATCH] XMonad/Layout/Groups/Helpers.hs: drop broken
- ImpredicativeTypes extension (fixes #123)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-ImpredicativeTypes is practically unsupported extension
-on it's way to be removed from GHC:
-    https://mail.haskell.org/pipermail/ghc-devs/2016-September/012826.html
-
-GHC-8.0.2-rc1 already fails to build xmonad-contrib as:
-
-  XMonad/Layout/Groups/Helpers.hs:181:22: error:
-    • Couldn't match type ‘G.WithID l0 Window
-                           -> XMonad.Util.Stack.Zipper (G.Group l0 Window)
-                           -> XMonad.Util.Stack.Zipper (G.Group l0 Window)’
-                     with ‘G.ModifySpec’
-      Expected type: (G.WithID l0 Window
-                      -> XMonad.Util.Stack.Zipper (G.Group l0 Window)
-                      -> XMonad.Util.Stack.Zipper (G.Group l0 Window))
-                     -> G.GroupsMessage
-        Actual type: G.ModifySpec -> G.GroupsMessage
-    • In the second argument of ‘(.)’, namely ‘G.Modify’
-      In the expression: sendMessage . G.Modify
-      In an equation for ‘wrap’: wrap = sendMessage . G.Modify
-
-The workaround is simple: add explicit types to applications
-or open-code direct application (this change).
-
-Bug: https://github.com/xmonad/xmonad-contrib/issues/123
-Signed-off-by: Sergei Trofimovich <siarheit at google.com>
----
- XMonad/Layout/Groups/Helpers.hs | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/XMonad/Layout/Groups/Helpers.hs b/XMonad/Layout/Groups/Helpers.hs
-index 4bafdd3..baf4281 100644
---- a/XMonad/Layout/Groups/Helpers.hs
-+++ b/XMonad/Layout/Groups/Helpers.hs
-@@ -1,5 +1,5 @@
- {-# OPTIONS_GHC -fno-warn-missing-signatures #-}
--{-# LANGUAGE MultiParamTypeClasses, Rank2Types, ImpredicativeTypes #-}
-+{-# LANGUAGE MultiParamTypeClasses, Rank2Types #-}
- 
- -----------------------------------------------------------------------------
- -- |
-@@ -178,7 +178,7 @@ focusFloatDown = focusHelper id id
- -- ** Groups-specific actions
- 
- wrap :: G.ModifySpec -> X ()
--wrap = sendMessage . G.Modify
-+wrap x = sendMessage (G.Modify x)
- 
- -- | Swap the focused group with the previous one
- swapGroupUp :: X ()
diff --git a/p/xmonad-contrib/debian/patches/series b/p/xmonad-contrib/debian/patches/series
index 05092bf..0df33a7 100644
--- a/p/xmonad-contrib/debian/patches/series
+++ b/p/xmonad-contrib/debian/patches/series
@@ -1,2 +1 @@
 use-x-www-browser.patch
-a681e6860295089f66210f93ff2db3a5047f59b5.patch

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



More information about the Pkg-haskell-commits mailing list