Commit patch queue (exported by git-debrebase)HEADdebian/3.8.4-1archive/debian/3.8.4-1master

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

7 files changed, 233 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..86549ea6
--- /dev/null
+++ b/debian/patches/0003-decruft-README.patch
@@ -0,0 +1,49 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+Date: Fri, 8 Jan 2016 14:48:08 -0700
+Subject: decruft README for Debian
+
+---
+ README.md | 20 +-------------------
+ 1 file changed, 1 insertion(+), 19 deletions(-)
+
+diff --git a/README.md b/README.md
+index 277bc5f..7766554 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&amp;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>
+@@ -38,8 +24,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..2656ab66
--- /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 094878a..0f62585 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=$(ls -l "$0" | awk '{print $11}')
+-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\
+@@ -204,13 +188,6 @@ cat > $CONF_FILE <<EOF
+ 
+ (unless (eq default-package-manager 'straight)
+   (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 (locate-user-emacs-file "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
+@@ -224,7 +201,7 @@ cat > $CONF_FILE <<EOF
+ 
+   (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)
diff --git a/debian/patches/0004-patch-upstream-s-.gitignore-for-Debian.patch b/debian/patches/0004-patch-upstream-s-.gitignore-for-Debian.patch
new file mode 100644
index 00000000..b79a2b70
--- /dev/null
+++ b/debian/patches/0004-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 46bc974..dac7e0c 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1,7 +1,4 @@
+ *.elc
+-patch*
+-*.patch
+-*.diff
+ TAGS
+ helm-autoloads.el
+ ID
diff --git a/debian/patches/0005-helm-easymenu.el-autoload-the-easy-menu-add-item-cal.patch b/debian/patches/0005-helm-easymenu.el-autoload-the-easy-menu-add-item-cal.patch
new file mode 100644
index 00000000..23cf1541
--- /dev/null
+++ b/debian/patches/0005-helm-easymenu.el-autoload-the-easy-menu-add-item-cal.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 c30bc05..4156555 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/0006-Patch-Makefile-install-target-paths-to-match-convent.patch b/debian/patches/0006-Patch-Makefile-install-target-paths-to-match-convent.patch
new file mode 100644
index 00000000..090a443b
--- /dev/null
+++ b/debian/patches/0006-Patch-Makefile-install-target-paths-to-match-convent.patch
@@ -0,0 +1,52 @@
+From: Arto Jantunen <viiru@debian.org>
+Date: Sat, 19 Feb 2022 20:50:36 +0200
+Subject: Patch Makefile install target paths to match convention
+
+DESTDIR normally means what upstream calls PREFIX. Instead of changing the
+make install invocation, just patch the Makefile. Should probably be sent
+upstream.
+---
+ Makefile | 31 ++++++++++++++++---------------
+ 1 file changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index accc8ba..11111cb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -90,20 +90,21 @@ autoloads:
+ 	$(EVAL) "(progn (setq generated-autoload-file (expand-file-name \"helm-autoloads.el\" \"$(PKGDIR)\")) \
+ (setq backup-inhibited t) (update-directory-autoloads \"$(PKGDIR)\"))"
+ 
+-PREFIX=/usr/local/
+-BIN=${PREFIX}bin/
+-DESTDIR=${PREFIX}share/emacs/site-lisp/helm/
++DESTDIR=/usr/local
++BIN=${DESTDIR}/bin
++INSTDIR=${DESTDIR}/share/emacs/site-lisp/helm
+ install:
+-	test -d ${DESTDIR} || mkdir ${DESTDIR}
+-	rm -f ${DESTDIR}*.el
+-	rm -f ${DESTDIR}*.elc
+-	cp -f *.el $(DESTDIR)
+-	cp -f *.elc $(DESTDIR)
+-	cp -f helm-autoloads.el $(DESTDIR)
+-	cp -f emacs-helm.sh $(DESTDIR)
+-	ln -fs ${DESTDIR}emacs-helm.sh ${BIN}helm
++	test -d ${INSTDIR} || mkdir -p ${INSTDIR}
++	test -d ${BIN} || mkdir -p ${BIN}
++	rm -f ${INSTDIR}*.el
++	rm -f ${INSTDIR}*.elc
++	cp -f *.el $(INSTDIR)
++	cp -f *.elc $(INSTDIR)
++	cp -f helm-autoloads.el $(INSTDIR)
++	cp -f emacs-helm.sh $(INSTDIR)
++	ln -fs ${INSTDIR}/emacs-helm.sh ${BIN}/helm
+ uninstall:
+-	rm -vf ${DESTDIR}*.elc
+-	rm -vf ${DESTDIR}*.el
+-	rm -vf ${DESTDIR}emacs-helm.sh
+-	rm -vf ${BIN}helm
++	rm -vf ${INSTDIR}/*.elc
++	rm -vf ${INSTDIR}/*.el
++	rm -vf ${INSTDIR}/emacs-helm.sh
++	rm -vf ${BIN}/helm
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..fc92296b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+0001-dummy-upstream-changelog.patch
+0003-decruft-README.patch
+0004-patch-emacs-helm-sh.patch
+0004-patch-upstream-s-.gitignore-for-Debian.patch
+0005-helm-easymenu.el-autoload-the-easy-menu-add-item-cal.patch
+0006-Patch-Makefile-install-target-paths-to-match-convent.patch