[elpa] externals/hyperbole 8c64af9 06/21: Merge pull request #12 from matsl/merge-with-elpa

[Stefan Monnier]

branch: externals/hyperbole
commit 8c64af9d0284741b6b009bd99944440ee3e380a0
Merge: b155e83 210d000
Author: Robert Weiner <address@hidden>
Commit: GitHub <address@hidden>

    Merge pull request #12 from matsl/merge-with-elpa
    
    Merge with elpa
---
 .gitignore       | 6 +++---
 hyperbole-pkg.el | 8 --------
 hyperbole.el     | 2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index b3beacf..bc71d61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
 # Files that Git should ignore in the GNU Hyperbole source directory.
 
-# *-autoloads.el
-# *-pkg.el
+*-autoloads.el
+*-pkg.el
 
-# Copyright (C) 2016  Free Software Foundation, Inc.
+# Copyright (C) 2016-2019  Free Software Foundation, Inc.
 # See the "HY-COPY" file for license information.
 
 # This file is part of GNU Hyperbole.
diff --git a/hyperbole-pkg.el b/hyperbole-pkg.el
deleted file mode 100644
index c7729da..0000000
--- a/hyperbole-pkg.el
+++ /dev/null
@@ -1,8 +0,0 @@
-;; -*- no-byte-compile: t -*-
-(define-package "hyperbole" "7.0.3.3" "GNU Hyperbole: The Everyday 
Hypertextual Information Manager"
-  '((emacs "24.4"))
-  :url "http://www.gnu.org/software/hyperbole";
-  :keywords '("comm" "convenience" "files" "frames" "hypermedia" "languages"
-             "mail" "matching" "mouse" "multimedia" "outlines" "tools" "wp"))
-
-(setq byte-compile-warnings '(not interactive-only find-tag free-vars 
unresolved))
diff --git a/hyperbole.el b/hyperbole.el
index 534a5a3..a3ffa31 100644
--- a/hyperbole.el
+++ b/hyperbole.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1992-2019  Free Software Foundation, Inc.
 
 ;; Author:           Bob Weiner
-;; Maintainer:       Bob Weiner <address@hidden> and Mats Lidell 
<address@hidden>
+;; Maintainer:       Bob Weiner <address@hidden>, Mats Lidell <address@hidden>
 ;; Created:          06-Oct-92 at 11:52:51
 ;; Released:         18-Aug-19
 ;; Version:          7.0.3.3