Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]

8 files changed, 316 insertions, 0 deletions

diff --git a/debian/patches/0001-patch-README.patch b/debian/patches/0001-patch-README.patch
new file mode 100644
index 0000000..4c1c8e3
--- /dev/null
+++ b/debian/patches/0001-patch-README.patch
@@ -0,0 +1,91 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+Date: Sun, 13 Dec 2015 10:11:12 -0700
+Subject: patch README.md & extensions.md for Debian
+
+---
+ README.md         | 40 +++++-----------------------------------
+ doc/extensions.md |  6 ++++--
+ 2 files changed, 9 insertions(+), 37 deletions(-)
+
+diff --git a/README.md b/README.md
+index 19b29bb..9d9b8ff 100644
+--- a/README.md
++++ b/README.md
+@@ -1,14 +1,5 @@
+-[![License GPL 3][badge-license]](http://www.gnu.org/licenses/gpl-3.0.txt)
+-[![MELPA](http://melpa.org/packages/projectile-badge.svg)](http://melpa.org/#/projectile)
+-[![MELPA Stable](http://stable.melpa.org/packages/projectile-badge.svg)](http://stable.melpa.org/#/projectile)
+-[![Build Status](https://travis-ci.org/bbatsov/projectile.png?branch=master)](https://travis-ci.org/bbatsov/projectile)
+-[![Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/bbatsov/donate)
+-[![Patreon](https://img.shields.io/badge/patreon-donate-orange.svg)](https://www.patreon.com/bbatsov)
+-
+ ## Synopsis
+ 
+-[![Join the chat at https://gitter.im/bbatsov/projectile](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bbatsov/projectile?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+-
+ **Projectile** is a project interaction library for Emacs. Its goal is to
+ provide a nice set of features operating on a project level without
+ introducing external dependencies (when feasible). For instance -
+@@ -48,42 +39,21 @@ it. Some of Projectile's features:
+ * check for dirty repositories
+ * toggle read-only mode for the entire project
+ 
+-Here's a glimpse of Projectile in action:
+-
+-![Projectile Screenshot](doc/screenshots/projectile.png)
+-
+ You can support my work on Projectile via
+  [PayPal](https://www.paypal.me/bbatsov),
+  [Salt](https://salt.bountysource.com/teams/projectile),
+  [Patreon](https://www.patreon.com/bbatsov) and [Liberapay](https://liberapay.com/bbatsov/donate).
+ 
+-[![Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/bbatsov/donate)
+-[![Patreon](https://img.shields.io/badge/patreon-donate-orange.svg)](https://www.patreon.com/bbatsov)
+-
+ ## Quickstart
+ 
+-The instructions that follow are meant to get you from zero to a running Projectile setup
+-in a minute.  See the
+-[official manual](https://docs.projectile.mx) for (way) more
+-details.
++The instructions that follow are meant to get you from zero to a
++running Projectile setup in a minute.  See the
++[official manual](https://docs.projectile.mx) (or `apt-get install
++projectile-doc`) for (way) more details.
+ 
+ ### Installation
+ 
+-`package.el` is the built-in package manager in Emacs.
+-
+-Projectile is available on the two major `package.el` community
+-maintained repos -
+-[MELPA Stable](http://stable.melpa.org)
+-and [MELPA](http://melpa.org).
+-
+-You can install Projectile with the following command:
+-
+-<kbd>M-x</kbd> `package-install` <kbd>[RET]</kbd> `projectile` <kbd>[RET]</kbd>
+-
+-Alternatively, users of Debian 9 or later or Ubuntu 16.04 or later may
+-simply `apt-get install elpa-projectile`.
+-
+-Finally add this to your Emacs config:
++Add this to your Emacs config:
+ 
+ ```el
+ (projectile-mode +1)
+diff --git a/doc/extensions.md b/doc/extensions.md
+index 29891a5..c3b93e3 100644
+--- a/doc/extensions.md
++++ b/doc/extensions.md
+@@ -3,6 +3,8 @@
+ There are a number of packages that built on top of the basic functionality provided by Projectile:
+ 
+ * [counsel-projectile](https://github.com/ericdanan/counsel-projectile) provides Ivy integration
+-* [helm-projectile](https://github.com/bbatsov/helm-projectile) provides Helm integration
+-* [persp-projectile](https://github.com/bbatsov/persp-projectile) provides perspective.el integration
++* [helm-projectile](https://github.com/bbatsov/helm-projectile)
++  provides Helm integration (`apt-get install elpa-helm-projectile`)
++* [persp-projectile](https://github.com/bbatsov/persp-projectile)
++  provides perspective.el integration (`apt-get install elpa-persp-projectile`)
+ * [projectile-rails](https://github.com/asok/projectile-rails) provides extra functionality for Ruby on Rails projects
diff --git a/debian/patches/0002-error-refer-Debian-package.patch b/debian/patches/0002-error-refer-Debian-package.patch
new file mode 100644
index 0000000..a9e9f67
--- /dev/null
+++ b/debian/patches/0002-error-refer-Debian-package.patch
@@ -0,0 +1,32 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+Date: Fri, 8 Jan 2016 18:16:19 -0700
+Subject: refer to Debian packages rather than upstream homepages
+
+---
+ projectile.el | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/projectile.el b/projectile.el
+index 7cf6f9a..e2ebe0c 100644
+--- a/projectile.el
++++ b/projectile.el
+@@ -1755,8 +1755,7 @@ project-root for every file."
+                       :prompt prompt
+                       :input initial-input
+                       :buffer "*helm-projectile*")
+-              (user-error "Please install helm from \
+-https://github.com/emacs-helm/helm")))
++              (user-error "Please install the elpa-helm apt package")))
+            ((eq projectile-completion-system 'ivy)
+             (if (fboundp 'ivy-read)
+                 (ivy-read prompt choices
+@@ -1764,8 +1763,7 @@ https://github.com/emacs-helm/helm")))
+                           :action (prog1 action
+                                     (setq action nil))
+                           :caller 'projectile-completing-read)
+-              (user-error "Please install ivy from \
+-https://github.com/abo-abo/swiper")))
++              (user-error "Please install the elpa-ivy apt package")))
+            (t (funcall projectile-completion-system prompt choices))))
+     (if action
+         (funcall action res)
diff --git a/debian/patches/0003-debianise-exuberant-ctags-dep.patch b/debian/patches/0003-debianise-exuberant-ctags-dep.patch
new file mode 100644
index 0000000..efd1eef
--- /dev/null
+++ b/debian/patches/0003-debianise-exuberant-ctags-dep.patch
@@ -0,0 +1,44 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+Date: Sun, 21 Feb 2016 12:58:19 -0700
+Subject: Debianise exuberant-ctags dependency
+
+(1) Default to ctags-exuberant rather than just ctags since the user
+    might have used the alternatives system to point /usr/bin/ctags to
+    the one supplied with Emacs even if exuberant-ctags is installed.
+
+(2) Debianise advise in README about exuberant-ctags.
+---
+ doc/configuration.md | 6 +++---
+ projectile.el        | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/doc/configuration.md b/doc/configuration.md
+index 2b67f95..c3e8cec 100644
+--- a/doc/configuration.md
++++ b/doc/configuration.md
+@@ -291,9 +291,9 @@ appears.
+ 
+ ## Regenerate tags
+ 
+-To be able to regenerate a project's tags via `projectile-tags-command`, you
+-should install and add to the PATH
+-[Exuberant Ctags](http://ctags.sourceforge.net/) instead of a plain ctags, which
++To be able to regenerate a project's tags via
++`projectile-tags-command`, you should install Exuberant Ctags
++(`apt-get install exuberant-ctags`) instead of a plain ctags, which
+ ships with Emacs distribution.
+ 
+ ## Idle Timer
+diff --git a/projectile.el b/projectile.el
+index e2ebe0c..20f3e43 100644
+--- a/projectile.el
++++ b/projectile.el
+@@ -212,7 +212,7 @@ When nil Projectile will consider the current directory the project root."
+   :group 'projectile
+   :type 'string)
+ 
+-(defcustom projectile-tags-command "ctags -Re -f \"%s\" %s \"%s\""
++(defcustom projectile-tags-command "ctags-exuberant -Re -f \"%s\" %s \"%s\""
+   "The command Projectile's going to use to generate a TAGS file."
+   :group 'projectile
+   :type 'string)
diff --git a/debian/patches/0004-drop-external-gratipay-image.patch b/debian/patches/0004-drop-external-gratipay-image.patch
new file mode 100644
index 0000000..e14999f
--- /dev/null
+++ b/debian/patches/0004-drop-external-gratipay-image.patch
@@ -0,0 +1,35 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+Date: Sat, 23 Jul 2016 14:42:20 -0700
+Subject: drop external donation images
+
+Privacy infringement when browsing docs offline.
+---
+ doc/contributing.md | 3 ---
+ doc/index.md        | 3 ---
+ 2 files changed, 6 deletions(-)
+
+diff --git a/doc/contributing.md b/doc/contributing.md
+index ab3ea21..bcb0e1e 100644
+--- a/doc/contributing.md
++++ b/doc/contributing.md
+@@ -60,9 +60,6 @@ You can support the development of Projectile via
+  [Patreon](https://www.patreon.com/bbatsov) and
+  [Liberapay](https://liberapay.com/bbatsov/donate).
+ 
+-[![Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/bbatsov/donate)
+-[![Patreon](https://img.shields.io/badge/patreon-donate-orange.svg)](https://www.patreon.com/bbatsov)
+-
+ ## Running the tests in batch mode
+ 
+ ```sh
+diff --git a/doc/index.md b/doc/index.md
+index 4840e4b..c3cf977 100644
+--- a/doc/index.md
++++ b/doc/index.md
+@@ -57,6 +57,3 @@ You can support my work on Projectile via
+  [PayPal](https://www.paypal.me/bbatsov),
+  [Salt](https://salt.bountysource.com/teams/projectile),
+  [Patreon](https://www.patreon.com/bbatsov) and [Liberapay](https://liberapay.com/bbatsov/donate).
+-
+-[![Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/bbatsov/donate)
+-[![Patreon](https://img.shields.io/badge/patreon-donate-orange.svg)](https://www.patreon.com/bbatsov)
diff --git a/debian/patches/0005-configure-mkdocs-for-Debian.patch b/debian/patches/0005-configure-mkdocs-for-Debian.patch
new file mode 100644
index 0000000..34e329e
--- /dev/null
+++ b/debian/patches/0005-configure-mkdocs-for-Debian.patch
@@ -0,0 +1,36 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+Date: Sat, 23 Jul 2016 15:22:49 -0700
+Subject: configure mkdocs for Debian
+
+1. set site_dir so that docs end up in /usr/share/doc/projectile-doc/html
+
+2. set use_directory_urls so that links are to foo/index.html rather
+   than to just foo/, which is better for offline browsing
+
+3. don't generate installation instructions page
+---
+ mkdocs.yml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/mkdocs.yml b/mkdocs.yml
+index 1175f3b..97e9432 100644
+--- a/mkdocs.yml
++++ b/mkdocs.yml
+@@ -1,11 +1,11 @@
+ site_name: "Projectile: The Project Interaction Library for Emacs"
+ repo_url: https://github.com/bbatsov/projectile
+ site_favicon: favicon.ico
++site_dir: html
+ copyright: "Copyright (C) 2011-2019 Bozhidar Batsov and Projectile contributors"
+ docs_dir: doc
+ pages:
+ - Home: index.md
+-- Installation: installation.md
+ - Usage: usage.md
+ - Projects: projects.md
+ - Configuration: configuration.md
+@@ -19,3 +19,4 @@ extra_css:
+ markdown_extensions:
+   - admonition
+ theme: readthedocs
++use_directory_urls: false
diff --git a/debian/patches/hack-projectile-directory-p-test-for-Debian-build.patch b/debian/patches/hack-projectile-directory-p-test-for-Debian-build.patch
new file mode 100644
index 0000000..e8a18c2
--- /dev/null
+++ b/debian/patches/hack-projectile-directory-p-test-for-Debian-build.patch
@@ -0,0 +1,24 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+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 0904ef8..30aa4be 100644
+--- a/test/projectile-test.el
++++ b/test/projectile-test.el
+@@ -1097,8 +1097,7 @@ test temp directory"
+ (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 --git a/debian/patches/patch-test-init-code-for-Debian.patch b/debian/patches/patch-test-init-code-for-Debian.patch
new file mode 100644
index 0000000..b51f314
--- /dev/null
+++ b/debian/patches/patch-test-init-code-for-Debian.patch
@@ -0,0 +1,47 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+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 30aa4be..6542a1b 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)
+ 
+@@ -35,8 +36,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
+@@ -45,7 +44,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 --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0b6c8a0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+0001-patch-README.patch
+0002-error-refer-Debian-package.patch
+0003-debianise-exuberant-ctags-dep.patch
+0004-drop-external-gratipay-image.patch
+0005-configure-mkdocs-for-Debian.patch
+hack-projectile-directory-p-test-for-Debian-build.patch
+patch-test-init-code-for-Debian.patch