[nongnu] elpa/php-mode d66b498 5/5: Merge pull request #687 from emacs-php/update/authors-apply-formar-contributors

[ELPA Syncer]

branch: elpa/php-mode
commit d66b4986117f621c143bc295205619e036f291d5
Merge: 76d6917 11d3c39
Author: USAMI Kenta <tadsan@pixiv.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #687 from 
emacs-php/update/authors-apply-formar-contributors
    
    Properly list the credits of all previous contributors
---
 AUTHORS.md                  | 12 ++++++++----
 Makefile                    |  4 +++-
 etc/git/AUTHORS2.md.in      |  4 ++++
 etc/git/former-contributors | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index acf46be..a20522f 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -49,15 +49,15 @@ Names Sorted Alphabetically:
 - Engelke Eschner
 - Eric James Michael Ritz
 - Eric Mc Sween
-- Fred Yankowski
 - François-Xavier Bois
+- Fred Yankowski
 - Gerrit Riessen
 - Giacomo Tesio
 - Gregory Stark
 - Gu Weigang
-- Ian Eure
 - Herbert Jones
 - Hernawan Fa'iz Abdillah
+- Ian Eure
 - Jacek Wysocki
 - Jakub Jankiewicz
 - James Laver
@@ -91,12 +91,12 @@ Names Sorted Alphabetically:
 - Sean Champ
 - Sebastian Wiesner
 - Serghei Iakovlev
-- Syohei YOSHIDA
 - Stefan Monnier
 - Stig Bakken
-- Torsten Martinsen
+- Syohei YOSHIDA
 - Tim Landscheidt
 - Tom Willemsen
+- Torsten Martinsen
 - U-CPT\deb
 - USAMI Kenta
 - Valentin Funk
@@ -114,3 +114,7 @@ Names Sorted Alphabetically:
 - tijsmallaerts
 - zapad
 - 顾伟刚
+
+A chronological list of pre-2019 contributors can be found at 
[wiki/Authors](https://github.com/emacs-php/php-mode/wiki/Authors).
+
+Contributors since 2011, where this project was hosted, can also be found at 
[graphs/contributors](https://github.com/emacs-php/php-mode/graphs/contributors),
 except for accounts that have been withdrawn from GitHub.
diff --git a/Makefile b/Makefile
index 634c2fd..2bad67e 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,9 @@ AUTHORS.md: etc/git/AUTHORS.md.in .mailmap
        @printf "Generating AUTHORS.md file..."
        @test -d .git \
                && (cat $< > $@ \
-                       && git log --pretty=format:'- %aN' | LANG=C sort -u >> 
$@ \
+                       && git log --pretty=format:'- %aN' | \
+                       cat etc/git/former-contributors - | LANG=C sort -u >> 
$@ \
+                       && cat etc/git/AUTHORS2.md.in >> $@ \
                        && printf "FINISHED\n" ; ) \
                || printf "FAILED (non-fatal)\n"
 
diff --git a/etc/git/AUTHORS2.md.in b/etc/git/AUTHORS2.md.in
new file mode 100644
index 0000000..2a166fc
--- /dev/null
+++ b/etc/git/AUTHORS2.md.in
@@ -0,0 +1,4 @@
+
+A chronological list of pre-2019 contributors can be found at 
[wiki/Authors](https://github.com/emacs-php/php-mode/wiki/Authors).
+
+Contributors since 2011, where this project was hosted, can also be found at 
[graphs/contributors](https://github.com/emacs-php/php-mode/graphs/contributors),
 except for accounts that have been withdrawn from GitHub.
diff --git a/etc/git/former-contributors b/etc/git/former-contributors
new file mode 100644
index 0000000..0e6bdd8
--- /dev/null
+++ b/etc/git/former-contributors
@@ -0,0 +1,33 @@
+- Aaron S. Hawley
+- Bill Lovett
+- Boris Folgmann
+- Chris Morris
+- Craig Andrews
+- David House
+- Dias Badekas
+- Doug Marcey
+- Eric Mc Sween
+- Fred Yankowski
+- Gerrit Riessen
+- Giacomo Tesio
+- Gregory Stark
+- Ian Eure
+- John Keller
+- Juanjo
+- Kevin Blake
+- Lennart Borgman
+- Mathias Meyer
+- Nils Rennebarth
+- Rex McMaster
+- Roland
+- Rosenfeld
+- Ryan
+- Sammartino
+- Sean Champ
+- Stefan Monnier
+- Stig Bakken
+- Torsten Martinsen
+- Valentin Funk
+- Ville Skytta
+- Vinai Kopp
+- ppercot