summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-12-18 21:54:32 +0000
committerSean Whitton <spwhitton@spwhitton.name>2018-12-18 21:54:32 +0000
commit37fa564556b6ed47cb015c4c20879fa149318f9a (patch)
tree88e2333fe8d3ff2fba3b84613c6eaf5540cd4bfa
parentaeecbeaead16627c66065690f5873c7a42a518ef (diff)
Commit Debian 3.0 (quilt) metadatadebian/7.20181211-2archive/debian/7.20181211-2
[dgit (8.1~bpo9+1) quilt-fixup]
-rw-r--r--debian/patches/debian-changes13
1 files changed, 13 insertions, 0 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index 5ad409f3d2..6156def608 100644
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -38,3 +38,16 @@ A single combined diff, containing all the changes, follows.
License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
+--- git-annex-7.20181211.orig/Test.hs
++++ git-annex-7.20181211/Test.hs
+@@ -145,8 +145,8 @@ tests crippledfilesystem opts = testGrou
+ map (\(d, te) -> withTestMode te initTests (unitTests d)) testmodes
+ where
+ testmodes = catMaybes
+- [ Just ("v7 unlocked", (testMode opts (RepoVersion 7)) { unlockedFiles = True })
+- , unlesscrippled ("v5", testMode opts (RepoVersion 5))
++ -- Just ("v7 unlocked", (testMode opts (RepoVersion 7)) { unlockedFiles = True })
++ [ unlesscrippled ("v5", testMode opts (RepoVersion 5))
+ , unlesscrippled ("v7 locked", testMode opts (RepoVersion 7))
+ , Just ("v5 direct", (testMode opts (RepoVersion 5)) { forceDirect = True })
+ ]