diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rwxr-xr-x | debian/rules | 7 |
4 files changed, 15 insertions, 7 deletions
@@ -7,7 +7,7 @@ BASEFLAGS=-threaded -Wall $(IGNORE) -outputdir $(GIT_ANNEX_TMP_BUILD_DIR) -IUtil # you can turn off some of these features. # # If you're using an old version of yesod, enable -DWITH_OLD_YESOD -FEATURES=$(GIT_ANNEX_LOCAL_FEATURES) -DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_PAIRING +FEATURES?=-DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_PAIRING bins=git-annex mans=git-annex.1 git-annex-shell.1 diff --git a/debian/changelog b/debian/changelog index 5eb34743f..d71bbe74c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,9 @@ git-annex (3.20120925) UNRELEASED; urgency=low GIT_ANNEX_LOCAL_FEATURES=-DWITH_OLD_YESOD * copy: Avoid updating the location log when no copy is performed. * configure: Test that uuid -m works, falling back to plain uuid if not. + * Avoid building the webapp on Debian architectures that do not yet + have template haskell and thus yesod. (Should be available for arm soonish + I hope). -- Joey Hess <joeyh@debian.org> Mon, 24 Sep 2012 19:58:07 -0400 diff --git a/debian/control b/debian/control index e92351ad2..5d722fafb 100644 --- a/debian/control +++ b/debian/control @@ -22,10 +22,11 @@ Build-Depends: libghc-edit-distance-dev, libghc-hinotify-dev [linux-any], libghc-stm-dev (>= 2.3), - libghc-dbus-dev, - libghc-yesod-dev, - libghc-yesod-static-dev, - libghc-yesod-default-dev, + libghc-dbus-dev [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-i386 kfreebsd-amd64], + libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], libghc-case-insensitive-dev, libghc-http-types-dev, libghc-transformers-dev, @@ -35,7 +36,6 @@ Build-Depends: libghc-blaze-builder-dev, libghc-blaze-html-dev, libghc-crypto-api-dev, - libghc-hamlet-dev, libghc-clientsession-dev, libghc-network-multicast-dev, libghc-network-info-dev, diff --git a/debian/rules b/debian/rules index aeb947054..c0fbd9aa4 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,11 @@ #!/usr/bin/make -f -export GIT_ANNEX_LOCAL_FEATURES=-DWITH_OLD_YESOD +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 +else +export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_PAIRING +endif %: dh $@ |