diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-02-07 14:12:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-02-07 14:12:39 -0400 |
| commit | b51d7de6085603599f97e7c69038328f036cd861 (patch) | |
| tree | 472a3f604edb4a532c448d969f58ca801d2a3fb3 /debian | |
| parent | b8140f3fc2586603da9b92bad2346ecf4cba99c7 (diff) | |
| parent | 7d04f3ad58a3789d77b1e90e502a27d66a90e0d3 (diff) | |
Merge branch 'ghc7.4'
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 96234d927..30b7090be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ git-annex (3.20120124) UNRELEASED; urgency=low git-annex's existing ability to recover in this situation. This is used by git-annex-shell and other places where changes are made to a remote's location log. + * Modifications to support ghc 7.4's handling of filenames. + This version can only be built with ghc 7.4. -- Joey Hess <joeyh@debian.org> Tue, 24 Jan 2012 16:21:55 -0400 diff --git a/debian/control b/debian/control index c3ddad932..5d5956de8 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Build-Depends: debhelper (>= 9), - ghc, + ghc (>= 7.4), libghc-missingh-dev, libghc-hslogger-dev, libghc-pcre-light-dev, |