ibuffer-filter-inclusion-3: regexp-quote directory

Add 0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch to
fix the problem.  Otherwise the test may fail for some paths like
those seen in an sbuild chroot,
e.g. build/emacs-i87jK3/emacs-26.1+1/...

diff --cc debian/.git-dpm
index ca8d14bc215d0781f10bf24aa18fb98b05a22ac9,0000000000000000000000000000000000000000..b992c64bb198bf3f3cecf79fa9e741cc6653422a
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- ef1a7ddf208a19da9d2dc265b8027fc4f589fccf
- ef1a7ddf208a19da9d2dc265b8027fc4f589fccf
 +# see git-dpm(1) from git-dpm package
++f36102cf4af82593dd08c28de140863868b98b2b
++f36102cf4af82593dd08c28de140863868b98b2b
 +511a2cebd6df0f71ec24b5939564fb58726ead84
 +511a2cebd6df0f71ec24b5939564fb58726ead84
 +emacs_26.1+1.orig.tar.xz
 +9318da32923e8a4a17ee23113302ff509c0d4056
 +24259708

diff --cc debian/patches/0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c71f51a82845e874c8a34958d5416ff66348326f
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch
@@@ -1,0 -1,0 +1,26 @@@
++From f36102cf4af82593dd08c28de140863868b98b2b Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 17 Dec 2018 15:15:25 -0600
++Subject: ibuffer-filter-inclusion-3: regexp-quote directory
++
++Otherwise the test may fail for some paths like those seen in a Debian
++sbuild chroot, e.g. build/emacs-i87jK3/emacs-26.1+1/...
++---
++ test/lisp/ibuffer-tests.el | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/test/lisp/ibuffer-tests.el b/test/lisp/ibuffer-tests.el
++index ff5162fefa5..c1d9ed9fc3b 100644
++--- a/test/lisp/ibuffer-tests.el
+++++ b/test/lisp/ibuffer-tests.el
++@@ -312,8 +312,8 @@ ibuffer-saved-filters
++                 (funcall create-non-file-buffer "ibuf-test-3.b" :size 50
++                          :mode #'text-mode
++                          :include-content "...but a multitude of drops?\n"))
++-               (dirA (with-current-buffer bufA default-directory))
++-               (dirB (with-current-buffer bufB default-directory)))
+++               (dirA (regexp-quote (with-current-buffer bufA default-directory)))
+++               (dirB (regexp-quote (with-current-buffer bufB default-directory))))
++           (should (ibuffer-included-in-filters-p
++                    bufA '((basename . "ibuf-test-3"))))
++           (should (ibuffer-included-in-filters-p

diff --cc debian/patches/series
index f141919faa8371d19100d63903f975006c464915,0000000000000000000000000000000000000000..3df9d295772ed1b31b8d53162366589da98d8407
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,11 -1,0 +1,12 @@@
 +0001-Prefer-usr-share-info-emacs.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
 +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
 +0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch
 +0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch
 +0010-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
 +0011-tramp-test42-remote-load-path-regexp-quote-directory.patch
++0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch