From f897fba539dabcfc59d8fef705b33d32cb5aa6b7 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 1 Jan 2017 18:32:59 +0000 Subject: add separately-packaged built-in packages to ${elpa:Depends} --- debian/changelog | 7 +++++++ dh-elpa.el | 23 ++++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index bed06eb..d368591 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dh-elpa (1.5) UNRELEASED; urgency=medium + + * Add built-in packages to ${elpa:Depends} if they are also packaged + separately in Debian (e.g. let-alist and seq). + + -- Sean Whitton Sun, 01 Jan 2017 17:35:56 +0000 + dh-elpa (1.4) unstable; urgency=medium * Add note to dh_elpa_test manpage about disabling its override of diff --git a/dh-elpa.el b/dh-elpa.el index 094913e..8017851 100644 --- a/dh-elpa.el +++ b/dh-elpa.el @@ -172,11 +172,24 @@ such a case." "Filter a list of package.el deps DEPS for Debian. Remove packages that are maintained outside of the elpa-* -namespace in Debian, plus Emacs itself." - (let ((non-elpa (list 'emacs 's 'dash 'yasnippet))) - (cl-remove-if (lambda (dep) - (or (memq (car dep) non-elpa) - (package-built-in-p (car dep)))) +namespace in Debian, plus Emacs itself. + +Also remove built-in packages, except those built-in packages +that are also packaged separately in Debian. + +These are packaged separately for two reasons: + +- it allows us to provide newer versions than those in Emacs core + +- it permits use of addons with older versions of Emacs, for + which the dependency is not yet a built-in package." + (let ((non-elpa (list 'emacs 's 'dash 'yasnippet)) + (packaged-separately (list 'let-alist 'seq))) + (cl-remove-if (lambda (dep) (let ((pkg (car dep))) + (or (memq pkg non-elpa) + (and + (package-built-in-p pkg) + (not (memq pkg packaged-separately)))))) deps))) (defun dhelpa-filter-pkg-desc (desc) -- cgit v1.2.3