diff options
author | Joey Hess <joey@kitenet.net> | 2012-06-26 09:15:47 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-06-26 09:15:47 -0400 |
commit | 41fcb3d852d756ed218f3458af1ff9c7ae6d0e1d (patch) | |
tree | 8696e46240610e4bdab657d38b6209cf50914982 /debian | |
parent | 6168795c1a92c509bbd16e29717d9a02afe8414c (diff) |
Version build dependency on STM, and allow building without it, which disables the watch command.
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/control | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 2c289667d..92e992ed7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ git-annex (3.20120625) UNRELEASED; urgency=low * cabal: Only try to use inotify on Linux. + * Version build dependency on STM, and allow building without it, + which disables the watch command. -- Joey Hess <joeyh@debian.org> Mon, 25 Jun 2012 11:38:12 -0400 diff --git a/debian/control b/debian/control index bcecbec3d..79702ed29 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Build-Depends: libghc-bloomfilter-dev, libghc-edit-distance-dev, libghc-hinotify-dev [linux-any], - libghc-stm-dev, + libghc-stm-dev (>= 2.3), ikiwiki, perlmagick, git, |