summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal28
1 files changed, 19 insertions, 9 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index a98e3e34a..9a46077b1 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 5.20140306
+Version: 5.20140402
Cabal-Version: >= 1.8
License: GPL-3
Maintainer: Joey Hess <joey@kitenet.net>
@@ -7,6 +7,7 @@ Author: Joey Hess
Stability: Stable
Copyright: 2010-2014 Joey Hess
License-File: COPYRIGHT
+Extra-Source-Files: CHANGELOG
Homepage: http://git-annex.branchable.com/
Build-type: Custom
Category: Utility
@@ -43,8 +44,8 @@ Flag Assistant
Flag Webapp
Description: Enable git-annex webapp
-Flag Webapp-https
- Description: Enable git-annex webapp https
+Flag Webapp-secure
+ Description: Secure webapp
Flag Pairing
Description: Enable pairing
@@ -84,6 +85,9 @@ Flag Tahoe
Flag CryptoHash
Description: Enable use of cryptohash for checksumming
+Flag DesktopNotify
+ Description: Enable desktop environment notifications
+
Flag EKG
Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
Default: False
@@ -166,10 +170,16 @@ Executable git-annex
CPP-Options: -DWITH_KQUEUE
C-Sources: Utility/libkqueue.c
- if os(linux) && flag(Dbus)
- Build-Depends: dbus (>= 0.10.3)
- CPP-Options: -DWITH_DBUS
+ if (os(linux))
+ if flag(Dbus)
+ Build-Depends: dbus (>= 0.10.3)
+ CPP-Options: -DWITH_DBUS
+ if flag(DesktopNotify)
+ if flag(Dbus)
+ Build-Depends: dbus (>= 0.10.3), fdo-notify (>= 0.3)
+ CPP-Options: -DWITH_DESKTOP_NOTIFY -DWITH_DBUS_NOTIFICATIONS
+
if flag(Android)
Build-Depends: data-endian
CPP-Options: -D__ANDROID__ -DANDROID_SPLICES -D__NO_TH__
@@ -183,9 +193,9 @@ Executable git-annex
blaze-builder, crypto-api, hamlet, clientsession,
template-haskell, data-default, aeson, network-conduit
CPP-Options: -DWITH_WEBAPP
- if flag(Webapp) && flag (Webapp-https)
- Build-Depends: warp-tls (>= 1.4)
- CPP-Options: -DWITH_WEBAPP_HTTPS
+ if flag(Webapp) && flag (Webapp-secure)
+ Build-Depends: warp-tls (>= 1.4), securemem, byteable
+ CPP-Options: -DWITH_WEBAPP_SECURE
if flag(Pairing)
Build-Depends: network-multicast, network-info