diff options
author | Joey Hess <joey@kitenet.net> | 2012-10-26 19:42:24 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-10-26 19:42:24 -0400 |
commit | 117df9c3714f2366d4f10d63fce41a608d96308e (patch) | |
tree | 47155e8948b3137cf2ee527afe2984899a3685eb /debian/control | |
parent | d2b9c300b12a025de66f39efafd7962dc591a330 (diff) | |
parent | 26fb68355b4ad95f99b2d14110e683109d0bab3d (diff) |
Merge branch 'master' into xmpp
Conflicts:
Assistant/Threads/NetWatcher.hs
Diffstat (limited to 'debian/control')
-rw-r--r-- | debian/control | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 5a837a46c..edd5e4d61 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: libghc-edit-distance-dev, libghc-hinotify-dev [linux-any], libghc-stm-dev (>= 2.3), - libghc-dbus-dev [linux-any] (>= 0.10.2), + libghc-dbus-dev [linux-any] (>= 0.10.3), libghc-yesod-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], libghc-yesod-default-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], |