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 <abologna@xxxxxxxxxx> --- 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 <veillard@xxxxxxxxxx> or <daniel@xxxxxxxxxxxx> - -The primary maintainers and people with commit access rights: - -Andrea Bolognani <abologna@xxxxxxxxxx> -Cédric Bosdonnat <cbosdonnat@xxxxxxxx> -Christian Ehrhardt <christian.ehrhardt@xxxxxxxxxxxxx> -Christophe Fergeau <cfergeau@xxxxxxxxxx> -Cole Robinson <crobinso@xxxxxxxxxx> -Daniel P. Berrangé <berrange@xxxxxxxxxx> -Daniel Veillard <veillard@xxxxxxxxxx> -Eric Blake <eblake@xxxxxxxxxx> -Erik Skultety <eskultet@xxxxxxxxxx> -Fabiano Fidêncio <fidencio@xxxxxxxxxx> -Guido Günther <agx@xxxxxxxxxxx> -Ján Tomko <jtomko@xxxxxxxxxx> -Jim Fehlig <jfehlig@xxxxxxxx> -Jiří Denemark <jdenemar@xxxxxxxxxx> -Laine Stump <laine@xxxxxxxxxx> -Martin Kletzander <mkletzan@xxxxxxxxxx> -Michal Prívozník <mprivozn@xxxxxxxxxx> -Nikolay Shirokovskiy <nshirokovskiy@xxxxxxxxxxxxx> -Pavel Hrdina <phrdina@xxxxxxxxxx> -Peter Krempa <pkrempa@xxxxxxxxxx> -Pino Toscano <ptoscano@xxxxxxxxxx> -Richard W.M. Jones <rjones@xxxxxxxxxx> -Roman Bogorodskiy <bogorodskiy@xxxxxxxxx> - -Previous maintainers: - -Alex Jia <ajia@xxxxxxxxxx> -Anthony Liguori <aliguori@xxxxxxxxxx> -Atsushi SAKAI <sakaia@xxxxxxxxxxxxxx> -Chris Lalancette <clalance@xxxxxxxxxx> -Claudio Bley <claudio.bley@xxxxxxxxx> -Dan Smith <danms@xxxxxxxxxx> -Dave Allan <dallan@xxxxxxxxxx> -Dave Leskovec <dlesko@xxxxxxxxxxxxxxxxxx> -Dmitry Guryanov <dguryanov@xxxxxxxxxxxxx> -Doug Goldstein <cardoe@xxxxxxxxxx> -Gao Feng <gaofeng@xxxxxxxxxxxxxx> -Guannan Ren <gren@xxxxxxxxxx> -Jim Meyering <meyering@xxxxxxxxxx> -John Ferlan <jferlan@xxxxxxxxxx> -John Levon <john.levon@xxxxxxx> -Justin Clift <jclift@xxxxxxxxxx> -Karel Zak <kzak@xxxxxxxxxx> -Katerina Koukiou <kkoukiou@xxxxxxxxxx> -Mark McLoughlin <markmc@xxxxxxxxxx> -Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx> -Maxim Nestratov <mnestratov@xxxxxxxxxxxxx> -Osier Yang <jyang@xxxxxxxxxx> -Stefan Berger <stefanb@xxxxxxxxxx> -Wen Congyang <wency@xxxxxxxxxxxxxx> - -Patches have also been contributed by: - -Abel Míguez Rodríguez <amiguezr@xxxxxxxxxx> -Amit Shah <amit.shah@xxxxxxxxxx> -Andrew Puch <apuch@xxxxxxxxxx> -Anton Protopopov <aspsk2@xxxxxxxxx> -Ben Guthro <ben.guthro@xxxxxxxxx> -Daniel Hokka Zakrisson <daniel@xxxxxxxxx> -Dan Wendlandt <dan@xxxxxxxxxx> -David Lively <dlively@xxxxxxxxxxxxxxx> -David Lutterkort <dlutter@xxxxxxxxxx> -Evgeniy Sokolov <evg@xxxxxxxxxx> -Hugh Brock <hbrock@xxxxxxxxxx> -Itamar Heim <iheim@xxxxxxxxxx> -James Morris <jmorris@xxxxxxxxx> -Javier Fontan <jfontan@xxxxxxxxx> -Jeremy Katz <katzj@xxxxxxxxxx> -Kaitlin Rupert <kaitlin@xxxxxxxxxxxxxxxxxx> -Kazuki Mizushima <mizushima.kazuk@xxxxxxxxxxxxxx> -Mads Chr. Olesen <shiyee@xxxxxxxxx> -Mark Johnson <johnson.nh@xxxxxxxxx> -Markus Armbruster <armbru@xxxxxxxxxx> -Masayuki Sunou <fj1826dm@xxxxxxxxxxxxxxxxx> -Matthias Witte <witte@xxxxxxxxxxxxxx> -Michel Ponceau <michel.ponceau@xxxxxxxx> -Nobuhiro Itou <fj0873gn@xxxxxxxxxxxxxxxxx> -Pete Vetere <pvetere@xxxxxxxxxx> -Philippe Berthault <philippe.berthault@xxxxxxxx> -Saori Fukuta <fukuta.saori@xxxxxxxxxxxxxx> -Shigeki Sakamoto <fj0588di@xxxxxxxxxxxxxxxxx> -Shuveb Hussain <shuveb@xxxxxxxxxxxxxxx> -Stefan de Konink <dekonink@xxxxxxxxxxxxxxxx> -Takahashi Tomohiro <takatom@xxxxxxxxxxxxxx> -Tatsuro Enokura <fj7716hz@xxxxxxxxxxxxxxxxx> - -@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 <veillard@xxxxxxxxxx> or <daniel@xxxxxxxxxxxx> + +The primary maintainers and people with commit access rights: + +* Andrea Bolognani <abologna@xxxxxxxxxx> +* Cédric Bosdonnat <cbosdonnat@xxxxxxxx> +* Christian Ehrhardt <christian.ehrhardt@xxxxxxxxxxxxx> +* Christophe Fergeau <cfergeau@xxxxxxxxxx> +* Cole Robinson <crobinso@xxxxxxxxxx> +* Daniel P. Berrangé <berrange@xxxxxxxxxx> +* Daniel Veillard <veillard@xxxxxxxxxx> +* Eric Blake <eblake@xxxxxxxxxx> +* Erik Skultety <eskultet@xxxxxxxxxx> +* Fabiano Fidêncio <fidencio@xxxxxxxxxx> +* Guido Günther <agx@xxxxxxxxxxx> +* Ján Tomko <jtomko@xxxxxxxxxx> +* Jim Fehlig <jfehlig@xxxxxxxx> +* Jiří Denemark <jdenemar@xxxxxxxxxx> +* Laine Stump <laine@xxxxxxxxxx> +* Martin Kletzander <mkletzan@xxxxxxxxxx> +* Michal Prívozník <mprivozn@xxxxxxxxxx> +* Nikolay Shirokovskiy <nshirokovskiy@xxxxxxxxxxxxx> +* Pavel Hrdina <phrdina@xxxxxxxxxx> +* Peter Krempa <pkrempa@xxxxxxxxxx> +* Pino Toscano <ptoscano@xxxxxxxxxx> +* Richard W.M. Jones <rjones@xxxxxxxxxx> +* Roman Bogorodskiy <bogorodskiy@xxxxxxxxx> + +Previous maintainers: + +* Alex Jia <ajia@xxxxxxxxxx> +* Anthony Liguori <aliguori@xxxxxxxxxx> +* Atsushi SAKAI <sakaia@xxxxxxxxxxxxxx> +* Chris Lalancette <clalance@xxxxxxxxxx> +* Claudio Bley <claudio.bley@xxxxxxxxx> +* Dan Smith <danms@xxxxxxxxxx> +* Dave Allan <dallan@xxxxxxxxxx> +* Dave Leskovec <dlesko@xxxxxxxxxxxxxxxxxx> +* Dmitry Guryanov <dguryanov@xxxxxxxxxxxxx> +* Doug Goldstein <cardoe@xxxxxxxxxx> +* Gao Feng <gaofeng@xxxxxxxxxxxxxx> +* Guannan Ren <gren@xxxxxxxxxx> +* Jim Meyering <meyering@xxxxxxxxxx> +* John Ferlan <jferlan@xxxxxxxxxx> +* John Levon <john.levon@xxxxxxx> +* Justin Clift <jclift@xxxxxxxxxx> +* Karel Zak <kzak@xxxxxxxxxx> +* Katerina Koukiou <kkoukiou@xxxxxxxxxx> +* Mark McLoughlin <markmc@xxxxxxxxxx> +* Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx> +* Maxim Nestratov <mnestratov@xxxxxxxxxxxxx> +* Osier Yang <jyang@xxxxxxxxxx> +* Stefan Berger <stefanb@xxxxxxxxxx> +* Wen Congyang <wency@xxxxxxxxxxxxxx> + +Patches have also been contributed by: + +* Abel Míguez Rodríguez <amiguezr@xxxxxxxxxx> +* Amit Shah <amit.shah@xxxxxxxxxx> +* Andrew Puch <apuch@xxxxxxxxxx> +* Anton Protopopov <aspsk2@xxxxxxxxx> +* Ben Guthro <ben.guthro@xxxxxxxxx> +* Daniel Hokka Zakrisson <daniel@xxxxxxxxx> +* Dan Wendlandt <dan@xxxxxxxxxx> +* David Lively <dlively@xxxxxxxxxxxxxxx> +* David Lutterkort <dlutter@xxxxxxxxxx> +* Evgeniy Sokolov <evg@xxxxxxxxxx> +* Hugh Brock <hbrock@xxxxxxxxxx> +* Itamar Heim <iheim@xxxxxxxxxx> +* James Morris <jmorris@xxxxxxxxx> +* Javier Fontan <jfontan@xxxxxxxxx> +* Jeremy Katz <katzj@xxxxxxxxxx> +* Kaitlin Rupert <kaitlin@xxxxxxxxxxxxxxxxxx> +* Kazuki Mizushima <mizushima.kazuk@xxxxxxxxxxxxxx> +* Mads Chr. Olesen <shiyee@xxxxxxxxx> +* Mark Johnson <johnson.nh@xxxxxxxxx> +* Markus Armbruster <armbru@xxxxxxxxxx> +* Masayuki Sunou <fj1826dm@xxxxxxxxxxxxxxxxx> +* Matthias Witte <witte@xxxxxxxxxxxxxx> +* Michel Ponceau <michel.ponceau@xxxxxxxx> +* Nobuhiro Itou <fj0873gn@xxxxxxxxxxxxxxxxx> +* Pete Vetere <pvetere@xxxxxxxxxx> +* Philippe Berthault <philippe.berthault@xxxxxxxx> +* Saori Fukuta <fukuta.saori@xxxxxxxxxxxxxx> +* Shigeki Sakamoto <fj0588di@xxxxxxxxxxxxxxxxx> +* Shuveb Hussain <shuveb@xxxxxxxxxxxxxxx> +* Stefan de Konink <dekonink@xxxxxxxxxxxxxxxx> +* Takahashi Tomohiro <takatom@xxxxxxxxxxxxxx> +* Tatsuro Enokura <fj7716hz@xxxxxxxxxxxxxxxxx> + +@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 f024f7bfc4..a39d250680 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1487,7 +1487,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 35e3da6e55..8d18ce3493 100644 --- a/meson.build +++ b/meson.build @@ -2300,7 +2300,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()) @@ -2314,7 +2314,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') -- 2.26.2