also drop old dbus compat

This commit is contained in:
Joey Hess 2015-04-22 16:23:41 -04:00
parent eb8ef44133
commit 8f010bb55b
5 changed files with 4 additions and 16 deletions

View file

@ -63,11 +63,7 @@ dbusThread urlrenderer = do
wasmounted <- liftIO $ swapMVar mvar nowmounted
handleMounts urlrenderer wasmounted nowmounted
liftIO $ forM_ mountChanged $ \matcher ->
#if MIN_VERSION_dbus(0,10,7)
void $ addMatch client matcher handleevent
#else
listen client matcher handleevent
#endif
, do
liftAnnex $
warning "No known volume monitor available through dbus; falling back to mtab polling"

View file

@ -112,11 +112,7 @@ checkNetMonitor client = do
-}
listenNMConnections :: Client -> (Bool -> IO ()) -> IO ()
listenNMConnections client setconnected =
#if MIN_VERSION_dbus(0,10,7)
void $ addMatch client matcher
#else
listen client matcher
#endif
$ \event -> mapM_ handleevent
(map dictionaryItems $ mapMaybe fromVariant $ signalBody event)
where
@ -166,11 +162,7 @@ listenWicdConnections client setconnected = do
| any (== wicd_disconnected) status = setconnected False
| otherwise = noop
match matcher a =
#if MIN_VERSION_dbus(0,10,7)
void $ addMatch client matcher a
#else
listen client matcher a
#endif
#endif
handleConnection :: Assistant ()

2
debian/changelog vendored
View file

@ -1,7 +1,7 @@
git-annex (5.20150421) UNRELEASED; urgency=medium
* S3: Enable debug logging when annex.debug or --debug is set.
* Dropped support for older versions of yesod and warp than the ones
* Dropped support for older versions of yesod, warp, and dbus than the ones
in Debian Jessie.
-- Joey Hess <id@joeyh.name> Tue, 21 Apr 2015 15:54:10 -0400

2
debian/control vendored
View file

@ -31,7 +31,7 @@ Build-Depends:
libghc-edit-distance-dev,
libghc-hinotify-dev [linux-any],
libghc-stm-dev (>= 2.3),
libghc-dbus-dev (>= 0.10.3) [linux-any],
libghc-dbus-dev (>= 0.10.7) [linux-any],
libghc-fdo-notify-dev (>= 0.3) [linux-any],
libghc-yesod-dev (>= 1.2.6.1) [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc],
libghc-yesod-core-dev (>= 1.2.19) [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc],

View file

@ -1,5 +1,5 @@
Name: git-annex
Version: 5.20150420
Version: 5.20150421
Cabal-Version: >= 1.8
License: GPL-3
Maintainer: Joey Hess <id@joeyh.name>
@ -183,7 +183,7 @@ Executable git-annex
if (os(linux))
if flag(Dbus)
Build-Depends: dbus (>= 0.10.3)
Build-Depends: dbus (>= 0.10.7)
CPP-Options: -DWITH_DBUS
if flag(DesktopNotify)