diff -Nru projectile-2.1.0/debian/changelog projectile-2.1.0/debian/changelog --- projectile-2.1.0/debian/changelog 2020-02-29 15:12:11.000000000 +0000 +++ projectile-2.1.0/debian/changelog 2022-05-19 14:10:12.000000000 +0000 @@ -1,3 +1,10 @@ +projectile (2.1.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS due to mkdocs changes. (Closes: #1009433) + + -- Thomas Koch Thu, 19 May 2022 17:10:12 +0300 + projectile (2.1.0-1) unstable; urgency=medium [ Sean Whitton ] diff -Nru projectile-2.1.0/debian/patches/0005-configure-mkdocs-for-Debian.patch projectile-2.1.0/debian/patches/0005-configure-mkdocs-for-Debian.patch --- projectile-2.1.0/debian/patches/0005-configure-mkdocs-for-Debian.patch 2020-02-29 15:12:11.000000000 +0000 +++ projectile-2.1.0/debian/patches/0005-configure-mkdocs-for-Debian.patch 2022-05-19 14:10:12.000000000 +0000 @@ -9,11 +9,11 @@ 3. don't generate installation instructions page --- - mkdocs.yml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + mkdocs.yml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml -index 1302441..05ada85 100644 +index 1302441..7a1ccf8 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -2,11 +2,11 @@ site_name: "Projectile: The Project Interaction Library for Emacs" @@ -23,7 +23,8 @@ +site_dir: html copyright: "Copyright (C) 2011-2020 Bozhidar Batsov and Projectile contributors" docs_dir: doc - pages: +-pages: ++nav: - Home: index.md -- Installation: installation.md - Usage: usage.md diff -Nru projectile-2.1.0/debian/patches/0005-hack-projectile-directory-p-test-for-Debian-build.patch projectile-2.1.0/debian/patches/0005-hack-projectile-directory-p-test-for-Debian-build.patch --- projectile-2.1.0/debian/patches/0005-hack-projectile-directory-p-test-for-Debian-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ projectile-2.1.0/debian/patches/0005-hack-projectile-directory-p-test-for-Debian-build.patch 2022-05-19 14:10:12.000000000 +0000 @@ -0,0 +1,24 @@ +From: Sean Whitton +Date: Fri, 11 Jan 2019 19:05:29 -0700 +Subject: hack projectile--directory-p test for Debian build + +Per Debian Policy, we cannot assume that the user's home directory +exists. +--- + test/projectile-test.el | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/test/projectile-test.el b/test/projectile-test.el +index c5cf90a..f7087c9 100644 +--- a/test/projectile-test.el ++++ b/test/projectile-test.el +@@ -1408,8 +1408,7 @@ You'd normally combine this with `projectile-test-with-sandbox'." + (describe "projectile--directory-p" + (it "tests which directory exists" + (expect (projectile--directory-p nil) :to-be nil) +- (expect (projectile--directory-p "asdf") :to-be nil) +- (expect (projectile--directory-p user-emacs-directory) :to-be-truthy))) ++ (expect (projectile--directory-p "asdf") :to-be nil))) + + (describe "projectile-find-file-in-directory" + (it "fails when called in a non-existing directory" diff -Nru projectile-2.1.0/debian/patches/0006-patch-test-init-code-for-Debian.patch projectile-2.1.0/debian/patches/0006-patch-test-init-code-for-Debian.patch --- projectile-2.1.0/debian/patches/0006-patch-test-init-code-for-Debian.patch 1970-01-01 00:00:00.000000000 +0000 +++ projectile-2.1.0/debian/patches/0006-patch-test-init-code-for-Debian.patch 2022-05-19 14:10:12.000000000 +0000 @@ -0,0 +1,47 @@ +From: Sean Whitton +Date: Fri, 11 Jan 2019 19:46:20 -0700 +Subject: patch test init code for Debian + +- Stop it from trying to load projectile.el + dh_elpa_test handles doing this. +- Don't choose a sandbox location using `locate-library'. + Creating the sandbox in /usr/share will fail, breaking the autopkgtest. +- Load subr-x before running any tests. + In this release, loading subr-x is wrapped in an eval-when-compile. + Buttercup's macros don't seem to be able to cope with this. + +[git-debrebase split: mixed commit: upstream part] +--- + test/projectile-test.el | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/test/projectile-test.el b/test/projectile-test.el +index f7087c9..d8b95e6 100644 +--- a/test/projectile-test.el ++++ b/test/projectile-test.el +@@ -27,6 +27,7 @@ + + (require 'projectile) + (require 'buttercup) ++(require 'subr-x) + + + (message "Running tests on Emacs %s" emacs-version) +@@ -36,8 +37,6 @@ + (source-directory (locate-dominating-file current-file "Cask")) + ;; Do not load outdated byte code for tests + (load-prefer-newer t)) +- ;; Load the file under test +- (load (expand-file-name "projectile" source-directory)) + (setq projectile-test-path (expand-file-name "test" source-directory))) + + ;;; Test Utilities +@@ -46,7 +45,7 @@ + (declare (indent 0) (debug (&rest form))) + `(let ((sandbox (expand-file-name + (convert-standard-filename "test/sandbox/") +- (file-name-directory (locate-library "projectile.el" t))))) ++ projectile-test-path))) + (when (file-directory-p sandbox) + (delete-directory sandbox t)) + (make-directory sandbox t) diff -Nru projectile-2.1.0/debian/patches/0007-Patch-upstream-source-to-check-for-fdfind-rather-tha.patch projectile-2.1.0/debian/patches/0007-Patch-upstream-source-to-check-for-fdfind-rather-tha.patch --- projectile-2.1.0/debian/patches/0007-Patch-upstream-source-to-check-for-fdfind-rather-tha.patch 1970-01-01 00:00:00.000000000 +0000 +++ projectile-2.1.0/debian/patches/0007-Patch-upstream-source-to-check-for-fdfind-rather-tha.patch 2022-05-19 14:10:12.000000000 +0000 @@ -0,0 +1,25 @@ +From: Nicholas D Steeves +Date: Sun, 9 Feb 2020 15:52:28 -0700 +Subject: =?utf-8?q?Patch_upstream_source_to_check_for_=22fdfind=22_rather_t?= + =?utf-8?q?han_=22fd=22_so=E2=80=A6?= + +[git-debrebase split: mixed commit: upstream part] +--- + projectile.el | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/projectile.el b/projectile.el +index 070a85f..fc3734a 100644 +--- a/projectile.el ++++ b/projectile.el +@@ -651,8 +651,8 @@ Set to nil to disable listing submodules contents." + :type 'string) + + (defcustom projectile-generic-command +- (if (executable-find "fd") +- "fd . -0 --type f --color=never" ++ (if (executable-find "fdfind") ++ "fdfind . -0 --type f --color=never" + "find . -type f -print0") + "Command used by projectile to get the files in a generic project." + :group 'projectile diff -Nru projectile-2.1.0/debian/patches/0008-Patch-CHANGELOG.md-and-doc-configuration.md-to-direc.patch projectile-2.1.0/debian/patches/0008-Patch-CHANGELOG.md-and-doc-configuration.md-to-direc.patch --- projectile-2.1.0/debian/patches/0008-Patch-CHANGELOG.md-and-doc-configuration.md-to-direc.patch 1970-01-01 00:00:00.000000000 +0000 +++ projectile-2.1.0/debian/patches/0008-Patch-CHANGELOG.md-and-doc-configuration.md-to-direc.patch 2022-05-19 14:10:12.000000000 +0000 @@ -0,0 +1,37 @@ +From: Nicholas D Steeves +Date: Sun, 9 Feb 2020 15:53:24 -0700 +Subject: =?utf-8?q?Patch_CHANGELOG=2Emd_and_doc/configuration=2Emd_to_direc?= + =?utf-8?q?t_users_to_our=E2=80=A6?= + +[git-debrebase split: mixed commit: upstream part] +--- + CHANGELOG.md | 2 +- + doc/configuration.md | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CHANGELOG.md b/CHANGELOG.md +index e1b13be..d888859 100644 +--- a/CHANGELOG.md ++++ b/CHANGELOG.md +@@ -14,7 +14,7 @@ + * Support a list of functions for `related-files-fn` options and helper functions. + * [#1405](https://github.com/bbatsov/projectile/pull/1405): Add Bloop Scala build server project detection. + * [#1418](https://github.com/bbatsov/projectile/pull/1418): The presence of a `go.mod` file implies a go project. +-* [#1419](https://github.com/bbatsov/projectile/pull/1419): When possible, use [fd](https://github.com/sharkdp/fd) instead ++* [#1419](https://github.com/bbatsov/projectile/pull/1419): When possible, use fd (`apt install fd-find`) instead + of `find` to list the files of a non-VCS project. This should be much faster. + + ### Bugs fixed +diff --git a/doc/configuration.md b/doc/configuration.md +index 753b1cb..751ac70 100644 +--- a/doc/configuration.md ++++ b/doc/configuration.md +@@ -81,7 +81,7 @@ find . -type f -print0 + + !!! Tip + +- It's a great idea to install [fd](https://github.com/sharkdp/fd) which is much faster than `find`. ++ It's a great idea to install fd (`apt install fd-find`) which is much faster than `find`. + If `fd` is found, projectile will use as a replacement for `find`. + + ## Sorting diff -Nru projectile-2.1.0/debian/patches/hack-projectile-directory-p-test-for-Debian-build.patch projectile-2.1.0/debian/patches/hack-projectile-directory-p-test-for-Debian-build.patch --- projectile-2.1.0/debian/patches/hack-projectile-directory-p-test-for-Debian-build.patch 2020-02-29 15:12:11.000000000 +0000 +++ projectile-2.1.0/debian/patches/hack-projectile-directory-p-test-for-Debian-build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From: Sean Whitton -Date: Fri, 11 Jan 2019 19:05:29 -0700 -Subject: hack projectile--directory-p test for Debian build - -Per Debian Policy, we cannot assume that the user's home directory -exists. ---- - test/projectile-test.el | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/test/projectile-test.el b/test/projectile-test.el -index c5cf90a..f7087c9 100644 ---- a/test/projectile-test.el -+++ b/test/projectile-test.el -@@ -1408,8 +1408,7 @@ You'd normally combine this with `projectile-test-with-sandbox'." - (describe "projectile--directory-p" - (it "tests which directory exists" - (expect (projectile--directory-p nil) :to-be nil) -- (expect (projectile--directory-p "asdf") :to-be nil) -- (expect (projectile--directory-p user-emacs-directory) :to-be-truthy))) -+ (expect (projectile--directory-p "asdf") :to-be nil))) - - (describe "projectile-find-file-in-directory" - (it "fails when called in a non-existing directory" diff -Nru projectile-2.1.0/debian/patches/Patch-CHANGELOG.md-and-doc-configuration.md-to-direct-use.patch projectile-2.1.0/debian/patches/Patch-CHANGELOG.md-and-doc-configuration.md-to-direct-use.patch --- projectile-2.1.0/debian/patches/Patch-CHANGELOG.md-and-doc-configuration.md-to-direct-use.patch 2020-02-29 15:12:11.000000000 +0000 +++ projectile-2.1.0/debian/patches/Patch-CHANGELOG.md-and-doc-configuration.md-to-direct-use.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -From: Nicholas D Steeves -Date: Sun, 9 Feb 2020 15:53:24 -0700 -Subject: =?utf-8?q?Patch_CHANGELOG=2Emd_and_doc/configuration=2Emd_to_direc?= - =?utf-8?q?t_users_to_our=E2=80=A6?= - -[git-debrebase split: mixed commit: upstream part] ---- - CHANGELOG.md | 2 +- - doc/configuration.md | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CHANGELOG.md b/CHANGELOG.md -index e1b13be..d888859 100644 ---- a/CHANGELOG.md -+++ b/CHANGELOG.md -@@ -14,7 +14,7 @@ - * Support a list of functions for `related-files-fn` options and helper functions. - * [#1405](https://github.com/bbatsov/projectile/pull/1405): Add Bloop Scala build server project detection. - * [#1418](https://github.com/bbatsov/projectile/pull/1418): The presence of a `go.mod` file implies a go project. --* [#1419](https://github.com/bbatsov/projectile/pull/1419): When possible, use [fd](https://github.com/sharkdp/fd) instead -+* [#1419](https://github.com/bbatsov/projectile/pull/1419): When possible, use fd (`apt install fd-find`) instead - of `find` to list the files of a non-VCS project. This should be much faster. - - ### Bugs fixed -diff --git a/doc/configuration.md b/doc/configuration.md -index 753b1cb..751ac70 100644 ---- a/doc/configuration.md -+++ b/doc/configuration.md -@@ -81,7 +81,7 @@ find . -type f -print0 - - !!! Tip - -- It's a great idea to install [fd](https://github.com/sharkdp/fd) which is much faster than `find`. -+ It's a great idea to install fd (`apt install fd-find`) which is much faster than `find`. - If `fd` is found, projectile will use as a replacement for `find`. - - ## Sorting diff -Nru projectile-2.1.0/debian/patches/patch-test-init-code-for-Debian.patch projectile-2.1.0/debian/patches/patch-test-init-code-for-Debian.patch --- projectile-2.1.0/debian/patches/patch-test-init-code-for-Debian.patch 2020-02-29 15:12:11.000000000 +0000 +++ projectile-2.1.0/debian/patches/patch-test-init-code-for-Debian.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -From: Sean Whitton -Date: Fri, 11 Jan 2019 19:46:20 -0700 -Subject: patch test init code for Debian - -- Stop it from trying to load projectile.el - dh_elpa_test handles doing this. -- Don't choose a sandbox location using `locate-library'. - Creating the sandbox in /usr/share will fail, breaking the autopkgtest. -- Load subr-x before running any tests. - In this release, loading subr-x is wrapped in an eval-when-compile. - Buttercup's macros don't seem to be able to cope with this. - -[git-debrebase split: mixed commit: upstream part] ---- - test/projectile-test.el | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/test/projectile-test.el b/test/projectile-test.el -index f7087c9..d8b95e6 100644 ---- a/test/projectile-test.el -+++ b/test/projectile-test.el -@@ -27,6 +27,7 @@ - - (require 'projectile) - (require 'buttercup) -+(require 'subr-x) - - - (message "Running tests on Emacs %s" emacs-version) -@@ -36,8 +37,6 @@ - (source-directory (locate-dominating-file current-file "Cask")) - ;; Do not load outdated byte code for tests - (load-prefer-newer t)) -- ;; Load the file under test -- (load (expand-file-name "projectile" source-directory)) - (setq projectile-test-path (expand-file-name "test" source-directory))) - - ;;; Test Utilities -@@ -46,7 +45,7 @@ - (declare (indent 0) (debug (&rest form))) - `(let ((sandbox (expand-file-name - (convert-standard-filename "test/sandbox/") -- (file-name-directory (locate-library "projectile.el" t))))) -+ projectile-test-path))) - (when (file-directory-p sandbox) - (delete-directory sandbox t)) - (make-directory sandbox t) diff -Nru projectile-2.1.0/debian/patches/Patch-upstream-source-to-check-for-fdfind-rather-than-fd-.patch projectile-2.1.0/debian/patches/Patch-upstream-source-to-check-for-fdfind-rather-than-fd-.patch --- projectile-2.1.0/debian/patches/Patch-upstream-source-to-check-for-fdfind-rather-than-fd-.patch 2020-02-29 15:12:11.000000000 +0000 +++ projectile-2.1.0/debian/patches/Patch-upstream-source-to-check-for-fdfind-rather-than-fd-.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From: Nicholas D Steeves -Date: Sun, 9 Feb 2020 15:52:28 -0700 -Subject: =?utf-8?q?Patch_upstream_source_to_check_for_=22fdfind=22_rather_t?= - =?utf-8?q?han_=22fd=22_so=E2=80=A6?= - -[git-debrebase split: mixed commit: upstream part] ---- - projectile.el | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/projectile.el b/projectile.el -index 070a85f..fc3734a 100644 ---- a/projectile.el -+++ b/projectile.el -@@ -651,8 +651,8 @@ Set to nil to disable listing submodules contents." - :type 'string) - - (defcustom projectile-generic-command -- (if (executable-find "fd") -- "fd . -0 --type f --color=never" -+ (if (executable-find "fdfind") -+ "fdfind . -0 --type f --color=never" - "find . -type f -print0") - "Command used by projectile to get the files in a generic project." - :group 'projectile diff -Nru projectile-2.1.0/debian/patches/series projectile-2.1.0/debian/patches/series --- projectile-2.1.0/debian/patches/series 2020-02-29 15:12:11.000000000 +0000 +++ projectile-2.1.0/debian/patches/series 2022-05-19 14:10:12.000000000 +0000 @@ -2,7 +2,7 @@ 0002-error-refer-Debian-package.patch 0003-debianise-exuberant-ctags-dep.patch 0005-configure-mkdocs-for-Debian.patch -hack-projectile-directory-p-test-for-Debian-build.patch -patch-test-init-code-for-Debian.patch -Patch-upstream-source-to-check-for-fdfind-rather-than-fd-.patch -Patch-CHANGELOG.md-and-doc-configuration.md-to-direct-use.patch +0005-hack-projectile-directory-p-test-for-Debian-build.patch +0006-patch-test-init-code-for-Debian.patch +0007-Patch-upstream-source-to-check-for-fdfind-rather-tha.patch +0008-Patch-CHANGELOG.md-and-doc-configuration.md-to-direc.patch