diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2020-01-15 06:49:02 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-01-15 06:49:02 -0700 |
commit | fd40151d65c3e327638daceb1ab617400895f078 (patch) | |
tree | 18dcf869648fba27453bc401e8b2750cf009efe5 | |
parent | 23e5fae844b819b0665f1158e5f12975fb50f02a (diff) |
Commit patch queue (exported by git-debrebase)
[git-debrebase make-patches: export and commit patches]
-rw-r--r-- | debian/patches/0001-dummy-upstream-changelog.patch | 19 | ||||
-rw-r--r-- | debian/patches/0003-decruft-README.patch | 70 | ||||
-rw-r--r-- | debian/patches/0004-patch-emacs-helm-sh.patch | 58 | ||||
-rw-r--r-- | debian/patches/helm-easymenu.el-autoload-the-easy-menu-add-item-call.patch | 25 | ||||
-rw-r--r-- | debian/patches/patch-upstream-s-.gitignore-for-Debian.patch | 24 | ||||
-rw-r--r-- | debian/patches/series | 5 |
6 files changed, 201 insertions, 0 deletions
diff --git a/debian/patches/0001-dummy-upstream-changelog.patch b/debian/patches/0001-dummy-upstream-changelog.patch new file mode 100644 index 00000000..c30a6b8e --- /dev/null +++ b/debian/patches/0001-dummy-upstream-changelog.patch @@ -0,0 +1,19 @@ +From: Sean Whitton <spwhitton@spwhitton.name> +Date: Fri, 8 Jan 2016 14:44:50 -0700 +Subject: add dummy upstream CHANGELOG + +Point the user to GitHub releases page which serves as upstream's +changelog. +--- + CHANGELOG | 2 ++ + 1 file changed, 2 insertions(+) + create mode 100644 CHANGELOG + +diff --git a/CHANGELOG b/CHANGELOG +new file mode 100644 +index 0000000..bc8133c +--- /dev/null ++++ b/CHANGELOG +@@ -0,0 +1,2 @@ ++Please see <https://github.com/emacs-helm/helm/releases> for details of ++the changes between upstream releases. diff --git a/debian/patches/0003-decruft-README.patch b/debian/patches/0003-decruft-README.patch new file mode 100644 index 00000000..4c22ef6e --- /dev/null +++ b/debian/patches/0003-decruft-README.patch @@ -0,0 +1,70 @@ +From: Sean Whitton <spwhitton@spwhitton.name> +Date: Fri, 8 Jan 2016 14:48:08 -0700 +Subject: decruft README for Debian + +--- + README.md | 32 ++++---------------------------- + 1 file changed, 4 insertions(+), 28 deletions(-) + +diff --git a/README.md b/README.md +index 8a9c71b..c4f5493 100644 +--- a/README.md ++++ b/README.md +@@ -1,17 +1,5 @@ +-<p align="center"> +- <a href="http://www.gnu.org/licenses/gpl-3.0.txt"><img src="https://img.shields.io/badge/license-GPL_3-green.svg" alt="License GPL 3" /></a> +- <a href="https://melpa.org/#/helm"><img alt="MELPA" src="https://melpa.org/packages/helm-badge.svg"/></a> +- <a href="https://stable.melpa.org/#/helm"><img alt="MELPA Stable" src="https://stable.melpa.org/packages/helm-badge.svg"/></a> +- <a href="https://travis-ci.org/emacs-helm/helm"><img alt="Travis CI" src="https://travis-ci.org/emacs-helm/helm.svg?branch=master"/></a> +-</p> +- +- + <h1 align="center">Emacs-Helm</h1> + +-<p align="center"> +- <img src="https://avatars3.githubusercontent.com/u/1541688?v=3&s=200" alt="Emacs-helm" title="" /> +-</p> +- + *** + <p align="justify"> + <b>Helm</b> is an Emacs framework for incremental completions and narrowing +@@ -26,8 +14,6 @@ + *** + <p align="center"> + <a href="https://emacs-helm.github.io/helm/"><b>Homepage</b></a> | +- <a href="https://github.com/emacs-helm/helm/releases"><b>Downloads</b></a> | +- <a href="https://github.com/emacs-helm/helm/wiki#install"><b>Get started</b></a> | + <a href="https://github.com/emacs-helm/helm/wiki"><b>Helm wiki</b></a> | + <a href="https://github.com/emacs-helm/helm/wiki/FAQ"><b>FAQ</b></a> + </p> +@@ -55,17 +41,11 @@ + </p> + + <div align="center"> +- <a href="https://www.paypal.me/tvolpiatto"> +- <img title="Donate with Paypal" +- alt="Donate with Paypal" +- style="height: 50px; width: auto;" +- src="https://github.com/emacs-helm/helm/blob/master/images/paypal.png?raw=true"></a> ++ <a href="https://www.paypal.me/tvolpiatto/"> ++ Donate with PayPal</a> + + <a href="https://patreon.com/preview/30231724baf440fabe80d44d0ee77067"> +- <img title="Donate monthly using Patreon" +- alt="Donate monthly using Patreon" +- style="height: 50px; width: auto;" +- src="https://github.com/emacs-helm/helm/blob/master/images/patreon-25x.png?raw=true"></a> ++ Donate monthly using Patreon</a> + + </div> + +@@ -75,8 +55,4 @@ + Helm in action searching with <a href="https://github.com/ggreer/the_silver_searcher"<b>Grep Ag</b></a> + </p> + +-<p align="center"> +- <img src="https://github.com/emacs-helm/helm/blob/master/images/helm-grep-ag-persistent.png?raw=true" alt="Emacs-helm grep ag" title="" /> +-</p> +- +-[badge-license]: https://img.shields.io/badge/license-GPL_3-green.svg ++![Emacs-helm grep ag](helm-grep-ag-persistent.png) diff --git a/debian/patches/0004-patch-emacs-helm-sh.patch b/debian/patches/0004-patch-emacs-helm-sh.patch new file mode 100644 index 00000000..154bc778 --- /dev/null +++ b/debian/patches/0004-patch-emacs-helm-sh.patch @@ -0,0 +1,58 @@ +From: Sean Whitton <spwhitton@spwhitton.name> +Date: Sat, 6 Feb 2016 11:17:39 -0700 +Subject: patch emacs-helm.sh for Debian + +--- + emacs-helm.sh | 25 +------------------------ + 1 file changed, 1 insertion(+), 24 deletions(-) + +diff --git a/emacs-helm.sh b/emacs-helm.sh +index 848a72c..0e12193 100755 +--- a/emacs-helm.sh ++++ b/emacs-helm.sh +@@ -135,22 +135,6 @@ done + + LOAD_PATH=$($EMACS -q -batch --eval "(prin1 load-path)") + +-cd "${0%/*}" || exit 1 +- +-# Check if autoload file exists. +-# It may be in a different directory if emacs-helm.sh is a symlink. +-TRUENAME=$(find . -samefile "$0" -printf "%l") +-if [ ! -z "$TRUENAME" ]; then +- AUTO_FILE="${TRUENAME%/*}/helm-autoloads.el" +-else +- AUTO_FILE="helm-autoloads.el" +-fi +-if [ ! -e "$AUTO_FILE" ]; then +- echo No autoloads found, please run make first to generate autoload file +- exit 1 +-fi +- +- + cat > $CONF_FILE <<EOF + (setq initial-scratch-message (concat initial-scratch-message + ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\\n\ +@@ -176,13 +160,6 @@ cat > $CONF_FILE <<EOF + + (setq load-path (quote $LOAD_PATH)) + (require 'package) +-;; User may be using a non standard \`package-user-dir'. +-;; Modify \`package-directory-list' instead of \`package-user-dir' +-;; in case the user starts Helm from a non-ELPA installation. +-(unless (file-equal-p package-user-dir "~/.emacs.d/elpa") +- (add-to-list 'package-directory-list (directory-file-name +- (file-name-directory +- (directory-file-name default-directory))))) + + (let* ((str-lst "$LOAD_PACKAGES") + (load-packages (and str-lst +@@ -195,7 +172,7 @@ cat > $CONF_FILE <<EOF + (mapcar (lambda (p) (list (intern p) t)) load-packages))))) + + (package-initialize) +-(add-to-list 'load-path (file-name-directory (file-truename "$0"))) ++(add-to-list 'package-directory-list "/usr/share/emacs/site-lisp/elpa-src") + (unless (> $TOOLBARS 0) + (setq default-frame-alist '((vertical-scroll-bars . nil) + (tool-bar-lines . 0) diff --git a/debian/patches/helm-easymenu.el-autoload-the-easy-menu-add-item-call.patch b/debian/patches/helm-easymenu.el-autoload-the-easy-menu-add-item-call.patch new file mode 100644 index 00000000..6018c46a --- /dev/null +++ b/debian/patches/helm-easymenu.el-autoload-the-easy-menu-add-item-call.patch @@ -0,0 +1,25 @@ +From: Sean Whitton <spwhitton@spwhitton.name> +Date: Sat, 26 Oct 2019 13:03:21 -0700 +Subject: helm-easymenu.el: autoload the easy-menu-add-item call + +Otherwise, the autoloaded easy-menu-add-item call in helm-org.el +cannot succeed. + +Closes: #943371 +Reported-by: Aaron M. Ucko <ucko@debian.org> +--- + helm-easymenu.el | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/helm-easymenu.el b/helm-easymenu.el +index eb6878b..9d33907 100644 +--- a/helm-easymenu.el ++++ b/helm-easymenu.el +@@ -19,6 +19,7 @@ + + (require 'easymenu) + ++;;;###autoload + (easy-menu-add-item + nil '("Tools") + '("Helm" diff --git a/debian/patches/patch-upstream-s-.gitignore-for-Debian.patch b/debian/patches/patch-upstream-s-.gitignore-for-Debian.patch new file mode 100644 index 00000000..9d8b887b --- /dev/null +++ b/debian/patches/patch-upstream-s-.gitignore-for-Debian.patch @@ -0,0 +1,24 @@ +From: Sean Whitton <spwhitton@spwhitton.name> +Date: Fri, 6 Jul 2018 15:51:59 +0100 +Subject: patch upstream's .gitignore for Debian + +dgit and git-debrebase break if debian/patches is ignored by +.gitignore patterns. + +[git-debrebase: split mixed commit: upstream part] +--- + .gitignore | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/.gitignore b/.gitignore +index 9860044..9b2dfd8 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,7 +1,4 @@ + *.elc +-patch* +-*.patch +-*.diff + Home.md + TAGS + helm-autoloads.el diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..621af4d0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,5 @@ +0001-dummy-upstream-changelog.patch +0003-decruft-README.patch +0004-patch-emacs-helm-sh.patch +patch-upstream-s-.gitignore-for-Debian.patch +helm-easymenu.el-autoload-the-easy-menu-add-item-call.patch |