diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-22 16:23:41 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-22 16:23:41 -0400 |
| commit | 8112d0a6978caad2b2852b41b8eb284f9a5d4605 (patch) | |
| tree | 200a9291c299c26650f7dfa03f7253f2c2c6ef8b | |
| parent | 05abf0e4e99e7a146505da09d275c56fd0aafad4 (diff) | |
also drop old dbus compat
| -rw-r--r-- | Assistant/Threads/MountWatcher.hs | 4 | ||||
| -rw-r--r-- | Assistant/Threads/NetWatcher.hs | 8 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 4 |
5 files changed, 4 insertions, 16 deletions
diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs index 023af53cb..3ccdd1adc 100644 --- a/Assistant/Threads/MountWatcher.hs +++ b/Assistant/Threads/MountWatcher.hs @@ -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" diff --git a/Assistant/Threads/NetWatcher.hs b/Assistant/Threads/NetWatcher.hs index ad3a87a91..07ccdaf24 100644 --- a/Assistant/Threads/NetWatcher.hs +++ b/Assistant/Threads/NetWatcher.hs @@ -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 () diff --git a/debian/changelog b/debian/changelog index e71152bd7..4553130d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/debian/control b/debian/control index f49751251..ce7ce7504 100644 --- a/debian/control +++ b/debian/control @@ -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], diff --git a/git-annex.cabal b/git-annex.cabal index dc1773224..1f32067b2 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -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) |