diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2017-06-19 07:57:06 +0100 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-06-19 07:57:06 +0100 |
commit | 49728d0740bac820101918ac9e990432b06f333b (patch) | |
tree | b7769b5436e6c3abc8d3d86671d78d7def6bc9ab /debian | |
parent | 5975cca3aa40cf9990883142979c20c6247e0bd6 (diff) |
drop 0005-remove-async-dependency.patch
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 5 | ||||
-rw-r--r-- | debian/patches/0005-remove-async-dependency.patch | 33 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 4 insertions, 35 deletions
diff --git a/debian/changelog b/debian/changelog index b420462f..0b3bcf62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,10 @@ helm (2.7.1-1) UNRELEASED; urgency=medium Removed from README. - Add helm-grep-ag-persistent.png Now used in README. - * Refresh patches. + * Drop 0005-remove-async-dependency.patch + Helm now depends on async in all cases, not just for installs from + MELPA. + * Refresh some other patches. * Bump debhelper compat to 10. * Bump standards version to 4.0.0 (no changes required). diff --git a/debian/patches/0005-remove-async-dependency.patch b/debian/patches/0005-remove-async-dependency.patch deleted file mode 100644 index 1cf6ee6b..00000000 --- a/debian/patches/0005-remove-async-dependency.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Sean Whitton <spwhitton@spwhitton.name> -Subject: remove async dependency -Forwarded: not-needed - -Upstream specifies a dependency on async.el in order to fix -installation from MELPA. The Debian installation process avoids the -issue. We remove the dependency from ${elpa:Depends} and provide a -Recommends: elpa-async in debian/control. - ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/helm-pkg.el -+++ b/helm-pkg.el -@@ -3,7 +3,6 @@ - (define-package "helm" "2.7.1" - "Helm is an Emacs incremental and narrowing framework" - '((emacs "24.4") -- (async "1.9.2") - (popup "0.5.3") - (helm-core "2.7.1")) - :url "https://emacs-helm.github.io/helm/") ---- a/helm-core-pkg.el -+++ b/helm-core-pkg.el -@@ -2,8 +2,7 @@ - - (define-package "helm-core" "2.7.1" - "Development files for Helm" -- '((emacs "24.4") -- (async "1.9.2")) -+ '((emacs "24.4")) - :url "https://emacs-helm.github.io/helm/") - - ;; Local Variables: diff --git a/debian/patches/series b/debian/patches/series index 29032f66..324f93aa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 0001-dummy-upstream-changelog.patch 0003-decruft-README.patch 0004-patch-emacs-helm-sh.patch -0005-remove-async-dependency.patch |