From 70db02720424a6b674f39115cc0b1c22975a7491 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 16 Aug 2011 11:40:16 -0500
Subject: Update authors and contributors

* .mailmap: add mapping for Dave's two email addresses.
* AUTHORS: clear out file, tell people to use `git shortlog -s` instead.
* doc/footer.txt: "promote" Dave, put Xavier and Nagy in past contributors.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 .mailmap       |  1 +
 AUTHORS        | 17 +----------------
 doc/footer.txt |  9 ++++++---
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/.mailmap b/.mailmap
index 351ed023..c3f8ce23 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,6 +7,7 @@ Bryan Ischo <bryan@ischo.com> <bji-keyword-pacman.3644cb@www.ischo.com>
 Christos Nouskas <nous@archlinux.us> <nouskas@gmail.com>
 Daenyth Blank <daenyth+arch@gmail.com> <Daenyth+Arch@gmail.com>
 Daenyth Blank <Daenyth+arch@gmail.com> <Daenyth+git@gmail.com>
+Dave Reisner <dreisner@archlinux.org> <d@falconindy.com>
 甘露(Gan Lu) <rhythm.gan@gmail.com>
 Giovanni Scafora <giovanni@archlinux.org> <linuxmania@gmail.com>
 Jaroslaw Swierczynski <swiergot@gmail.com> <swiergot@juvepoland.com>
diff --git a/AUTHORS b/AUTHORS
index 3ba87f56..65fddac9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,16 +1 @@
-Judd Vinet <jvinet@zeroflux.org>
-Aurelien Foret <aurelien@archlinux.org>
-Aaron Griffin <aaron@archlinux.org>
-Dan McGee <dan@archlinux.org>
-
-Miklós Vajna <vmiklos@frugalware.org>
-Christian Hamar <krics@linuxforum.hu>
-Josh Wheeler <deltalima@gmail.com>
-David Kimpe <DNAku@frugalware.org>
-James Rosten <seinfeld90@gmail.com>
-Roman Kyrylych <Roman.Kyrylych@gmail.com>
-Andrew Fyfe <andrew@neptune-one.net>
-Chantry Xavier <shiningxc@gmail.com>
-Nagy Gabor <ngaba@bibl.u-szeged.hu>
-Nathan Jones <nathanj@insightbb.com>
-Allan McRae <mcrae_allan@hotmail.com>
+Use `git shortlog -s` for a list of contributors.
diff --git a/doc/footer.txt b/doc/footer.txt
index a1325427..10ef067f 100644
--- a/doc/footer.txt
+++ b/doc/footer.txt
@@ -20,12 +20,15 @@ Current maintainers:
 
 * Allan McRae <allan@archlinux.org>
 * Dan McGee <dan@archlinux.org>
-* Xavier Chantry <shiningxc@gmail.com>
+* Dave Reisner <dreisner@archlinux.org>
 
-Past contributors:
+Past major contributors:
 
 * Judd Vinet <jvinet@zeroflux.org>
 * Aurelien Foret <aurelien@archlinux.org>
 * Aaron Griffin <aaron@archlinux.org>
+* Xavier Chantry <shiningxc@gmail.com>
+* Nagy Gabor <ngaba@bibl.u-szeged.hu>
 
-See the 'AUTHORS' file for additional contributors.
+For additional contributors, use `git shortlog -s` on the pacman.git
+repository.
-- 
cgit v1.2.3-54-g00ecf