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