From efef527d5b2e42e261fa7af6947aad6553426ebe Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 12 Oct 2014 14:32:56 -0400 Subject: Merge from git-annex. Includes changing to new exceptions library, and some whitespace fixes. --- debian/changelog | 7 +++++++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f5b71bd..7364372 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +git-repair (1.20140915) UNRELEASED; urgency=medium + + * Prevent auto gc from happening when fetching from a remote. + * Merge from git-annex. + + -- Joey Hess Sun, 12 Oct 2014 14:31:33 -0400 + git-repair (1.20140914) unstable; urgency=medium * Update to build with optparse-applicative 0.10. Closes: #761552 diff --git a/debian/control b/debian/control index 37d0e80..42363e2 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,8 @@ Build-Depends: libghc-missingh-dev, libghc-hslogger-dev, libghc-network-dev, - libghc-extensible-exceptions-dev, + libghc-exceptions-dev (>= 0.6), + libghc-transformers-dev, libghc-unix-compat-dev, libghc-ifelse-dev, libghc-text-dev, -- cgit v1.2.3