From ce28a124fe2336dc10b4348757956029c65c68d5 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 21 Dec 2024 16:25:14 +0100 Subject: [PATCH] Move package information from elfeed-pkg.el to elfeed.el Likewise move package information from "web/elfeed-web-pkg.el" to "web/elfeed-web.el" "-pkg.el" files are not supposed to be checked into packages' Git repositories. Package maintainers should provide package information exclusively in the main library, ".el". It is the responsibility of package archives (such as MELPA) to extract that information from there, and to put it in a _newly generated_ "-pkg.el". Tracking "-pkg.el" needlessly adds ambiguity because it adds a second, potentially conflicting, sources of truth. --- elfeed-pkg.el | 3 --- elfeed.el | 5 ++++- web/elfeed-web-pkg.el | 3 --- web/elfeed-web.el | 5 ++++- 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 elfeed-pkg.el delete mode 100644 web/elfeed-web-pkg.el diff --git a/elfeed-pkg.el b/elfeed-pkg.el deleted file mode 100644 index 14615e5..0000000 --- a/elfeed-pkg.el +++ /dev/null @@ -1,3 +0,0 @@ -(define-package "elfeed" "3.4.2" - "an Emacs Atom/RSS feed reader" - '((emacs "24.3"))) diff --git a/elfeed.el b/elfeed.el index 029e729..6b73b7e 100644 --- a/elfeed.el +++ b/elfeed.el @@ -1,10 +1,13 @@ -;;; elfeed.el --- an Emacs Atom/RSS feed reader -*- lexical-binding: t; -*- +;;; elfeed.el --- An Emacs Atom/RSS feed reader -*- lexical-binding: t; -*- ;; This is free and unencumbered software released into the public domain. ;; Author: Christopher Wellons ;; URL: https://github.com/skeeto/elfeed +;; Package-Version: 3.4.2 +;; Package-Requires: ((emacs "24.3")) + ;;; Commentary: ;; Elfeed is a web feed client for Emacs, inspired by notmuch. See diff --git a/web/elfeed-web-pkg.el b/web/elfeed-web-pkg.el deleted file mode 100644 index c53aba1..0000000 --- a/web/elfeed-web-pkg.el +++ /dev/null @@ -1,3 +0,0 @@ -(define-package "elfeed-web" "3.4.2" - "web interface to Elfeed" - '((simple-httpd "1.5.1") (elfeed "3.2.0") (emacs "24.3"))) diff --git a/web/elfeed-web.el b/web/elfeed-web.el index 593fcce..5e6ad6c 100644 --- a/web/elfeed-web.el +++ b/web/elfeed-web.el @@ -1,10 +1,13 @@ -;;; elfeed-web.el --- web interface to Elfeed -*- lexical-binding: t; -*- +;;; elfeed-web.el --- Web interface to Elfeed -*- lexical-binding: t; -*- ;; This is free and unencumbered software released into the public domain. ;; Author: Christopher Wellons ;; URL: https://github.com/skeeto/elfeed +;; Package-Version: 3.4.2 +;; Package-Requires: ((emacs "24.3") (elfeed "3.2.0") (simple-httpd "1.5.1")) + ;;; Commentary: ;; This is a very early work in progress. The long-term goal is to