[nongnu] elpa/helm a7b9e89829: Fix packaging for NonGnu Elpa #2480

[ELPA Syncer]

branch: elpa/helm
commit a7b9e898296142465c0857b2d201d8d828ba7b05
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Thierry Volpiatto <thievol@posteo.net>

    Fix packaging for NonGnu Elpa #2480
---
 .gitignore       |  5 ++++-
 helm-core-pkg.el | 11 -----------
 helm-core.el     | 33 +++++++++++++++++++++++++++++++++
 helm-pkg.el      | 13 -------------
 helm.el          |  9 ++++-----
 5 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 46bc97419b..e734827684 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,8 @@ patch*
 *.patch
 *.diff
 TAGS
-helm-autoloads.el
+/helm-autoloads.el
+/helm-core-autoloads.el
+/helm-pkg.el
+/helm-core-pkg.el
 ID
diff --git a/helm-core-pkg.el b/helm-core-pkg.el
deleted file mode 100644
index 9ea9fbaaaf..0000000000
--- a/helm-core-pkg.el
+++ /dev/null
@@ -1,11 +0,0 @@
-;;; helm-core-pkg.el --- define helm-core for package.el
-
-(define-package "helm-core" "3.8.4"
-  "Development files for Helm"
-  '((emacs "25.1")
-    (async "1.9.4"))
-  :url "https://emacs-helm.github.io/helm/";)
-
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/helm-core.el b/helm-core.el
new file mode 100644
index 0000000000..861492eece
--- /dev/null
+++ b/helm-core.el
@@ -0,0 +1,33 @@
+;;; helm-core.el --- Development files for Helm  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2022  Thierry Volpiatto
+
+;; Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
+;; URL: https://emacs-helm.github.io/helm/
+;; Version: 3.8.4
+;; Package-Requires: ((emacs "25.1") (async "1.9.4"))
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This is just a place holder we currently use only to hold the package's
+;; metadata in the header.
+
+;;; Code:
+
+
+
+(provide 'helm-core)
+;;; helm-core.el ends here
diff --git a/helm-pkg.el b/helm-pkg.el
deleted file mode 100644
index 6d0a91c5d5..0000000000
--- a/helm-pkg.el
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; helm-pkg.el --- define helm for package.el
-
-(define-package "helm" "3.8.4"
-  "Helm is an Emacs incremental and narrowing framework"
-  '((emacs "25.1")
-    (async "1.9.4")
-    (popup "0.5.3")
-    (helm-core "3.8.4"))
-  :url "https://emacs-helm.github.io/helm/";)
-
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/helm.el b/helm.el
index f54e193344..7bacff79a0 100644
--- a/helm.el
+++ b/helm.el
@@ -1,7 +1,4 @@
-;;; helm.el --- Emacs incremental and narrowing framework -*- lexical-binding: 
t -*-
-
-;; Version: 3.8.3
-;; URL: https://github.com/emacs-helm/helm
+;;; helm.el --- Helm is an Emacs incremental and narrowing framework  -*- 
lexical-binding: t -*-
 
 ;; Copyright (C) 2007         Tamas Patrovics
 ;;               2008 ~ 2011  rubikitch <rubikitch@ruby-lang.org>
@@ -14,7 +11,9 @@
 ;;                         Thierry Volpiatto <thierry.volpiatto@gmail.com>
 
 ;; Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
-;; URL: http://github.com/emacs-helm/helm
+;; Version: 3.8.4
+;; URL: https://emacs-helm.github.io/helm/
+;; Package-Requires: ((helm-core "3.8.4") (popup "0.5.3"))
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by