diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 18 | ||||
| -rw-r--r-- | git-annex.cabal | 6 | ||||
| -rw-r--r-- | standalone/windows/build.sh | 2 |
4 files changed, 15 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index 81d28087c..58f440d46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ git-annex (4.20130602) UNRELEASED; urgency=low * Windows: The test suite now passes on Windows (a few broken parts are disabled). * assistant: On Linux, the expensive transfer scan is run niced. + * Enable assistant and WebDAV support on powerpc and sparc architectures, + which now have the necessary dependencies built. -- Joey Hess <joeyh@debian.org> Mon, 10 Jun 2013 12:52:44 -0400 diff --git a/debian/control b/debian/control index 2b838b764..42c43f123 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: libghc-dataenc-dev, libghc-utf8-string-dev, libghc-hs3-dev (>= 0.5.6), - libghc-dav-dev (>= 0.3) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 sparc], + libghc-dav-dev (>= 0.3) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc], libghc-quickcheck2-dev, libghc-monad-control-dev (>= 0.3), libghc-monadcatchio-transformers-dev, @@ -28,14 +28,14 @@ Build-Depends: libghc-hinotify-dev [linux-any], libghc-stm-dev (>= 2.3), libghc-dbus-dev (>= 0.10.3) [linux-any], - 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-amd64], - libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], - libghc-clientsession-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], - libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], - libghc-wai-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], - libghc-wai-logger-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], + libghc-yesod-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], + libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], + libghc-yesod-default-dev [i386 amd64 kfreebsd-amd64 powerpc sparc], + libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], + libghc-clientsession-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], + libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], + libghc-wai-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], + libghc-wai-logger-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], libghc-case-insensitive-dev, libghc-http-types-dev, libghc-blaze-builder-dev, diff --git a/git-annex.cabal b/git-annex.cabal index 5ac4d0f0b..4e14eb760 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 4.20130601 +Version: 4.20130621 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <joey@kitenet.net> @@ -107,7 +107,7 @@ Executable git-annex Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types CPP-Options: -DWITH_WEBDAV - if flag(Assistant) && ! os(windows) && ! os(solaris) + if flag(Assistant) && ! os(windows) && ! os(solaris) && ! os(gnu) Build-Depends: async, stm (>= 2.3) CPP-Options: -DWITH_ASSISTANT @@ -126,7 +126,7 @@ Executable git-annex Build-Depends: hfsevents CPP-Options: -DWITH_FSEVENTS else - if (! os(windows) && ! os(solaris) && ! os(linux)) + if (! os(windows) && ! os(solaris) && ! os(linux) && ! os(gnu)) CPP-Options: -DWITH_KQUEUE C-Sources: Utility/libkqueue.c diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index caea20983..43c4e2e08 100644 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -58,4 +58,4 @@ rm -f last-incremental-failed # Test git-annex rm -rf .t -withcyg dist/build/git-annex/git-annex.exe test +withcyg dist/build/git-annex/git-annex.exe test || true |