mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

addurl --fast: Use curl, rather than haskell HTTP library, to support https.

Browse source
This commit is contained in:
Joey Hess 2013-01-27 09:30:53 +11:00
parent 9ba8abffc6
commit d3d791c7e7
7 changed files with 31 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -3,6 +3,7 @@ git-annex (3.20130125) UNRELEASED; urgency=low
* webapp: Now allows restarting any threads that crash.
* Adjust debian package to only build-depend on DAV on architectures
where it is available.
* addurl --fast: Use curl, rather than haskell HTTP library, to support https.
-- Joey Hess <joeyh@debian.org> Sat, 26 Jan 2013 15:48:40 +1100

1
debian/control vendored
View file

@ -10,7 +10,6 @@ Build-Depends:
libghc-pcre-light-dev,
libghc-sha-dev,
libghc-dataenc-dev,
libghc-http-dev,
libghc-utf8-string-dev,
libghc-hs3-dev (>= 0.5.6),
libghc-dav-dev (>= 0.3) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 sparc],

4
debian/rules vendored
View file

@ -1,9 +1,9 @@
#!/usr/bin/make -f
ifeq (install ok installed,$(shell dpkg-query -W -f '$${Status}' libghc-yesod-dev 2>/dev/null))
export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_HOST -DWITH_OLD_URI -DWITH_PAIRING -DWITH_XMPP -DWITH_WEBAPP -DWITH_OLD_YESOD
export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_HOST -DWITH_PAIRING -DWITH_XMPP -DWITH_WEBAPP -DWITH_OLD_YESOD
else
export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_HOST -DWITH_OLD_URI -DWITH_PAIRING -DWITH_XMPP
export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_HOST -DWITH_PAIRING -DWITH_XMPP
endif
ifeq (install ok installed,$(shell dpkg-query -W -f '$${Status}' libghc-dav-dev 2>/dev/null))
export FEATURES:=${FEATURES} -DWITH_WEBDAV