diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-03-31 12:15:32 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-03-31 12:20:38 -0700 |
| commit | 0e2a53a3595c778adad670ed8cdcdfc3b0ed9f81 (patch) | |
| tree | d0affecdb5c40f18e7560f0872784cb4eac72bb2 | |
| parent | e12e743301ccaa8b060a6f87e972c877fdf3d0bf (diff) | |
Commit Debian 3.0 (quilt) metadata
[dgit (8.4) quilt-fixup]
| -rw-r--r-- | debian/patches/debian-changes | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index 3765434cff..e5c0124f30 100644 --- a/debian/patches/debian-changes +++ b/debian/patches/debian-changes @@ -65,3 +65,25 @@ A single combined diff, containing all the changes, follows. , unlesscrippled ("v7 locked", testMode opts (RepoVersion 7)) , Just ("v5 direct", (testMode opts (RepoVersion 5)) { forceDirect = True }) ] +--- git-annex-7.20190129.orig/Test/Framework.hs ++++ git-annex-7.20190129/Test/Framework.hs +@@ -271,7 +271,7 @@ finalCleanup = whenM (doesDirectoryExist + Utility.ThreadScheduler.Seconds 10 + whenM (doesDirectoryExist tmpdir) $ do + Annex.Action.reapZombies +- removeDirectoryRecursive tmpdir ++ removePathForcibly tmpdir + + checklink :: FilePath -> Assertion + checklink f = +--- git-annex-7.20190129.orig/git-annex.cabal ++++ git-annex-7.20190129/git-annex.cabal +@@ -313,7 +313,7 @@ Executable git-annex + unix-compat, + SafeSemaphore, + async, +- directory (>= 1.2), ++ directory (>= 1.2.7.0), + disk-free-space, + filepath, + IfElse, |