diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-27 00:55:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-27 00:55:13 -0400 |
| commit | c3692ecb678a142f609ebc5670f62425beba093d (patch) | |
| tree | d0a480dac6c2b1cf987fce31d61ff36b2141602a /debian | |
| parent | 6fe39060b2aa9c9a4d87e709b6378cf89f76775c (diff) | |
| parent | 6a5ccaf2f6d5e65e095d09f2fa7d7ba71e05771f (diff) | |
Merge branch 'xmpp'
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 4de0223f3..eb20d425b 100644 --- a/debian/control +++ b/debian/control @@ -40,6 +40,7 @@ Build-Depends: libghc-network-multicast-dev, libghc-network-info-dev, libghc-safesemaphore-dev, + libghc-network-protocol-xmpp-dev (>= 0.4.3-2), ikiwiki, perlmagick, git, diff --git a/debian/rules b/debian/rules index c0fbd9aa4..4a5532027 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,9 @@ ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH) ifeq (install ok installed,$(shell dpkg-query -W -f '$${Status}' libghc-yesod-dev 2>/dev/null)) -export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_OLD_YESOD -DWITH_WEBAPP -DWITH_PAIRING +export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_OLD_YESOD -DWITH_WEBAPP -DWITH_PAIRING -DWITH_XMPP else -export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_PAIRING +export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_PAIRING -DWITH_XMPP endif %: |