summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-31 11:50:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-31 11:50:43 -0400
commita9c092e3adc2253e83f0d1155eee8d19a65404e9 (patch)
tree111ef749e945e6b04bf23c0112b60826347d3cdc
parentb8096159665c92ebcbe8dbfed72d82dfd89f4028 (diff)
added a missing build-dep
-rw-r--r--debian/control1
-rw-r--r--doc/bugs/Building_fails:__Could_not_find_module___96__Data.XML.Types__39__.mdwn3
-rw-r--r--doc/install/fromscratch.mdwn1
-rw-r--r--git-annex.cabal2
4 files changed, 5 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index d7e38096b..24b204ed7 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,7 @@ Build-Depends:
libghc-network-info-dev,
libghc-safesemaphore-dev,
libghc-network-protocol-xmpp-dev (>= 0.4.3-2),
+ libghc-xml-types-dev,
ikiwiki,
perlmagick,
git,
diff --git a/doc/bugs/Building_fails:__Could_not_find_module___96__Data.XML.Types__39__.mdwn b/doc/bugs/Building_fails:__Could_not_find_module___96__Data.XML.Types__39__.mdwn
index a17a9c1b6..c03353436 100644
--- a/doc/bugs/Building_fails:__Could_not_find_module___96__Data.XML.Types__39__.mdwn
+++ b/doc/bugs/Building_fails:__Could_not_find_module___96__Data.XML.Types__39__.mdwn
@@ -78,4 +78,5 @@ git-annex HEAD from git, Ubuntu 12.10
Please provide any additional information below.
-
+> [[done]] --[[Joey]] (and tested the whole cabal build, which I usually
+> only do on releases)
diff --git a/doc/install/fromscratch.mdwn b/doc/install/fromscratch.mdwn
index 32dad01ec..d192f0805 100644
--- a/doc/install/fromscratch.mdwn
+++ b/doc/install/fromscratch.mdwn
@@ -45,6 +45,7 @@ quite a lot.
* [network-info](http://hackage.haskell.org/package/network-info)
* [network-protocol-xmpp](http://hackage.haskell.org/package/network-protocol-xmpp)
* [dns](http://hackage.haskell.org/package/dns)
+ * [xml-types](http://hackage.haskell.org/package/xml-types)
* Shell commands
* [git](http://git-scm.com/)
* [uuid](http://www.ossp.org/pkg/lib/uuid/)
diff --git a/git-annex.cabal b/git-annex.cabal
index 95b183cf3..344ef3e59 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -98,7 +98,7 @@ Executable git-annex
CPP-Options: -DWITH_PAIRING
if flag(XMPP) && flag(Assistant)
- Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4)
+ Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types
CPP-Options: -DWITH_XMPP
if flag(XMPP) && flag(Assistant) && flag(DNS)