From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 31 Jul 2023 08:27:09 +0000 (+0100)
Subject: Patch project-vc-recognizes-git test for Debian build
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~22
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0e14e49be74580edcd2a8e0f3da43ce277ae258e;p=emacs.git

Patch project-vc-recognizes-git test for Debian build
---

0e14e49be74580edcd2a8e0f3da43ce277ae258e
diff --cc debian/.git-dpm
index e09cc1fd353,00000000000..59679086fe6
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 3d9b8aa890c41da85ce4e8fb863ba719406aa0f8
- 3d9b8aa890c41da85ce4e8fb863ba719406aa0f8
++203201f1f29e74ba00a27f1b16cfb2d12d32468c
++203201f1f29e74ba00a27f1b16cfb2d12d32468c
 +52397a199934d2d72155696b172908226086f530
 +52397a199934d2d72155696b172908226086f530
 +emacs_29.1+1.orig.tar.xz
 +7b71a5f966ce6789e14bf3d96a62ccbe77a8d51c
 +29225688
diff --cc debian/patches/0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch
index 00000000000,00000000000..8b3c156a0cf
new file mode 100644
--- /dev/null
+++ b/debian/patches/0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 203201f1f29e74ba00a27f1b16cfb2d12d32468c Mon Sep 17 00:00:00 2001
++From: Sean Whitton <spwhitton@spwhitton.name>
++Date: Mon, 31 Jul 2023 09:26:48 +0100
++Subject: Patch project-vc-recognizes-git test for Debian build
++
++---
++ test/lisp/progmodes/project-tests.el | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/test/lisp/progmodes/project-tests.el b/test/lisp/progmodes/project-tests.el
++index 5a206b67db1..7593fb232e1 100644
++--- a/test/lisp/progmodes/project-tests.el
+++++ b/test/lisp/progmodes/project-tests.el
++@@ -124,7 +124,7 @@ project-vc-recognizes-git
++          (project (project-current nil dir)))
++     (should-not (null project))
++     (should (string-match-p
++-             "\\`test/lisp/progmodes/project-tests\\.elc?"
+++             "\\`debian/build-[a-z]+/test/lisp/progmodes/project-tests\\.elc?"
++              (file-relative-name
++               project-tests--this-file
++               (project-root project))))))
diff --cc debian/patches/series
index 83dfffaff3f,00000000000..97a594909fb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,13 -1,0 +1,14 @@@
 +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-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
 +0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch
 +0010-Mark-test-undo-region-as-unstable.patch
 +0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch
 +0012-Add-inhibit-native-compilation.patch
 +0013-Rename-to-inhibit-automatic-native-compilation.patch
++0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch