diff options
author | VirtualTam <virtualtam@flibidi.net> | 2017-01-06 18:34:36 +0100 |
---|---|---|
committer | VirtualTam <virtualtam+github@flibidi.net> | 2017-01-07 14:49:39 +0100 |
commit | 3ee5c69777af4d5b20cfd8e89e1cc3cf13f640eb (patch) | |
tree | dbf45980d63c690a3e8474bda21e90fdab863fa1 | |
parent | ee6f4b64a91d76070f930cdf7602ab4686714c7a (diff) | |
download | Shaarli-3ee5c69777af4d5b20cfd8e89e1cc3cf13f640eb.tar.gz Shaarli-3ee5c69777af4d5b20cfd8e89e1cc3cf13f640eb.tar.zst Shaarli-3ee5c69777af4d5b20cfd8e89e1cc3cf13f640eb.zip |
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 <virtualtam@flibidi.net>
-rw-r--r-- | .gitattributes | 1 | ||||
-rw-r--r-- | .github/mailmap | 13 | ||||
-rw-r--r-- | AUTHORS | 40 | ||||
-rw-r--r-- | COPYING | 28 | ||||
-rw-r--r-- | Makefile | 8 |
5 files changed, 62 insertions, 28 deletions
diff --git a/.gitattributes b/.gitattributes index d753b1db..059fbb18 100644 --- a/.gitattributes +++ b/.gitattributes | |||
@@ -19,6 +19,7 @@ Dockerfile text | |||
19 | 19 | ||
20 | # Exclude from Git archives | 20 | # Exclude from Git archives |
21 | .gitattributes export-ignore | 21 | .gitattributes export-ignore |
22 | .github export-ignore | ||
22 | .gitignore export-ignore | 23 | .gitignore export-ignore |
23 | .travis.yml export-ignore | 24 | .travis.yml export-ignore |
24 | doc/**/*.json export-ignore | 25 | doc/**/*.json export-ignore |
diff --git a/.github/mailmap b/.github/mailmap new file mode 100644 index 00000000..41d91e47 --- /dev/null +++ b/.github/mailmap | |||
@@ -0,0 +1,13 @@ | |||
1 | ArthurHoaro <arthur@hoa.ro> | ||
2 | Florian Eula <eula.florian@gmail.com> feula | ||
3 | Florian Eula <eula.florian@gmail.com> <mr.pikzen@gmail.com> | ||
4 | Nicolas Danelon <hi@nicolasmd.com.ar> nicolasm | ||
5 | Nicolas Danelon <hi@nicolasmd.com.ar> <nda@3818.com.ar> | ||
6 | Nicolas Danelon <hi@nicolasmd.com.ar> <nicolasdanelon@gmail.com> | ||
7 | Nicolas Danelon <hi@nicolasmd.com.ar> <nicolasdanelon@users.noreply.github.com> | ||
8 | Sébastien Sauvage <sebsauvage@sebsauvage.net> | ||
9 | Timo Van Neerden <fire@lehollandaisvolant.net> | ||
10 | Timo Van Neerden <fire@lehollandaisvolant.net> lehollandaisvolant <levoltigeurhollandais@gmail.com> | ||
11 | VirtualTam <virtualtam@flibidi.net> <tamisier.aurelien@gmail.com> | ||
12 | VirtualTam <virtualtam@flibidi.net> <virtualtam+github@flibidi.net> | ||
13 | VirtualTam <virtualtam@flibidi.net> <virtualtam@flibidi.org> | ||
diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..aa041ae9 --- /dev/null +++ b/AUTHORS | |||
@@ -0,0 +1,40 @@ | |||
1 | 327 ArthurHoaro <arthur@hoa.ro> | ||
2 | 188 VirtualTam <virtualtam@flibidi.net> | ||
3 | 132 nodiscc <nodiscc@gmail.com> | ||
4 | 56 Sébastien Sauvage <sebsauvage@sebsauvage.net> | ||
5 | 15 Florian Eula <eula.florian@gmail.com> | ||
6 | 13 Emilien Klein <emilien@klein.st> | ||
7 | 12 Nicolas Danelon <hi@nicolasmd.com.ar> | ||
8 | 7 Christophe HENRY <christophe.henry@sbgodin.fr> | ||
9 | 4 Alexandre Alapetite <alexandre@alapetite.fr> | ||
10 | 4 David Sferruzza <david.sferruzza@gmail.com> | ||
11 | 3 Teromene <teromene@teromene.fr> | ||
12 | 2 Chris Kuethe <chris.kuethe@gmail.com> | ||
13 | 2 Knah Tsaeb <Knah-Tsaeb@knah-tsaeb.org> | ||
14 | 2 Mathieu Chabanon <git@matchab.fr> | ||
15 | 2 Miloš Jovanović <mjovanovic@gmail.com> | ||
16 | 2 Qwerty <champlywood@free.fr> | ||
17 | 2 Timo Van Neerden <fire@lehollandaisvolant.net> | ||
18 | 2 julienCXX <software@chmodplusx.eu> | ||
19 | 2 kalvn <kalvnthereal@gmail.com> | ||
20 | 1 Adrien Oliva <adrien.oliva@yapbreak.fr> | ||
21 | 1 Alexis J <alexis@effingo.be> | ||
22 | 1 BoboTiG <bobotig@gmail.com> | ||
23 | 1 Bronco <bronco@warriordudimanche.net> | ||
24 | 1 D Low <daniellowtw@gmail.com> | ||
25 | 1 Dimtion <zizou.xena@gmail.com> | ||
26 | 1 Fanch <fanch-github@qth.fr> | ||
27 | 1 Felix Bartels <felix@host-consultants.de> | ||
28 | 1 Felix Kästner <github.com-fpunktk@fpunktk.de> | ||
29 | 1 Florian Voigt <flvoigt@me.com> | ||
30 | 1 Gary Marigliano <gmarigliano93@gmail.com> | ||
31 | 1 Guillaume Virlet <github@virlet.org> | ||
32 | 1 Jonathan Druart <jonathan.druart@gmail.com> | ||
33 | 1 Julien Pivotto <roidelapluie@inuits.eu> | ||
34 | 1 Kevin Canévet <kevin@streamroot.io> | ||
35 | 1 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org> | ||
36 | 1 Lionel Martin <renarddesmers@gmail.com> | ||
37 | 1 Marsup <marsup@gmail.com> | ||
38 | 1 Sbgodin <Sbgodin@users.noreply.github.com> | ||
39 | 1 TsT <tst2005@gmail.com> | ||
40 | 1 dimtion <zizou.xena@gmail.com> | ||
@@ -1,33 +1,7 @@ | |||
1 | Files: * | 1 | Files: * |
2 | License: zlib/libpng | 2 | License: zlib/libpng |
3 | Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net> | 3 | Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net> |
4 | (c) 2011-2015 Alexandre Alapetite <alexandre@alapetite.fr> | 4 | (c) 2011-2017 The Shaarli Community, see AUTHORS |
5 | (c) 2011-2015 David Sferruzza <david.sferruzza@gmail.com> | ||
6 | (c) 2011-2015 Christophe HENRY <christophe.henry@sbgodin.fr> | ||
7 | (c) 2011-2015 Mathieu Chabanon <git@matchab.fr> | ||
8 | (c) 2011-2015 BoboTiG <bobotig@gmail.com> | ||
9 | (c) 2011-2015 Bronco <bronco@warriordudimanche.net> | ||
10 | (c) 2011-2015 Emilien Klein <emilien@klein.st> | ||
11 | (c) 2011-2015 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org> | ||
12 | (c) 2011-2015 Lionel Martin <renarddesmers@gmail.com> | ||
13 | (c) 2011-2015 lehollandaisvolant <levoltigeurhollandais@gmail.com> | ||
14 | (c) 2011-2015 timo van neerden <fire@lehollandaisvolant.net> | ||
15 | (c) 2011-2015 nodiscc <nodiscc@gmail.com> | ||
16 | (c) 2011-2015 Florian Eula <mr.pikzen@gmail.com> | ||
17 | (c) 2011-2015 Arthur Hoaro <arthur@hoa.ro> | ||
18 | (c) 2011-2015 Aurélien "VirtualTam" Tamisier <virtualtam@flibidi.net> | ||
19 | (c) 2011-2015 qwertygc <champlywood@free.fr> | ||
20 | (c) 2011-2015 idleman <idleman@idleman.fr> | ||
21 | (c) 2015 Alexis Ju <alexis@effingo.be> | ||
22 | (c) 2015 dimtion <zizou.xena@gmail.com> | ||
23 | (c) 2015 Fanch <fanch-github@qth.fr> | ||
24 | (c) 2015 Guillaume Virlet <github@virlet.org> | ||
25 | (c) 2015 Felix Bartels <felix@host-consultants.de> | ||
26 | (c) 2015 Marsup <marsup@gmail.com> | ||
27 | (c) 2015 Miloš Jovanović <mjovanovic@gmail.com> | ||
28 | (c) 2015 Nicolás Danelón <hola@nicolasdanelon.com.ar> | ||
29 | (c) 2015 TsT <tst2005@gmail.com> | ||
30 | |||
31 | 5 | ||
32 | Files: inc/reset.css | 6 | Files: inc/reset.css |
33 | License: BSD (http://opensource.org/licenses/BSD-3-Clause) | 7 | License: BSD (http://opensource.org/licenses/BSD-3-Clause) |
@@ -169,6 +169,12 @@ clean: | |||
169 | @git clean -df | 169 | @git clean -df |
170 | @rm -rf sandbox | 170 | @rm -rf sandbox |
171 | 171 | ||
172 | ### generate the AUTHORS file from Git commit information | ||
173 | authors: | ||
174 | @cp .github/mailmap .mailmap | ||
175 | @git shortlog -sne > AUTHORS | ||
176 | @rm .mailmap | ||
177 | |||
172 | ### generate Doxygen documentation | 178 | ### generate Doxygen documentation |
173 | doxygen: clean | 179 | doxygen: clean |
174 | @rm -rf doxygen | 180 | @rm -rf doxygen |
@@ -214,4 +220,4 @@ htmlpages: | |||
214 | -o doc/$$base.html $$file; \ | 220 | -o doc/$$base.html $$file; \ |
215 | done; | 221 | done; |
216 | 222 | ||
217 | htmldoc: doc htmlsidebar htmlpages | 223 | htmldoc: authors doc htmlsidebar htmlpages |