From 4d0da596b372d1c83df8386cf2ad9198fa572d98 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Tue, 25 Aug 2020 17:52:24 +0200 Subject: [PATCH] AUTHORS: Convert to reStructuredText MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that we have moved to Meson, we are no longer required to use a specific name for this file, and since the rest of our documentation is in reStructuredText format and uses a matching file extension, we can give the AUTHORS file the same treatment. Signed-off-by: Andrea Bolognani Reviewed-by: Ján Tomko --- AUTHORS.in | 103 ---------------------------------- AUTHORS.rst.in | 104 +++++++++++++++++++++++++++++++++++ libvirt.spec.in | 2 +- meson.build | 4 +- scripts/meson-gen-authors.py | 2 +- 5 files changed, 108 insertions(+), 107 deletions(-) delete mode 100644 AUTHORS.in create mode 100644 AUTHORS.rst.in diff --git a/AUTHORS.in b/AUTHORS.in deleted file mode 100644 index f4ab42ea9f..0000000000 --- a/AUTHORS.in +++ /dev/null @@ -1,103 +0,0 @@ - libvirt Authors - =============== - -The libvirt project was initiated by: - -Daniel Veillard or - -The primary maintainers and people with commit access rights: - -Andrea Bolognani -Cédric Bosdonnat -Christian Ehrhardt -Christophe Fergeau -Cole Robinson -Daniel P. Berrangé -Daniel Veillard -Eric Blake -Erik Skultety -Fabiano Fidêncio -Guido Günther -Ján Tomko -Jim Fehlig -Jiří Denemark -Laine Stump -Martin Kletzander -Michal Prívozník -Nikolay Shirokovskiy -Pavel Hrdina -Peter Krempa -Pino Toscano -Richard W.M. Jones -Roman Bogorodskiy - -Previous maintainers: - -Alex Jia -Anthony Liguori -Atsushi SAKAI -Chris Lalancette -Claudio Bley -Dan Smith -Dave Allan -Dave Leskovec -Dmitry Guryanov -Doug Goldstein -Gao Feng -Guannan Ren -Jim Meyering -John Ferlan -John Levon -Justin Clift -Karel Zak -Katerina Koukiou -Mark McLoughlin -Matthias Bolte -Maxim Nestratov -Osier Yang -Stefan Berger -Wen Congyang - -Patches have also been contributed by: - -Abel Míguez Rodríguez -Amit Shah -Andrew Puch -Anton Protopopov -Ben Guthro -Daniel Hokka Zakrisson -Dan Wendlandt -David Lively -David Lutterkort -Evgeniy Sokolov -Hugh Brock -Itamar Heim -James Morris -Javier Fontan -Jeremy Katz -Kaitlin Rupert -Kazuki Mizushima -Mads Chr. Olesen -Mark Johnson -Markus Armbruster -Masayuki Sunou -Matthias Witte -Michel Ponceau -Nobuhiro Itou -Pete Vetere -Philippe Berthault -Saori Fukuta -Shigeki Sakamoto -Shuveb Hussain -Stefan de Konink -Takahashi Tomohiro -Tatsuro Enokura - -@contributorslist@ - -The libvirt logo was designed by Diana Fong - --- End -;; Local Variables: -;; coding: utf-8 -;; End: diff --git a/AUTHORS.rst.in b/AUTHORS.rst.in new file mode 100644 index 0000000000..5a651b22db --- /dev/null +++ b/AUTHORS.rst.in @@ -0,0 +1,104 @@ +=============== +libvirt Authors +=============== + +The libvirt project was initiated by: + +* Daniel Veillard or + +The primary maintainers and people with commit access rights: + +* Andrea Bolognani +* Cédric Bosdonnat +* Christian Ehrhardt +* Christophe Fergeau +* Cole Robinson +* Daniel P. Berrangé +* Daniel Veillard +* Eric Blake +* Erik Skultety +* Fabiano Fidêncio +* Guido Günther +* Ján Tomko +* Jim Fehlig +* Jiří Denemark +* Laine Stump +* Martin Kletzander +* Michal Prívozník +* Nikolay Shirokovskiy +* Pavel Hrdina +* Peter Krempa +* Pino Toscano +* Richard W.M. Jones +* Roman Bogorodskiy + +Previous maintainers: + +* Alex Jia +* Anthony Liguori +* Atsushi SAKAI +* Chris Lalancette +* Claudio Bley +* Dan Smith +* Dave Allan +* Dave Leskovec +* Dmitry Guryanov +* Doug Goldstein +* Gao Feng +* Guannan Ren +* Jim Meyering +* John Ferlan +* John Levon +* Justin Clift +* Karel Zak +* Katerina Koukiou +* Mark McLoughlin +* Matthias Bolte +* Maxim Nestratov +* Osier Yang +* Stefan Berger +* Wen Congyang + +Patches have also been contributed by: + +* Abel Míguez Rodríguez +* Amit Shah +* Andrew Puch +* Anton Protopopov +* Ben Guthro +* Daniel Hokka Zakrisson +* Dan Wendlandt +* David Lively +* David Lutterkort +* Evgeniy Sokolov +* Hugh Brock +* Itamar Heim +* James Morris +* Javier Fontan +* Jeremy Katz +* Kaitlin Rupert +* Kazuki Mizushima +* Mads Chr. Olesen +* Mark Johnson +* Markus Armbruster +* Masayuki Sunou +* Matthias Witte +* Michel Ponceau +* Nobuhiro Itou +* Pete Vetere +* Philippe Berthault +* Saori Fukuta +* Shigeki Sakamoto +* Shuveb Hussain +* Stefan de Konink +* Takahashi Tomohiro +* Tatsuro Enokura + +@contributorslist@ + +The libvirt logo was designed by Diana Fong + +-- End +;; Local Variables: +;; coding: utf-8 +;; End: diff --git a/libvirt.spec.in b/libvirt.spec.in index 4b9e04ae61..d124a7ce45 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1485,7 +1485,7 @@ exit 0 %files %files docs -%doc AUTHORS NEWS.rst README.rst +%doc AUTHORS.rst NEWS.rst README.rst %doc libvirt-docs/* %files daemon diff --git a/meson.build b/meson.build index c794e34bcb..1aad385ad1 100644 --- a/meson.build +++ b/meson.build @@ -2306,7 +2306,7 @@ if git endforeach authors = run_command(python3_prog, meson_gen_authors_prog.path(), env: runutf8) - authors_file = 'AUTHORS.in' + authors_file = 'AUTHORS.rst.in' authors_conf = configuration_data() authors_conf.set('contributorslist', authors.stdout()) @@ -2320,7 +2320,7 @@ if git # Using return values from configure_file in add_dist_script is possible since 0.55.0 dist_files = [ 'libvirt.spec', - 'AUTHORS', + 'AUTHORS.rst', ] foreach file : dist_files diff --git a/scripts/meson-gen-authors.py b/scripts/meson-gen-authors.py index f58bf6383b..8551e9ea68 100755 --- a/scripts/meson-gen-authors.py +++ b/scripts/meson-gen-authors.py @@ -5,4 +5,4 @@ import os meson_source_root = os.environ['MESON_SOURCE_ROOT'] os.chdir(meson_source_root) -os.system('git log --pretty=format:"%aN <%aE>" | sort -u') +os.system('git log --pretty=format:"* %aN <%aE>" | sort -u')