Package: release.debian.org
Severity: normal
X-Debbugs-Cc: debian-emacsen@lists.debian.org
Control: affects -1 + src:helm src:emacs-async
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock helm/4.0.3-1 and emacs-async/1.9.9-2
[ Reason ]
helm has been orphaned some time ago[1], and it was removed from testing
due to FTBFS on Emacs 30.1 (Bug#1099238[2]). This also caused a number
of reverse dependencies being removed from testing, including rtags,
eproject-el, virtualwrapper-el, etc. So it would be good to fix helm so
that it and its eligible reverse dependencies will be in Trixie, which
is why I'm adopting helm and trying to bring it back in Trixie now with
the upload of 4.0.3-1[3].
However, the last upstream version packaged before was 3.8.4 which
released in 2022, and a lot has happened since. The latest release
4.0.3 was compatible with the latest Emacs release 30.1 without any
patches. Technically, it could be possible to patch 3.8.4 to be
compatible with Emacs 30.1, but then those work will be abandoned
immediately with Forky, and the user will miss over 3 years of bug fixes
and new features. Plus, packaging the latest version could make
backporting security patches easier from upstream without having to go
back for another 3 years of changes.
Another complication here is that helm depends on async-package.el from
the emacs-async package, which unfortunately didn't ship this required
file introduced in 1.9.9 (Bug#1106748[4]), which has been fixed in a
recent upload of 1.9.9-2[5].
As a matter of fact, helm also introduced another (optional) dependency
"wfnames" that was not yet packaged in Debian. I have an RFS for that
(Bug#1106741[6]). To avoid having to introduce a new package, I have
patched helm to remove the usage of wfnames.
As both helm and emacs-async don't have autopkgtest, I am here to
request an unblock of both packages.
[ Impact ]
Unblocking helm (and in turn emacs-async) fixes RC bug#1099238, and
allows helm and many of helm's reverse dependencies to re-enter Trixie.
[ Tests ]
Both helm and emacs-async don't have unit tests. I have manually tested
the common commands of helm and didn't experience any severe issue (I
cannot claim that I have fully tested it because of the vast collection
of things it can do[7].)
[ Risks ]
I believe the risk is relatively low. helm is an optional package and
would not be in effect unless explicitly enabled.
[ Checklist ]
[x] all changes are documented in the d/changelog
[-] I reviewed all changes and I approve them
- Disclaimer: I haven't reviewed all upstream changes because
there were thousands of them. The manual test was promising
though.
[x] attach debdiff against the package in testing
[ Other Info ]
I would admit that the size of the debdiff of helm would look ridiculous
as a result of cumulative change for 3 years ("79 files changed, 18217
insertions(+), 13343 deletions(-)"). In any case, I have also attached
the diff for the "debian/" directory only to show that I only do the
necessary from the Debian side, where the majority of change is for the
patch to remove dependency on "wfnames". Debdiff for emacs-async is
also attached.
unblock helm/4.0.3-1
unblock emacs-async/1.9.9-2
[1] https://bugs.debian.org/1007859
[2] https://bugs.debian.org/1099238
[3] https://tracker.debian.org/news/1647811/accepted-helm-403-1-source-into-unstable/
[4] https://bugs.debian.org/1106748
[5] https://tracker.debian.org/news/1647634/accepted-emacs-async-199-2-source-into-unstable/
[6] https://bugs.debian.org/1106741
[7] https://github.com/emacs-helm/helm/wiki
--
Regards,
Xiyue Deng
Attachment:
helm_3.8.4-2_4.0.3-1_debdiff.diff.xz
Description: application/xz
diff --git a/debian/NEWS b/debian/NEWS
index 6860c29b..f3d946a8 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,11 @@
+helm (4.0.3-1) unstable; urgency=medium
+
+ Due to Trixie release schedule, wfnames was not packaged in time, and
+ hence its support is disabled for now, and all related functions use
+ wdired instead. This will be re-enabled in a future release.
+
+ -- Xiyue Deng <manphiz@gmail.com> Thu, 29 May 2025 16:59:03 -0700
+
helm (3.5.0-2) unstable; urgency=medium
helm-org.el is no longer shipped by the elpa-helm package. It is
diff --git a/debian/changelog b/debian/changelog
index dc6a7997..c5d54749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+helm (4.0.3-1) unstable; urgency=medium
+
+ [ Sean Whitton ]
+ * Orphan package.
+ * Run 'wrap-and-sort -ast'.
+
+ [ Xiyue Deng ]
+ * Update to new upstream version 4.0.3.
+ - Fixes FTBFS on Emacs 30.1 (Closes: #1099238)
+ * (Build-)Depends on elpa-async >= 1.9.9-2
+ - This version ships the required async-package.el file.
+ - Explicitly depends on elpa-async >= 1.9.9-2 in elpa-helm-core
+ * Update file list in d/*.elpa for new version
+ * Adopt package under the Debian Emacsen team (Closes: #1007859)
+ - Also add myself to Uploaders.
+ * Add DEBIAN_ELPA_DIR for async detection
+ * Temporary drop dependency on wfnames
+ - It's currently too late in the Trixie release cycle and
+ emacs-wfnames is still in ITP stage.
+ - This patch should be removed once emacs-wfnames enters the archive.
+ * Add NEWS entry about disabling wfnames
+ * Add d/salsa-ci.yml with the default template
+ * Drop xz compression in d/gbp.conf to be consistent with upstream
+
+ -- Xiyue Deng <manphiz@gmail.com> Fri, 30 May 2025 14:49:51 -0700
+
helm (3.8.4-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 1272d85c..9802225a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,24 +1,32 @@
Source: helm
Section: lisp
Priority: optional
-Maintainer: Debian Emacsen team <debian-emacsen@lists.debian.org>
-Uploaders: Sean Whitton <spwhitton@spwhitton.name>
+Maintainer: Debian Emacsen Team <debian-emacsen@lists.debian.org>
+Uploaders: Xiyue Deng <manphiz@gmail.com>
Build-Depends:
debhelper (>= 10),
dh-elpa (>= 0.0.18),
- elpa-async,
+ elpa-async (>= 1.9.9-2),
Standards-Version: 4.1.1
-Homepage: https://emacs-helm.github.io/helm/
-Vcs-Git: https://salsa.debian.org/emacsen-team/helm.git/
Vcs-Browser: https://salsa.debian.org/emacsen-team/helm
+Vcs-Git: https://salsa.debian.org/emacsen-team/helm.git/
+Homepage: https://emacs-helm.github.io/helm/
Package: elpa-helm-core
Architecture: all
-Depends: ${elpa:Depends}, ${misc:Depends},
- emacsen-common (>= 2.0.8)
-Recommends: emacs (>= 46.0)
-Suggests: elpa-async
-Enhances: emacs, emacs24, emacs25
+Depends:
+ emacsen-common (>= 2.0.8),
+ ${elpa:Depends},
+ ${misc:Depends},
+ elpa-async (>= 1.9.9-2),
+Recommends:
+ emacs (>= 46.0),
+Suggests:
+ elpa-async,
+Enhances:
+ emacs,
+ emacs24,
+ emacs25,
Description: Emacs Helm library files
This package provides library Emacs Lisp files used by the elpa-helm
package, and by Emacs Lisp addons that depend on Helm.
@@ -28,11 +36,19 @@ Description: Emacs Helm library files
Package: elpa-helm
Architecture: all
-Depends: ${elpa:Depends}, ${misc:Depends},
- emacsen-common (>= 2.0.8)
-Recommends: emacs (>= 46.0)
-Suggests: elpa-async, elpa-helm-org
-Enhances: emacs, emacs24, emacs25
+Depends:
+ emacsen-common (>= 2.0.8),
+ ${elpa:Depends},
+ ${misc:Depends},
+Recommends:
+ emacs (>= 46.0),
+Suggests:
+ elpa-async,
+ elpa-helm-org,
+Enhances:
+ emacs,
+ emacs24,
+ emacs25,
Description: Emacs incremental completion and selection narrowing framework
Helm is incremental completion and selection narrowing framework for
Emacs. It will help steer you in the right direction when you're
diff --git a/debian/elpa-helm-core.elpa b/debian/elpa-helm-core.elpa
index 03e56a34..58479315 100644
--- a/debian/elpa-helm-core.elpa
+++ b/debian/elpa-helm-core.elpa
@@ -1,5 +1,4 @@
-helm-core-pkg.el
-helm.el
+helm-core.el
helm-lib.el
helm-source.el
helm-multi-match.el
diff --git a/debian/elpa-helm.elpa b/debian/elpa-helm.elpa
index 6a506427..3c422cbc 100644
--- a/debian/elpa-helm.elpa
+++ b/debian/elpa-helm.elpa
@@ -2,16 +2,15 @@ helm-adaptive.el
helm-bookmark.el
helm-buffers.el
helm-color.el
-helm-comint.el
helm-command.el
-helm-config.el
helm-dabbrev.el
helm-easymenu.el
-helm-elisp-package.el
helm-elisp.el
+helm-epa.el
helm-eshell.el
helm-eval.el
helm-external.el
+helm-fd.el
helm-files.el
helm-find.el
helm-font.el
@@ -28,13 +27,14 @@ helm-misc.el
helm-mode.el
helm-net.el
helm-occur.el
-helm-pkg.el
+helm-packages.el
helm-regexp.el
helm-ring.el
helm-semantic.el
-helm-shell.el
helm-sys.el
helm-tags.el
helm-types.el
helm-utils.el
helm-x-files.el
+helm-x-icons.el
+helm.el
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 32252db5..48a2288b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -6,5 +6,3 @@ debian-tag = debian/%(version)s
#postbuild = lintian $GBP_CHANGES_FILE
color = on
-compression = xz
-compression-level = 9
diff --git a/debian/patches/0003-decruft-README.patch b/debian/patches/0003-decruft-README.patch
index 86549ea6..e2460ffc 100644
--- a/debian/patches/0003-decruft-README.patch
+++ b/debian/patches/0003-decruft-README.patch
@@ -3,19 +3,18 @@ Date: Fri, 8 Jan 2016 14:48:08 -0700
Subject: decruft README for Debian
---
- README.md | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
+ README.md | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/README.md b/README.md
-index 277bc5f..7766554 100644
+index 5654e93..8478760 100644
--- a/README.md
+++ b/README.md
-@@ -1,17 +1,5 @@
+@@ -1,16 +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>
-
-
@@ -28,7 +27,7 @@ index 277bc5f..7766554 100644
***
<p align="justify">
<b>Helm</b> is an Emacs framework for incremental completions and narrowing
-@@ -26,8 +14,6 @@
+@@ -25,8 +14,6 @@
***
<p align="center">
<a href="https://emacs-helm.github.io/helm/";><b>Homepage</b></a> |
@@ -37,13 +36,14 @@ index 277bc5f..7766554 100644
<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>
+@@ -36,9 +23,7 @@
+ <p align="center">
+ Helm in action browsing images</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="" />
+- <img src="https://github.com/emacs-helm/helm/blob/master/images/screenshot002.png?raw=true"; alt="Emacs-helm grep ag" title="" />
-</p>
--
--[badge-license]: https://img.shields.io/badge/license-GPL_3-green.svg
-+
++
+
+ [badge-license]: https://img.shields.io/badge/license-GPL_3-green.svg
+
diff --git a/debian/patches/0004-patch-emacs-helm-sh.patch b/debian/patches/0004-patch-emacs-helm-sh.patch
index 2656ab66..4925b672 100644
--- a/debian/patches/0004-patch-emacs-helm-sh.patch
+++ b/debian/patches/0004-patch-emacs-helm-sh.patch
@@ -3,14 +3,14 @@ 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(-)
+ emacs-helm.sh | 28 +---------------------------
+ 1 file changed, 1 insertion(+), 27 deletions(-)
diff --git a/emacs-helm.sh b/emacs-helm.sh
-index 094878a..0f62585 100755
+index 9bd07fd..9a406dc 100755
--- a/emacs-helm.sh
+++ b/emacs-helm.sh
-@@ -135,22 +135,6 @@ done
+@@ -139,22 +139,6 @@ done
LOAD_PATH=$($EMACS -q -batch --eval "(prin1 load-path)")
@@ -18,8 +18,8 @@ index 094878a..0f62585 100755
-
-# 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
+-TRUENAME=$(find "${0%/*}" -path "$0" -printf "%l")
+-if [ -n "$TRUENAME" ]; then
- AUTO_FILE="${TRUENAME%/*}/helm-autoloads.el"
-else
- AUTO_FILE="helm-autoloads.el"
@@ -31,9 +31,9 @@ index 094878a..0f62585 100755
-
-
cat > $CONF_FILE <<EOF
- (setq initial-scratch-message (concat initial-scratch-message
- ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\\n\
-@@ -204,13 +188,6 @@ cat > $CONF_FILE <<EOF
+ (setq initial-scratch-message
+ ";; This buffer is for text that is not saved, and for Lisp evaluation.\\n\
+@@ -227,16 +211,6 @@ cat > $CONF_FILE <<EOF
(unless (eq default-package-manager 'straight)
(require 'package)
@@ -41,17 +41,20 @@ index 094878a..0f62585 100755
- ;; 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"))
+- ;; Something like /home/you/.emacs.d/somedir/else/elpa/
+- ;; starting from default-directory is wrong in case helm.sh is a symlink
+- ;; or e.g. helm --chdir foo have been used.
- (add-to-list 'package-directory-list (directory-file-name
- (file-name-directory
-- (directory-file-name default-directory)))))
+- (directory-file-name initial-package-directory)))))
(let* ((str-lst "$LOAD_PACKAGES")
(load-packages (and str-lst
-@@ -224,7 +201,7 @@ cat > $CONF_FILE <<EOF
+@@ -250,7 +224,7 @@ cat > $CONF_FILE <<EOF
(package-initialize))
--(add-to-list 'load-path (file-name-directory (file-truename "$0")))
+-(add-to-list 'load-path initial-package-directory)
+(add-to-list 'package-directory-list "/usr/share/emacs/site-lisp/elpa-src")
(unless (> $TOOLBARS 0)
diff --git a/debian/patches/0004-patch-upstream-s-.gitignore-for-Debian.patch b/debian/patches/0004-patch-upstream-s-.gitignore-for-Debian.patch
deleted file mode 100644
index b79a2b70..00000000
--- a/debian/patches/0004-patch-upstream-s-.gitignore-for-Debian.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
index 23cf1541..4994012d 100644
--- 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
@@ -12,7 +12,7 @@ Reported-by: Aaron M. Ucko <ucko@debian.org>
1 file changed, 1 insertion(+)
diff --git a/helm-easymenu.el b/helm-easymenu.el
-index c30bc05..4156555 100644
+index 03b7d16..de175af 100644
--- a/helm-easymenu.el
+++ b/helm-easymenu.el
@@ -19,6 +19,7 @@
diff --git a/debian/patches/0006-Add-DEBIAN_ELPA_DIR-for-async-detection.patch b/debian/patches/0006-Add-DEBIAN_ELPA_DIR-for-async-detection.patch
new file mode 100644
index 00000000..b9485dcc
--- /dev/null
+++ b/debian/patches/0006-Add-DEBIAN_ELPA_DIR-for-async-detection.patch
@@ -0,0 +1,23 @@
+From: Xiyue Deng <manphiz@gmail.com>
+Date: Wed, 28 May 2025 20:08:45 -0700
+Subject: Add DEBIAN_ELPA_DIR for async detection
+
+---
+ Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index baa4261..65ab800 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,7 +39,9 @@ LOADPATH := -L $(PKGDIR)
+ # Assume emacs-user-directory is ~/.emacs.d
+ # Try to find ELPA directory or STRAIGHT directory.
+ XDG_ELPA_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME)/emacs/elpa, $(HOME)/.config/emacs/elpa)
+-ELPA_DIR := $(if $(shell test -d $(XDG_ELPA_DIR)), $(XDG_ELPA_DIR), $(HOME)/.emacs.d/elpa)
++TMP_ELPA_DIR := $(if $(shell test -d $(XDG_ELPA_DIR)), $(XDG_ELPA_DIR), $(HOME)/.emacs.d/elpa)
++DEBIAN_ELPA_DIR := /usr/share/emacs/site-lisp/elpa
++ELPA_DIR := $(if $(DEBIAN_ELPA_DIR), $(DEBIAN_ELPA_DIR), $(TMP_ELPA_DIR))
+
+ XDG_STRAIGHT_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME)/emacs/straight/build, $(HOME)/.config/emacs/straight/build)
+ STRAIGHT_DIR := $(if $(shell test -d $(XDG_STRAIGHT_DIR)), $(XDG_STRAIGHT_DIR), $(HOME)/.emacs.d/straight/build)
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
index 090a443b..a4499f64 100644
--- 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
@@ -10,10 +10,10 @@ upstream.
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
-index accc8ba..11111cb 100644
+index 2429fef..baa4261 100644
--- a/Makefile
+++ b/Makefile
-@@ -90,20 +90,21 @@ autoloads:
+@@ -91,20 +91,21 @@ autoloads:
$(EVAL) "(progn (setq generated-autoload-file (expand-file-name \"helm-autoloads.el\" \"$(PKGDIR)\")) \
(setq backup-inhibited t) (update-directory-autoloads \"$(PKGDIR)\"))"
diff --git a/debian/patches/0007-Temporary-drop-dependency-on-wfnames.patch b/debian/patches/0007-Temporary-drop-dependency-on-wfnames.patch
new file mode 100644
index 00000000..b49dee87
--- /dev/null
+++ b/debian/patches/0007-Temporary-drop-dependency-on-wfnames.patch
@@ -0,0 +1,80 @@
+From: Xiyue Deng <manphiz@gmail.com>
+Date: Thu, 29 May 2025 15:11:17 -0700
+Subject: Temporary drop dependency on wfnames
+
+- It's currently too late in the Trixie release cycle and
+emacs-wfnames is still in ITP stage.
+- This patch should be removed once emacs-wfnames enters the archive.
+
+Forwarded: not-needed
+---
+ helm-files.el | 21 +++++++++++----------
+ helm.el | 2 +-
+ 2 files changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/helm-files.el b/helm-files.el
+index 3ad0b89..7c3403d 100644
+--- a/helm-files.el
++++ b/helm-files.el
+@@ -786,7 +786,7 @@ when moving out of directory when non nil."
+ "History source in *eshell-command-on-file appears on top when non nil."
+ :type 'boolean)
+
+-(defcustom helm-ff-edit-marked-files-fn #'helm-ff-wfnames
++(defcustom helm-ff-edit-marked-files-fn #'helm-marked-files-in-dired
+ "A function to edit filenames in a special buffer.
+
+ By default `wfnames' package is used to avoid wdired which
+@@ -794,8 +794,8 @@ doesn't always work with all emacs versions and also is quite
+ clumsy about default-directory among other things. If you still
+ want to use it, helm is still providing
+ `helm-marked-files-in-dired'."
+- :type '(choice (function :tag "Use Wfnames package to edit filenames."
+- helm-ff-wfnames)
++ :type '(choice ;; (function :tag "Use Wfnames package to edit filenames."
++ ;; helm-ff-wfnames)
+ (function :tag "Use Wdired package to edit filenames."
+ helm-marked-files-in-dired)))
+
+@@ -808,7 +808,8 @@ want to use it, helm is still providing
+ (lambda ()
+ (helm-acase helm-ff-edit-marked-files-fn
+ (helm-marked-files-in-dired "Edit filenames in Wdired `C-x C-q'")
+- (helm-ff-wfnames "Edit filenames in Wfnames `C-x C-q'")))
++ ;;(helm-ff-wfnames "Edit filenames in Wfnames `C-x C-q'")
++ ))
+ 'helm-ff-edit-marked-files
+ "Query replace contents on marked `M-%'" 'helm-ff-query-replace
+ "Query replace regexp contents on marked `C-M-%'" 'helm-ff-query-replace-regexp
+@@ -3319,12 +3320,12 @@ editing absolute fnames in previous Emacs versions."
+ (when (or helm-current-prefix-arg current-prefix-arg)
+ (call-interactively 'wdired-change-to-wdired-mode))))))
+
+-(defun helm-ff-wfnames (_candidate)
+- "Edit marked fnames with `Wfnames' package."
+- (cl-assert (require 'wfnames nil t) nil "Wfnames package not found")
+- (let ((marked (helm-marked-candidates :with-wildcard t)))
+- (wfnames-setup-buffer
+- marked #'switch-to-buffer (buffer-live-p (get-buffer wfnames-buffer)))))
++;; (defun helm-ff-wfnames (_candidate)
++;; "Edit marked fnames with `Wfnames' package."
++;; (cl-assert (require 'wfnames nil t) nil "Wfnames package not found")
++;; (let ((marked (helm-marked-candidates :with-wildcard t)))
++;; (wfnames-setup-buffer
++;; marked #'switch-to-buffer (buffer-live-p (get-buffer wfnames-buffer)))))
+
+ (defun helm-ff-edit-marked-files (candidate)
+ "Edit marked files with `helm-ff-edit-marked-files-fn' fn."
+diff --git a/helm.el b/helm.el
+index 039d4af..dc0e139 100644
+--- a/helm.el
++++ b/helm.el
+@@ -13,7 +13,7 @@
+ ;; Author: Thierry Volpiatto <thievol@posteo.net>
+ ;; Version: 4.0.3
+ ;; URL: https://emacs-helm.github.io/helm/
+-;; Package-Requires: ((helm-core "4.0.3") (wfnames "1.2"))
++;; Package-Requires: ((helm-core "4.0.3"))
+ ;; Keywords: helm, convenience, files, buffers, grep, completion, lisp, matching, tools, help
+
+ ;; This program is free software; you can redistribute it and/or modify
diff --git a/debian/patches/series b/debian/patches/series
index fc92296b..46235191 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
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
+0006-Add-DEBIAN_ELPA_DIR-for-async-detection.patch
+0007-Temporary-drop-dependency-on-wfnames.patch
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
new file mode 100644
index 00000000..8424db44
--- /dev/null
+++ b/debian/salsa-ci.yml
@@ -0,0 +1,3 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
diffstat for emacs-async-1.9.9 emacs-async-1.9.9 changelog | 7 +++++++ control | 3 ++- elpa | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff -Nru emacs-async-1.9.9/debian/changelog emacs-async-1.9.9/debian/changelog --- emacs-async-1.9.9/debian/changelog 2024-10-29 15:26:45.000000000 -0700 +++ emacs-async-1.9.9/debian/changelog 2025-05-30 01:16:23.000000000 -0700 @@ -1,3 +1,10 @@ +emacs-async (1.9.9-2) unstable; urgency=medium + + * Ship async-package.el introduced in 1.9.9 + * Add myself to Uploaders + + -- Xiyue Deng <manphiz@gmail.com> Fri, 30 May 2025 01:16:23 -0700 + emacs-async (1.9.9-1) unstable; urgency=medium * New upstream release. diff -Nru emacs-async-1.9.9/debian/control emacs-async-1.9.9/debian/control --- emacs-async-1.9.9/debian/control 2024-10-29 15:26:45.000000000 -0700 +++ emacs-async-1.9.9/debian/control 2025-05-30 01:16:23.000000000 -0700 @@ -2,7 +2,8 @@ Section: lisp Priority: optional Maintainer: Debian Emacsen team <debian-emacsen@lists.debian.org> -Uploaders: Aymeric Agon-Rambosson <aymeric.agon@yandex.com> +Uploaders: Aymeric Agon-Rambosson <aymeric.agon@yandex.com>, + Xiyue Deng <manphiz@gmail.com>, Build-Depends: debhelper-compat (= 13), dh-elpa Standards-Version: 4.7.0 diff -Nru emacs-async-1.9.9/debian/elpa emacs-async-1.9.9/debian/elpa --- emacs-async-1.9.9/debian/elpa 2024-10-29 15:26:45.000000000 -0700 +++ emacs-async-1.9.9/debian/elpa 2025-05-30 01:16:23.000000000 -0700 @@ -1,5 +1,5 @@ async-bytecomp.el +async-package.el async.el dired-async.el smtpmail-async.el -async-pkg.el
Attachment:
signature.asc
Description: PGP signature