diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/control | 28 |
2 files changed, 23 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog index ad59078c0..429e4674b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,16 +7,18 @@ git-annex (5.20150714) UNRELEASED; urgency=medium edge cases of option parsing. (For example, the metadata command no longer accepts the combination of --get and --set, which never actually worked.) - * Bash completion code is built-in to git-annex, and can be enabled by - running: source <(git-annex --bash-completion-script git-annex) + * Bash completion file is now included in the git-annex source tree, + and installed into Debian package (and any other packages built using make + install). This bash completion is generated by the option parser, so it + covers all commands, all options, and will never go out of date! * As well as tab completing "git-annex" commands, "git annex" will also tab complete. However, git's bash completion script needs a patch, which I've submitted, for this to work prefectly. - * Debian package (and any other packages built using make install) - now includes bash completion. * version --raw now works when run outside a git repository. * assistant --startdelay now works when run outside a git repository. * dead now accepts multiple --key options. + * addurl now accepts --prefix and --suffix options to adjust the + filenames used. * sync --content: Fix bug that caused files to be uploaded to eg, more archive remotes than wanted copies, only to later be dropped to satisfy the preferred content settings. @@ -25,6 +27,9 @@ git-annex (5.20150714) UNRELEASED; urgency=medium permalinks in rss feeds, it now also looks at guids. * importfeed: Look at not only permalinks, but now also guids to identify previously downloaded files. + * Adjust debian build deps: The webapp can now build on arm64, s390x + and hurd-i386. WebDAV support is also available on those architectures. + * Debian package now maintained by Richard Hartmann. -- Joey Hess <id@joeyh.name> Fri, 10 Jul 2015 16:36:42 -0400 diff --git a/debian/control b/debian/control index b89edc600..e26e1dc57 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,6 @@ Build-Depends: libghc-aws-dev (>= 0.9.2-2~), libghc-conduit-dev, libghc-resourcet-dev, - libghc-dav-dev (>= 1.0) [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64el hurd-i386], libghc-quickcheck2-dev, libghc-monad-control-dev (>= 0.3), libghc-exceptions-dev (>= 0.6), @@ -32,17 +31,18 @@ Build-Depends: libghc-stm-dev (>= 2.3), libghc-dbus-dev (>= 0.10.7) [linux-any], libghc-fdo-notify-dev (>= 0.3) [linux-any], - libghc-yesod-dev (>= 1.2.6.1) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], - libghc-yesod-core-dev (>= 1.2.19) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], - libghc-yesod-form-dev (>= 1.3.15) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], - libghc-yesod-static-dev (>= 1.2.4) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], - libghc-yesod-default-dev (>= 1.2.0) [i386 amd64 armel armhf kfreebsd-amd64 powerpc ppc64el], - libghc-shakespeare-dev (>= 2.0.0) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], - libghc-clientsession-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], - libghc-warp-dev (>= 3.0.0.5) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], - libghc-warp-tls-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], - libghc-wai-dev [i386 amd64 kfreebsd-i386 armel armhf kfreebsd-amd64 powerpc ppc64el], - libghc-wai-extra-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], + libghc-yesod-dev (>= 1.2.6.1) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el s390x hurd-i386], + libghc-yesod-core-dev (>= 1.2.19) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el s390x hurd-i386], + libghc-yesod-form-dev (>= 1.3.15) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el s390x hurd-i386], + libghc-yesod-static-dev (>= 1.2.4) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el s390x hurd-i386], + libghc-yesod-default-dev (>= 1.2.0) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el s390x hurd-i386], + libghc-shakespeare-dev (>= 2.0.0) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el s390x hurd-i386], + libghc-clientsession-dev [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el s390x hurd-i386], + libghc-warp-dev (>= 3.0.0.5) [i386 amd64 armel armhf armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el s390x hurd-i386], + libghc-warp-tls-dev [i386 amd64 armel armhf armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el s390x hurd-i386], + libghc-wai-dev [i386 amd64 armel armhf armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el s390x hurd-i386], + libghc-wai-extra-dev [i386 amd64 armel armhf armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el s390x hurd-i386], + libghc-dav-dev (>= 1.0) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el s390x hurd-i386], libghc-securemem-dev, libghc-byteable-dev, libghc-dns-dev, @@ -70,7 +70,7 @@ Build-Depends: libghc-tasty-quickcheck-dev, libghc-tasty-rerun-dev, libghc-optparse-applicative-dev (>= 0.10), - lsof [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any], + lsof [linux-any], ikiwiki, perlmagick, git (>= 1:1.8.1), @@ -79,7 +79,7 @@ Build-Depends: curl, openssh-client, git-remote-gcrypt (>= 0.20130908-6), -Maintainer: Gergely Nagy <algernon@madhouse-project.org> +Maintainer: Richard Hartmann <richih@debian.org> Standards-Version: 3.9.6 Vcs-Git: git://git.kitenet.net/git-annex Homepage: http://git-annex.branchable.com/ |