Get ready for FSF ELPA release

diff --git a/AUTHORS b/AUTHORS
index 38a13b723b73bc26e4214262dbf1244b0b19064c..fee42c060a8b701870a57a7fcb8d5de41ec299b2 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1 @@
-Rocky Bernstein (rockyb@rubyforge.org)
+Rocky Bernstein (rocky@gnu.org)

diff --git a/Carton b/Carton
deleted file mode 100644 (file)
index 092be81..0000000
--- a/Carton
+++ /dev/null
@@ -1,6 +0,0 @@
-(source "melpa" "http://melpa.milkbox.net/packages/")
-
-(package "load-relative" "0.2.0" "relative file load like Ruby's require_relative")
-
-(development
-       (depends-on "test-simple"))

diff --git a/Makefile.am b/Makefile.am
index 981101be3198a78e6c25fde3f0152d0997b0885a..04aca0910c16f678a345d52dbf7a48bfc73dfff7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,3 +35,21 @@ ChangeLog:
 ACLOCAL_AMFLAGS=-I .
 
 endif
+
+CR_EXCEPTIONS=copyright_exceptions
+#: Check for GNU Copyrights.
+check_copyrights:
+       @echo "Compute exceptions >$(CR_EXCEPTIONS)~"
+       @export LANG=C;                                                 \
+       find . -name '.git' -prune -o -name '*.el' -print0 |            \
+           xargs -0 grep -L 'Free Software Foundation, Inc' |          \
+           grep -v '\(\.dir-locals\|.-\(pkg\|autoloads\)\)\.el$$';     \
+       find . -name '.git' -prune -o -name '*.el' -print |             \
+           while read f; do                                            \
+               fquoted="$$(echo $$f|tr '|' '_')";                      \
+               sed -n -e '/[Cc]opyright.*, *[1-9][-0-9]*,\?$$/N'       \
+                   -e '/Free Software Foundation/d'                    \
+                   -e "s|^\\(.*[Cc]opyright\\)|$$fquoted:\\1|p"        \
+                  "$$f";                                               \
+           done | sort >$(CR_EXCEPTIONS)~
+       diff -u "$(CR_EXCEPTIONS)" "$(CR_EXCEPTIONS)~"

diff --git a/copyright_exceptions b/copyright_exceptions
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/el-get-install.el b/el-get-install.el
deleted file mode 100644 (file)
index e175e28..0000000
--- a/el-get-install.el
+++ /dev/null
@@ -1,105 +0,0 @@
-(eval-when-compile
-  (defvar el-get-sources)
-)
-
-(declare-function el-get-post-install 'el-get)
-
-(add-to-list 'load-path "~/.emacs.d/el-get/el-get")
-
-;;; el-get-install.el --- installer for the lazy
-;;
-;; Copyright (C) 2010 Dimitri Fontaine
-;;
-;; Author: Dimitri Fontaine <dim@tapoueh.org>
-;; URL: http://www.emacswiki.org/emacs/el-get.el
-;; Created: 2010-06-17
-;; Keywords: emacs package elisp install elpa git git-svn bzr cvs apt-get fink http http-tar
-;; Licence: WTFPL, grab your copy here: http://sam.zoy.org/wtfpl/
-;;
-;; This file is NOT part of GNU Emacs.
-;;
-;; bootstrap your el-get installation, the goal is then to use el-get to
-;; update el-get.
-;;
-;; So the idea is that you copy/paste this code into your *scratch* buffer,
-;; hit C-j, and you have a working el-get.
-
-(let ((el-get-root
-       (file-name-as-directory
-       (or (bound-and-true-p el-get-dir)
-           (concat (file-name-as-directory user-emacs-directory) "el-get")))))
-
-  (when (file-directory-p el-get-root)
-    (add-to-list 'load-path el-get-root))
-
-  ;; try to require el-get, failure means we have to install it
-  (unless (require 'el-get nil t)
-    (unless (file-directory-p el-get-root)
-      (make-directory el-get-root t))
-
-    (let* ((package   "el-get")
-          (buf       (switch-to-buffer "*el-get bootstrap*"))
-          (pdir      (file-name-as-directory (concat el-get-root package)))
-          (git       (or (executable-find "git")
-                         (error "Unable to find `git'")))
-          (url       (or (bound-and-true-p el-get-git-install-url)
-                         "http://github.com/dimitri/el-get.git"))
-          (default-directory el-get-root)
-          (process-connection-type nil)   ; pipe, no pty (--no-progress)
-
-          ;; First clone el-get
-          (status
-           (call-process
-            git nil `(,buf t) t "--no-pager" "clone" "-v" url package)))
-
-      (unless (zerop status)
-       (error "Couldn't clone el-get from the Git repository: %s" url))
-
-      ;; switch branch if we have to
-      (let* ((branch (cond
-                      ;; Check if a specific branch is requested
-                      ((bound-and-true-p el-get-install-branch))
-                      ;; Check if master branch is requested
-                      ((boundp 'el-get-master-branch) "master")
-                      ;; Read the default branch from the el-get recipe
-                      ((plist-get (with-temp-buffer
-                                    (insert-file-contents-literally
-                                     (expand-file-name "recipes/el-get.rcp" pdir))
-                                    (read (current-buffer)))
-                                  :branch))
-                      ;; As a last resort, use the master branch
-                      ("master")))
-             (remote-branch (format "origin/%s" branch))
-             (default-directory pdir)
-             (bstatus
-               (if (string-equal branch "master")
-                 0
-                 (call-process git nil (list buf t) t "checkout" "-t" remote-branch))))
-        (unless (zerop bstatus)
-          (error "Couldn't `git checkout -t %s`" branch)))
-
-      (add-to-list 'load-path pdir)
-      (load package)
-      (let ((el-get-default-process-sync t) ; force sync operations for installer
-            (el-get-verbose t))                    ; let's see it all
-        (el-get-post-install "el-get"))
-      (with-current-buffer buf
-       (goto-char (point-max))
-       (insert "\nCongrats, el-get is installed and ready to serve!")))))
-
-
-(declare-function el-get 'el-get)
-
-;; now either el-get is `require'd already, or have been `load'ed by the
-;; el-get installer.
-(setq
- el-get-sources
- '(el-get                      ; el-get is self-hosting
-   loc-changes                         ; loc marks in buffers
-   list-utils                  ; list utilities like list-utils-flatten
-   load-relative               ; load emacs lisp relative to emacs source
-   test-simple                 ; simple test framework
-   ))
-
-;; install new packages and init already installed packages
-(el-get 'sync '(test-simple))

diff --git a/load-relative.el b/load-relative.el
index 409c3c5899866191dbbb7da1fdedd2805075c09d..b2346a37c3268763d2415ae203422920b7bdd150 100644 (file)
--- a/load-relative.el
+++ b/load-relative.el
@@ -1,12 +1,12 @@
 ;;; load-relative.el --- relative file load (within a multi-file Emacs package)
 
 ;; Author: Rocky Bernstein
-;; Version: 1.0
+;; Version: 1.1
 ;; Keywords: internal
 ;; URL: http://github.com/rocky/emacs-load-relative
 ;; Compatibility: GNU Emacs 23.x
 
-;;  Copyright (C) 2009-2010, 2012-2014 Rocky Bernstein <rocky@gnu.org>
+;; Copyright (C) 2015 Free Software Foundation, Inc
 
 ;; This program is free software: you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as

diff --git a/test/load-file1.el b/test/load-file1.el
index 724b52820aaa82c1a122cd72310021f2f5e26601..00930a54fa243bd0eff48a38c3a7dbad999e974a 100644 (file)
--- a/test/load-file1.el
+++ b/test/load-file1.el
@@ -1,3 +1,18 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <rocky@gnu.org>
+
+;; 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 <http://www.gnu.org/licenses/>.
 (setq loaded-file "load-file1")
 (setq loaded-file1 't)
-

diff --git a/test/load-file2.el b/test/load-file2.el
index ca6f3d20a733020956f6363723c39ff5824d514b..835a4be7737cfc3fe13059116a0b105240406021 100644 (file)
--- a/test/load-file2.el
+++ b/test/load-file2.el
@@ -1 +1,17 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <rocky@gnu.org>
+
+;; 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 <http://www.gnu.org/licenses/>.
 (load-relative "load-file3")

diff --git a/test/load-file3.el b/test/load-file3.el
index fb1594726b3850a83e5180e4faf49fbb1d58bfd4..f788421a21a31bde4127dbff1ec7c34ea97516df 100644 (file)
--- a/test/load-file3.el
+++ b/test/load-file3.el
@@ -1 +1,17 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <rocky@gnu.org>
+
+;; 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 <http://www.gnu.org/licenses/>.
 (setq loaded-file "load-file3")

diff --git a/test/require-file1.el b/test/require-file1.el
index 53c149ef6782f32dc79a55a946f5e623149075df..8524f53ea83a604f0315de74f6b230fea3e380dd 100644 (file)
--- a/test/require-file1.el
+++ b/test/require-file1.el
@@ -1 +1,17 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <rocky@gnu.org>
+
+;; 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 <http://www.gnu.org/licenses/>.
 (provide 'require-file1)

diff --git a/test/require-file2.el b/test/require-file2.el
index e751183aa67583cd683083d739836cfeb562518b..c84b014f72bca99e7b9da459a5b4018e34dd84c0 100644 (file)
--- a/test/require-file2.el
+++ b/test/require-file2.el
@@ -1 +1,17 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <rocky@gnu.org>
+
+;; 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 <http://www.gnu.org/licenses/>.
 (provide-me "my-")

diff --git a/test/require-file3.el b/test/require-file3.el
index d9236cd5bee097b8d58506f4c9fa01078a991d32..227105957f34d1a633a3cd1b872128c83cc72a08 100644 (file)
--- a/test/require-file3.el
+++ b/test/require-file3.el
@@ -1 +1,17 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <rocky@gnu.org>
+
+;; 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 <http://www.gnu.org/licenses/>.
 (provide 'require-file3)

diff --git a/test/subdir/test-require-list-from-subdir.el b/test/subdir/test-require-list-from-subdir.el
index 6d936059fe020e26eeb93c6baca240ee46901e6b..880b4f37b041b231aee21feb374ec366c5c772ff 100644 (file)
--- a/test/subdir/test-require-list-from-subdir.el
+++ b/test/subdir/test-require-list-from-subdir.el
@@ -1,3 +1,19 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <rocky@gnu.org>
+
+;; 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 <http://www.gnu.org/licenses/>.
 (require 'cl)
 (require 'test-unit)
 (load-file "../../load-relative.el")

diff --git a/test/test-load.el b/test/test-load.el
index 3dbce3b286000f8fd827209651af21c8c3544e7d..af47412a6281ccbcdda4f2f24d370ff1ae305932 100644 (file)
--- a/test/test-load.el
+++ b/test/test-load.el
@@ -1,3 +1,19 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <rocky@gnu.org>
+
+;; 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 <http://www.gnu.org/licenses/>.
 (require 'cl)
 (require 'test-simple)
 (load-file "../load-relative.el")
@@ -17,9 +33,9 @@
              "(__FILE__) on this running program"
              )
 
-(dolist (file-name 
+(dolist (file-name
         '("load-file1.el" "./load-file1.el" "../test/load-file1.el"))
-  (assert-equal 
+  (assert-equal
    (expand-file-name file-name)
    (relative-expand-file-name file-name))
   "relative-expand-filename"
@@ -32,14 +48,14 @@
 
 (setq loaded-file nil)
 (setq loaded-file1 nil)
-(assert-equal '(t t) 
+(assert-equal '(t t)
              (load-relative '("load-file1" "load-file2")
                             ))
 (assert-equal 't loaded-file1)
 (assert-equal "load-file3" loaded-file)
 
 
-(dolist (file-name 
+(dolist (file-name
         '("load-file1.el" "./load-file1.el" "../test/load-file1.el"))
   (setq loaded-file nil)
   (assert-equal t (load-relative file-name)
@@ -48,13 +64,13 @@
                (format "load-relative value with list file %s" loaded-file)
   ))
 
-(if (featurep 'require-file1 t) 
+(if (featurep 'require-file1 t)
     (unload-feature 'require-file1))
 
-(require-relative "require-file1") 
+(require-relative "require-file1")
 (assert-t (featurep 'require-file1) "require-relative")
 
-(if (featurep 'require-file1 t) 
+(if (featurep 'require-file1 t)
             (unload-feature 'require-file1))
 
 (require-relative-list '("require-file1" "require-file3"))
@@ -79,4 +95,3 @@
 (assert-t (featurep 'my-test-load) "provide-me - prefix")
 
 (end-tests)
-

diff --git a/test/test-require-list.el b/test/test-require-list.el
index 4a6b731c45cde27a35bb02b1e4ef592117df44b0..fae8421f19023b4df0e4ac959ff0da8401cce564 100644 (file)
--- a/test/test-require-list.el
+++ b/test/test-require-list.el
@@ -1,3 +1,19 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <rocky@gnu.org>
+
+;; 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 <http://www.gnu.org/licenses/>.
 (require 'cl)
 (require 'test-simple)
 (load-file "../load-relative.el")