diff -Nru xmonad-contrib-0.11.3/debian/changelog xmonad-contrib-0.11.4/debian/changelog --- xmonad-contrib-0.11.3/debian/changelog 2014-07-04 08:44:34.000000000 +0000 +++ xmonad-contrib-0.11.4/debian/changelog 2015-05-16 15:56:05.000000000 +0000 @@ -1,3 +1,18 @@ +xmonad-contrib (0.11.4-0~gekkio1~utopic1) utopic; urgency=medium + + * Backport to Utopic + + -- Joonas Javanainen Sat, 16 May 2015 18:55:50 +0300 + +xmonad-contrib (0.11.4-0~gekkio1) vivid; urgency=medium + + * New upstream release + * Apply patches from darcs: + + Fix dbus-send call in XMonad.Config.Gnome + * Add missing Applicative imports + + -- Joonas Javanainen Sat, 16 May 2015 18:33:55 +0300 + xmonad-contrib (0.11.3-1build2) utopic; urgency=medium * Rebuild for new GHC ABIs. diff -Nru xmonad-contrib-0.11.3/debian/patches/fix-applicative.patch xmonad-contrib-0.11.4/debian/patches/fix-applicative.patch --- xmonad-contrib-0.11.3/debian/patches/fix-applicative.patch 1970-01-01 00:00:00.000000000 +0000 +++ xmonad-contrib-0.11.4/debian/patches/fix-applicative.patch 2015-05-16 15:47:24.000000000 +0000 @@ -0,0 +1,24 @@ +Index: xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs +=================================================================== +--- xmonad-contrib-0.11.4.orig/XMonad/Util/Invisible.hs 2015-05-16 18:46:52.291804268 +0300 ++++ xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs 2015-05-16 18:46:52.291804268 +0300 +@@ -21,6 +21,7 @@ + , whenIJust + , fromIMaybe + ) where ++import Control.Applicative + + -- $usage + -- A wrapper data type to store layout state that shouldn't be persisted across +Index: xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs +=================================================================== +--- xmonad-contrib-0.11.4.orig/XMonad/Hooks/DebugEvents.hs 2015-05-16 18:38:28.000000000 +0300 ++++ xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs 2015-05-16 18:47:13.983554607 +0300 +@@ -47,6 +47,7 @@ + import System.Exit + import System.IO + import System.Process ++import Control.Applicative + + -- | Event hook to dump all received events. You should probably not use this + -- unconditionally; it will produce massive amounts of output. diff -Nru xmonad-contrib-0.11.3/debian/patches/fix-dbus-send.patch xmonad-contrib-0.11.4/debian/patches/fix-dbus-send.patch --- xmonad-contrib-0.11.3/debian/patches/fix-dbus-send.patch 1970-01-01 00:00:00.000000000 +0000 +++ xmonad-contrib-0.11.4/debian/patches/fix-dbus-send.patch 2015-05-16 15:38:47.000000000 +0000 @@ -0,0 +1,13 @@ +Index: xmonad-contrib-0.11.4/XMonad/Config/Gnome.hs +=================================================================== +--- xmonad-contrib-0.11.4.orig/XMonad/Config/Gnome.hs 2015-05-16 18:37:00.662604682 +0300 ++++ xmonad-contrib-0.11.4/XMonad/Config/Gnome.hs 2015-05-16 18:37:00.662604682 +0300 +@@ -74,7 +74,7 @@ + x <- lookup "DESKTOP_AUTOSTART_ID" `fmap` getEnvironment + whenJust x $ \sessionId -> safeSpawn "dbus-send" + ["--session" +- ,"--print-reply=string" ++ ,"--print-reply=literal" + ,"--dest=org.gnome.SessionManager" + ,"/org/gnome/SessionManager" + ,"org.gnome.SessionManager.RegisterClient" diff -Nru xmonad-contrib-0.11.3/debian/patches/series xmonad-contrib-0.11.4/debian/patches/series --- xmonad-contrib-0.11.3/debian/patches/series 2014-06-01 17:45:51.000000000 +0000 +++ xmonad-contrib-0.11.4/debian/patches/series 2015-05-16 15:42:37.000000000 +0000 @@ -1 +1,3 @@ use-x-www-browser.patch +fix-dbus-send.patch +fix-applicative.patch diff -Nru xmonad-contrib-0.11.3/XMonad/Config/Bluetile.hs xmonad-contrib-0.11.4/XMonad/Config/Bluetile.hs --- xmonad-contrib-0.11.3/XMonad/Config/Bluetile.hs 2014-05-02 01:34:25.000000000 +0000 +++ xmonad-contrib-0.11.4/XMonad/Config/Bluetile.hs 2015-03-27 18:00:21.000000000 +0000 @@ -1,4 +1,5 @@ {-# OPTIONS -fno-warn-missing-signatures #-} +{-# LANGUAGE FlexibleContexts #-} ---------------------------------------------------------------------------- -- | -- Module : XMonad.Config.Bluetile diff -Nru xmonad-contrib-0.11.3/XMonad/Hooks/DebugEvents.hs xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs --- xmonad-contrib-0.11.3/XMonad/Hooks/DebugEvents.hs 2014-05-02 01:34:25.000000000 +0000 +++ xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs 2015-03-27 18:00:21.000000000 +0000 @@ -270,6 +270,7 @@ newtype Decoder a = Decoder (ReaderT Decode (StateT DecodeState X) a) #ifndef __HADDOCK__ deriving (Functor + ,Applicative ,Monad ,MonadIO ,MonadState DecodeState diff -Nru xmonad-contrib-0.11.3/XMonad/Prompt.hs xmonad-contrib-0.11.4/XMonad/Prompt.hs --- xmonad-contrib-0.11.3/XMonad/Prompt.hs 2014-05-02 01:34:25.000000000 +0000 +++ xmonad-contrib-0.11.4/XMonad/Prompt.hs 2015-03-27 18:00:21.000000000 +0000 @@ -1,4 +1,4 @@ -{-# LANGUAGE ExistentialQuantification #-} +{-# LANGUAGE ExistentialQuantification, FlexibleContexts #-} ----------------------------------------------------------------------------- -- | -- Module : XMonad.Prompt diff -Nru xmonad-contrib-0.11.3/XMonad/Util/Invisible.hs xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs --- xmonad-contrib-0.11.3/XMonad/Util/Invisible.hs 2014-05-02 01:34:25.000000000 +0000 +++ xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs 2015-03-27 18:00:21.000000000 +0000 @@ -28,7 +28,7 @@ -- Invisible derives trivial definitions for Read and Show, so the wrapped data -- type need not do so. -newtype Invisible m a = I (m a) deriving (Monad, Functor) +newtype Invisible m a = I (m a) deriving (Monad, Functor, Applicative) instance (Functor m, Monad m) => Read (Invisible m a) where readsPrec _ s = [(fail "Read Invisible", s)] diff -Nru xmonad-contrib-0.11.3/xmonad-contrib.cabal xmonad-contrib-0.11.4/xmonad-contrib.cabal --- xmonad-contrib-0.11.3/xmonad-contrib.cabal 2014-05-02 01:34:25.000000000 +0000 +++ xmonad-contrib-0.11.4/xmonad-contrib.cabal 2015-03-27 18:00:21.000000000 +0000 @@ -1,5 +1,5 @@ name: xmonad-contrib -version: 0.11.3 +version: 0.11.4 homepage: http://xmonad.org/ synopsis: Third party extensions for xmonad description: