Move package metadata to haskell-mode.el (see #1755)

Author: purcell

.dir-locals.el

@@ -3,4 +3,4 @@
 
 ((emacs-lisp-mode
   (indent-tabs-mode)
-  (package-lint-main-file . "haskell-mode-pkg.el")))
+  (package-lint-main-file . "haskell-mode.el")))

Makefile

@@ -30,7 +30,7 @@ EFLAGS = --eval "(when (boundp 'load-prefer-newer) (setq load-prefer-newer t))"
 
 BATCH = @echo EMACS $@; "$(EMACS)" $(EFLAGS) --batch -Q -L .
 
-ELFILES := $(filter-out haskell-mode-autoloads.el haskell-mode-pkg.el,$(wildcard *.el))
+ELFILES := $(filter-out haskell-mode-autoloads.el,$(wildcard *.el))
 
 ELCHECKS := $(wildcard tests/*-tests.el)
 
@@ -100,7 +100,7 @@ check-ert: $(ELCHECKS)
 
 # TODO: fix issues, then enforce build failure if this fails
 check-package-lint:
-	$(BATCH) --eval $(INIT_PACKAGES) --eval '(setq package-lint-main-file "haskell-mode-pkg.el")' -f package-lint-batch-and-exit $(ELFILES) || true
+	$(BATCH) --eval $(INIT_PACKAGES) --eval '(setq package-lint-main-file "haskell-mode.el")' -f package-lint-batch-and-exit $(ELFILES) || true
 
 clean:
 	$(RM) -r build-$(EMACS_VERSION) $(AUTOLOADS) $(AUTOLOADS:.el=.elc) haskell-mode.info dir

haskell-mode-pkg.el

@@ -5,13 +5,9 @@
 
 ;; Copyright © 1992, 1997-1998  Simon Marlow, Graeme E Moss, and Tommy Thorn
 
-;; Author:  1992      Simon Marlow
-;;          1997-1998 Graeme E Moss <[email protected]> and
-;;                    Tommy Thorn <[email protected]>,
-;;          2001-2002 Reuben Thomas (>=v1.4)
-;;          2003      Dave Love <[email protected]>
-;;          2016      Arthur Fayzrakhmanov
-;; Keywords: faces files Haskell
+;; Version: 17.3
+;; Package-Requires: ((emacs "25.1"))
+;; Keywords: haskell cabal ghc repl languages
 ;; URL: https://github.com/haskell/haskell-mode
 
 ;; This file is not part of GNU Emacs.