From 3ee5c69777af4d5b20cfd8e89e1cc3cf13f640eb Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 6 Jan 2017 18:34:36 +0100 Subject: [PATCH] Add an AUTHORS file, simplify COPYING, bump year to 2017 Added: - AUTHORS file listing Shaarli contributors - mailmap information to group a Git author's different aliases - Makefile target to list contributors from Git commit data Changed: - Simplify COPYING by using a single "Shaarli Community" entry - Bump year to 2017 See: - man git-shortlog - https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html#_mapping_authors Signed-off-by: VirtualTam --- .gitattributes | 1 + .github/mailmap | 13 +++++++++++++ AUTHORS | 40 ++++++++++++++++++++++++++++++++++++++++ COPYING | 28 +--------------------------- Makefile | 8 +++++++- 5 files changed, 62 insertions(+), 28 deletions(-) create mode 100644 .github/mailmap create mode 100644 AUTHORS diff --git a/.gitattributes b/.gitattributes index d753b1d..059fbb1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -19,6 +19,7 @@ Dockerfile text # Exclude from Git archives .gitattributes export-ignore +.github export-ignore .gitignore export-ignore .travis.yml export-ignore doc/**/*.json export-ignore diff --git a/.github/mailmap b/.github/mailmap new file mode 100644 index 0000000..41d91e4 --- /dev/null +++ b/.github/mailmap @@ -0,0 +1,13 @@ +ArthurHoaro +Florian Eula feula +Florian Eula +Nicolas Danelon nicolasm +Nicolas Danelon +Nicolas Danelon +Nicolas Danelon +Sébastien Sauvage +Timo Van Neerden +Timo Van Neerden lehollandaisvolant +VirtualTam +VirtualTam +VirtualTam diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..aa041ae --- /dev/null +++ b/AUTHORS @@ -0,0 +1,40 @@ + 327 ArthurHoaro + 188 VirtualTam + 132 nodiscc + 56 Sébastien Sauvage + 15 Florian Eula + 13 Emilien Klein + 12 Nicolas Danelon + 7 Christophe HENRY + 4 Alexandre Alapetite + 4 David Sferruzza + 3 Teromene + 2 Chris Kuethe + 2 Knah Tsaeb + 2 Mathieu Chabanon + 2 Miloš Jovanović + 2 Qwerty + 2 Timo Van Neerden + 2 julienCXX + 2 kalvn + 1 Adrien Oliva + 1 Alexis J + 1 BoboTiG + 1 Bronco + 1 D Low + 1 Dimtion + 1 Fanch + 1 Felix Bartels + 1 Felix Kästner + 1 Florian Voigt + 1 Gary Marigliano + 1 Guillaume Virlet + 1 Jonathan Druart + 1 Julien Pivotto + 1 Kevin Canévet + 1 Knah Tsaeb + 1 Lionel Martin + 1 Marsup + 1 Sbgodin + 1 TsT + 1 dimtion diff --git a/COPYING b/COPYING index 547ea57..4bbdf2b 100644 --- a/COPYING +++ b/COPYING @@ -1,33 +1,7 @@ Files: * License: zlib/libpng Copyright: (c) 2011-2015 Sébastien SAUVAGE - (c) 2011-2015 Alexandre Alapetite - (c) 2011-2015 David Sferruzza - (c) 2011-2015 Christophe HENRY - (c) 2011-2015 Mathieu Chabanon - (c) 2011-2015 BoboTiG - (c) 2011-2015 Bronco - (c) 2011-2015 Emilien Klein - (c) 2011-2015 Knah Tsaeb - (c) 2011-2015 Lionel Martin - (c) 2011-2015 lehollandaisvolant - (c) 2011-2015 timo van neerden - (c) 2011-2015 nodiscc - (c) 2011-2015 Florian Eula - (c) 2011-2015 Arthur Hoaro - (c) 2011-2015 Aurélien "VirtualTam" Tamisier - (c) 2011-2015 qwertygc - (c) 2011-2015 idleman - (c) 2015 Alexis Ju - (c) 2015 dimtion - (c) 2015 Fanch - (c) 2015 Guillaume Virlet - (c) 2015 Felix Bartels - (c) 2015 Marsup - (c) 2015 Miloš Jovanović - (c) 2015 Nicolás Danelón - (c) 2015 TsT - + (c) 2011-2017 The Shaarli Community, see AUTHORS Files: inc/reset.css License: BSD (http://opensource.org/licenses/BSD-3-Clause) diff --git a/Makefile b/Makefile index 60aec9a..f3065b7 100644 --- a/Makefile +++ b/Makefile @@ -169,6 +169,12 @@ clean: @git clean -df @rm -rf sandbox +### generate the AUTHORS file from Git commit information +authors: + @cp .github/mailmap .mailmap + @git shortlog -sne > AUTHORS + @rm .mailmap + ### generate Doxygen documentation doxygen: clean @rm -rf doxygen @@ -214,4 +220,4 @@ htmlpages: -o doc/$$base.html $$file; \ done; -htmldoc: doc htmlsidebar htmlpages +htmldoc: authors doc htmlsidebar htmlpages