[PATCH] Clean up 'THANKS' and 'AUTHORS'.

[PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Alex Kost]

[-- Attachment #1: Type: text/plain, Size: 64 bytes --]

I feel a bit uncomfortable that I added my name to AUTHORS :-)


[-- Attachment #2: 0001-Clean-up-THANKS-and-AUTHORS.patch --]
[-- Type: text/x-patch, Size: 3270 bytes --]

From 5f610f3b84e6024b686e310bbaa402ed25e2d4df Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Sat, 27 Jun 2015 20:42:32 +0300
Subject: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

* AUTHORS: Add Alex Kost.
  Align Paul van der Walt name properly.
* THANKS: Remove Federico Beffa, Marek Benc, John Darrington, Alex Kost,
  Cyrill Schenkel and Andy Wingo because they are placed in AUTHORS.
  Align Kete name properly.
---
 AUTHORS | 3 ++-
 THANKS  | 8 +-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 6eadb7f..0b17f06 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,6 +23,7 @@ alphabetical order):
          Raimon Grau <raimonster@gmail.com>
           David Hashe <david.hashe@dhashe.com>
          Nikita Karetnikov <nikita@karetnikov.org>
+           Alex Kost <alezost@gmail.com>
          Julien Lepiller <julien@lepiller.eu>
         Aljosha Papsch <misc@rpapsch.de>
            Deck Pickard <deck.r.pickard@gmail.com>
@@ -34,7 +35,7 @@ alphabetical order):
     Sree Harsha Totakura <sreeharsha@totakura.in>
           David Thompson <dthompson2@worcester.edu>
           Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com>
-           Paul van der Walt <paul@denknerd.org>
+   Paul van der Walt <paul@denknerd.org>
         Mark H. Weaver <mhw@netris.org>
  Christopher A. Webber <cwebber@dustycloud.org>
            Andy Wingo <wingo@pobox.com>
diff --git a/THANKS b/THANKS
index 8093d8c..0ec4726 100644
--- a/THANKS
+++ b/THANKS
@@ -7,8 +7,6 @@ suggestions, bug reports, patches, internationalization, or general
 infrastructure help:
 
 	    Lluís Batlle i Rossell <viric@viric.name>
-         Federico Beffa <beffa@ieee.org>
-            Marek Benc <merkur32@gmail.com>
           Sylvain Beucler <beuc@beuc.net>
         Amirouche Boubekki <amirouche.boubekki@gmail.com>
 	   Carlos Carleos <carleos@uniovi.es>
@@ -16,14 +14,12 @@ infrastructure help:
 	   Daniel Clark <dclark@pobox.com>
 	Alexandru Cojocaru <xojoc@gmx.com>
 	    Aleix Conchillo Flaqué <aconchillo@gmail.com>
-	     John Darrington <jmd@gnu.org>
 	   Rafael Ferreira <rafael.f.f1@gmail.com>
 	Christian Grothoff <christian@grothoff.org>
           Brandon Invergo <brandon@gnu.org>
 	  Jeffrin Jose <ahiliation@yahoo.co.in>
-	     Kete <kete@ninthfloor.org>
+	          Kete <kete@ninthfloor.org>
            Daniel Kochmański <dkochmanski@hellsgate.pl>
-             Alex Kost <alezost@gmail.com>
 	  Matthew Lien <bluet@bluet.org>
 	    Niels Möller <nisse@lysator.liu.se>
 	   Yutaka Niibe <gniibe@fsij.org>
@@ -33,12 +29,10 @@ infrastructure help:
                   rekado <rekado@elephly.net>
            Joshua Randall <jcrandall@alum.mit.edu>
       Bruno Félix Rezende Ribeiro <oitofelix@gnu.org>
-	   Cyrill Schenkel <cyrill.schenkel@gmail.com>
 	    Benno Schulenberg <coordinator@translationproject.org>
            Thomas Schwinge <thomas@codesourcery.com>
 	     Alen Skondro <askondro@gmail.com>
 	 Matthias Wachs <wachs@net.in.tum.de>
-             Andy Wingo <wingo@pobox.com>
            Philip Woods <elzairthesorcerer@gmail.com>
 
 GNU Guix also includes non-software works.  Thanks to the following
-- 
2.4.3

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Andreas Enge]

On Sat, Jun 27, 2015 at 08:53:29PM +0300, Alex Kost wrote:
> I feel a bit uncomfortable that I added my name to AUTHORS :-)

Well, it definitely belongs there. Probably everybody assumed it was there
already and did not bother to check.

Andreas

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Mark H Weaver]

Andreas Enge <andreas@enge.fr> writes:

> On Sat, Jun 27, 2015 at 08:53:29PM +0300, Alex Kost wrote:
>> I feel a bit uncomfortable that I added my name to AUTHORS :-)
>
> Well, it definitely belongs there. Probably everybody assumed it was there
> already and did not bother to check.

Agreed :)

    Mark

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Paul van der Walt]

[-- Attachment #1: Type: text/plain, Size: 138 bytes --]

Out of pure curiosity, why are we not thanking so many people any more?
I don't have any vested interest, i'm really just idly wondering.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 800 bytes --]

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Mark H Weaver]

Paul van der Walt <paul@denknerd.org> writes:
> Out of pure curiosity, why are we not thanking so many people any
> more?

Alex explained in the commit log:

* THANKS: Remove Federico Beffa, Marek Benc, John Darrington, Alex Kost,
  Cyrill Schenkel and Andy Wingo because they are placed in AUTHORS.

I guess that no one is being removed from the list; Alex is only
eliminating the duplication.

     Mark

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Paul van der Walt]

On 2015-06-28 at 01:48, quoth Mark H Weaver:
> Alex explained in the commit log:

Oops, that'll teach me not to read everything exhaustively
:shame:. Thanks!

p.

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Alex Kost]

Oh hey!  If you are around, could you tell where your name should be
placed: under "V" (for "van") or under "W" (for "Walt").  Thanks.

-- 
Alex

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Paul van der Walt]

Hey Alex,

On 2015-06-28 at 09:54, quoth Alex Kost:
> Oh hey!  If you are around, could you tell where your name should be
> placed: under "V" (for "van") or under "W" (for "Walt").  Thanks.

It's fine the way it is, that is: i would sort myself as if my family
name was just "Walt", too.

However, i care about that marginally less than i do about incorrect
capitalisation of van/der :).

Thank you,
p.

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Alex Kost]

Paul van der Walt (2015-06-28 12:25 +0300) wrote:

> Hey Alex,
>
> On 2015-06-28 at 09:54, quoth Alex Kost:
>> Oh hey!  If you are around, could you tell where your name should be
>> placed: under "V" (for "van") or under "W" (for "Walt").  Thanks.
>
> It's fine the way it is, that is: i would sort myself as if my family
> name was just "Walt", too.
>
> However, i care about that marginally less than i do about incorrect
> capitalisation of van/der :).

OK, so just to make sure I understand you right, you prefer the
following variant:

--8<---------------cut here---------------start------------->8---
          David Thompson <dthompson2@worcester.edu>
          Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com>
   Paul van der Walt <paul@denknerd.org>
        Mark H. Weaver <mhw@netris.org>
--8<---------------cut here---------------end--------------->8---

over the following:

--8<---------------cut here---------------start------------->8---
          David Thompson <dthompson2@worcester.edu>
           Paul van der Walt <paul@denknerd.org>
          Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com>
        Mark H. Weaver <mhw@netris.org>
--8<---------------cut here---------------end--------------->8---

Right?

-- 
Alex

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Alex Kost]

[-- Attachment #1: Type: text/plain, Size: 1050 bytes --]

After some investigating, I found that several people who made commits
are not mentioned at all (neither in THANKS, nor in AUTHORS)!

People I added to AUTHORS:

- Arne Babenhauserheide: he added 'mercurial' package.

- Ian Denhardt: he added 'feh' package, 'version-prefix' and
  'version-major+minor' procedures, and some other things.

- Kevin Lemonnier: he added 'zsh' and 'weechat' packages and a patch for
  'lua'.

- Mathieu Lirzin: he added 'markdown', 'xbindkeys' and 'dionysus'
  packages, and moved HACKING to the manual!

- Pierre-Antoine Rault: he added 'python-dbus' package.

- Ben Woodcroft: he added several bioinformatics packages.


People I added to THANKS (or should they be moved to AUTHORS?):

- Konrad Hinsen: he added some documentation.

- Cyprien Nicolas: he added 'guild' check to "configure.ac" and fixed a
  couple of typos.

- Yakkala Yagnesh Raghava: he fixed a typo in Nixpkgs URL.

- Alexander Shendi: he added 'libx11' input to 'mit-scheme' package.


I hope I didn't miss anyone.  The modified patch is attached.


[-- Attachment #2: 0001-Clean-up-THANKS-and-AUTHORS.patch --]
[-- Type: text/x-patch, Size: 5016 bytes --]

From d9b060b6b691b43eb07e107107955764e632cb78 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Sat, 27 Jun 2015 20:42:32 +0300
Subject: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

* AUTHORS: Add Arne Babenhauserheide, Ian Denhardt, Alex Kost, Kevin
  Lemonnier, Mathieu Lirzin, Pierre-Antoine Rault and Ben Woodcroft.
  Align Paul van der Walt name properly.
* THANKS: Add Konrad Hinsen, Cyprien Nicolas, Yakkala Yagnesh Raghava
  and Alexander Shendi.
  Remove Federico Beffa, Marek Benc, John Darrington, Alex Kost,
  rekado, Cyrill Schenkel and Andy Wingo because they are placed in
  AUTHORS.
  Align Kete name properly.
---
 AUTHORS |  9 ++++++++-
 THANKS  | 13 +++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 6eadb7f..67b81fa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,6 +8,7 @@ contributing to it.  See `nix/AUTHORS' for details.
 The fine people listed below have contributed code to GNU Guix (in
 alphabetical order):
 
+           Arne Babenhauserheide <arne.babenhauserheide@kit.edu>
            Eric Bavier <bavier@member.fsf.org>
   Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
        Federico Beffa <beffa@fbengineering.ch>
@@ -16,6 +17,7 @@ alphabetical order):
           Tomáš Čech <sleep_walker@suse.cz>
         Ludovic Courtès <ludo@gnu.org>
            John Darrington <jmd@gnu.org>
+            Ian Denhardt <ian@zenhack.net>
         Andreas Enge <andreas@enge.fr>
          Alírio Eyng <alirioeyng@gmail.com>
    Alexander I. Grafov <grafov@gmail.com>
@@ -23,10 +25,14 @@ alphabetical order):
          Raimon Grau <raimonster@gmail.com>
           David Hashe <david.hashe@dhashe.com>
          Nikita Karetnikov <nikita@karetnikov.org>
+           Alex Kost <alezost@gmail.com>
+          Kevin Lemonnier <lemonnierk@ulrar.net>
          Julien Lepiller <julien@lepiller.eu>
+        Mathieu Lirzin <mthl@openmailbox.org>
         Aljosha Papsch <misc@rpapsch.de>
            Deck Pickard <deck.r.pickard@gmail.com>
         Manolis Ragkousis <manolis837@gmail.com>
+ Pierre-Antoine Rault <par@rigelk.eu>
           Cyril Roelandt <tipecaml@gmail.com>
            Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
          Cyrill Schenkel <cyrill.schenkel@gmail.com>
@@ -34,8 +40,9 @@ alphabetical order):
     Sree Harsha Totakura <sreeharsha@totakura.in>
           David Thompson <dthompson2@worcester.edu>
           Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com>
-           Paul van der Walt <paul@denknerd.org>
+   Paul van der Walt <paul@denknerd.org>
         Mark H. Weaver <mhw@netris.org>
  Christopher A. Webber <cwebber@dustycloud.org>
            Andy Wingo <wingo@pobox.com>
+            Ben Woodcroft <donttrustben@gmail.com>
         Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
diff --git a/THANKS b/THANKS
index 8093d8c..dcb3a39 100644
--- a/THANKS
+++ b/THANKS
@@ -7,8 +7,6 @@ suggestions, bug reports, patches, internationalization, or general
 infrastructure help:
 
 	    Lluís Batlle i Rossell <viric@viric.name>
-         Federico Beffa <beffa@ieee.org>
-            Marek Benc <merkur32@gmail.com>
           Sylvain Beucler <beuc@beuc.net>
         Amirouche Boubekki <amirouche.boubekki@gmail.com>
 	   Carlos Carleos <carleos@uniovi.es>
@@ -16,29 +14,28 @@ infrastructure help:
 	   Daniel Clark <dclark@pobox.com>
 	Alexandru Cojocaru <xojoc@gmx.com>
 	    Aleix Conchillo Flaqué <aconchillo@gmail.com>
-	     John Darrington <jmd@gnu.org>
 	   Rafael Ferreira <rafael.f.f1@gmail.com>
 	Christian Grothoff <christian@grothoff.org>
+           Konrad Hinsen <konrad.hinsen@fastmail.net>
           Brandon Invergo <brandon@gnu.org>
 	  Jeffrin Jose <ahiliation@yahoo.co.in>
-	     Kete <kete@ninthfloor.org>
+	          Kete <kete@ninthfloor.org>
            Daniel Kochmański <dkochmanski@hellsgate.pl>
-             Alex Kost <alezost@gmail.com>
 	  Matthew Lien <bluet@bluet.org>
 	    Niels Möller <nisse@lysator.liu.se>
+          Cyprien Nicolas <cyprien@nicolas.tf>
 	   Yutaka Niibe <gniibe@fsij.org>
            Andrei Osipov <andrspv@gmail.com>
              Adam Pribyl <pribyl@lowlevel.cz>
             Pjotr Prins <pjotr.public12@thebird.nl>
-                  rekado <rekado@elephly.net>
+  Yakkala Yagnesh Raghava <hi@yagnesh.org>
            Joshua Randall <jcrandall@alum.mit.edu>
       Bruno Félix Rezende Ribeiro <oitofelix@gnu.org>
-	   Cyrill Schenkel <cyrill.schenkel@gmail.com>
 	    Benno Schulenberg <coordinator@translationproject.org>
            Thomas Schwinge <thomas@codesourcery.com>
+        Alexander Shendi <Alexander.Shendi@web.de>
 	     Alen Skondro <askondro@gmail.com>
 	 Matthias Wachs <wachs@net.in.tum.de>
-             Andy Wingo <wingo@pobox.com>
            Philip Woods <elzairthesorcerer@gmail.com>
 
 GNU Guix also includes non-software works.  Thanks to the following
-- 
2.4.3

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> From d9b060b6b691b43eb07e107107955764e632cb78 Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> Date: Sat, 27 Jun 2015 20:42:32 +0300
> Subject: [PATCH] Clean up 'THANKS' and 'AUTHORS'.
>
> * AUTHORS: Add Arne Babenhauserheide, Ian Denhardt, Alex Kost, Kevin
>   Lemonnier, Mathieu Lirzin, Pierre-Antoine Rault and Ben Woodcroft.
>   Align Paul van der Walt name properly.
> * THANKS: Add Konrad Hinsen, Cyprien Nicolas, Yakkala Yagnesh Raghava
>   and Alexander Shendi.
>   Remove Federico Beffa, Marek Benc, John Darrington, Alex Kost,
>   rekado, Cyrill Schenkel and Andy Wingo because they are placed in
>   AUTHORS.
>   Align Kete name properly.

LGTM!

I think we should consider generating ‘AUTHORS’ upon ‘make dist’
eventually, ideally with a list of those who contributed to the last
release, and then the list of all those who contributed at all.  Any
takers?  :-)

Ludo’.

Generate 'AUTHORS'

[Alex Kost]

[-- Attachment #1: Type: text/plain, Size: 507 bytes --]

Ludovic Courtès (2015-06-28 23:43 +0300) wrote:

> I think we should consider generating ‘AUTHORS’ upon ‘make dist’
> eventually, ideally with a list of those who contributed to the last
> release, and then the list of all those who contributed at all.  Any
> takers?  :-)

I can try.  IIUC it requires:

- adding a script (let's say "generate-authors.scm") into "build-aux"
  directory that will call an appropriate "git log" command and mess
  with its output; something like this:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: generate-authors.scm --]
[-- Type: text/x-scheme, Size: 460 bytes --]

(use-modules (ice-9 popen)
             (ice-9 rdelim)
             (srfi srfi-1))

(define* (authors #:optional (range "HEAD"))
  "Return a list of authors for commit RANGE."
  (let* ((port (open-pipe* OPEN_READ
                           "git" "log" "--format=%aN <%aE>" range))
         (output (read-string port)))
    (close-port port)
    (let ((authors (string-split output #\newline)))
      (delete-duplicates authors))))

;; (authors "v0.8.2..HEAD")

[-- Attachment #3: Type: text/plain, Size: 482 bytes --]


- adding a new target to "Makefile.am" (and to 'dist-hook' there).

Right?

However I see an issue with the autogenerated AUTHORS.  There will be
duplicates since people not always use a single name/e-mail.  For
example, there are:

Joshua S. Grant <youlysses@riseup.net>
Joshua S. Grant <jgrant@parenthetical.io>
Joshua Grant <tadni@riseup.net>
Guy Grant <tadnimi@gmail.com>

or even:

Ludovic Courtès <ludo@gnu.org>
Ludovic Courtès <ludovic.courtes@inria.fr>

Re: Generate 'AUTHORS'

[Cyril Roelandt]

On 06/29/2015 09:26 PM, Alex Kost wrote:
> However I see an issue with the autogenerated AUTHORS.  There will be
> duplicates since people not always use a single name/e-mail.  For
> example, there are:

The proper way to fix this (and this should probably be done with or
without this patch) is to use a .mailmap[1] file in our git repo. This
will allow us to group all commits of an author even if they used
different emails/name spellings.

Cyril.

[1] http://git-scm.com/docs/git-shortlog

Re: Generate 'AUTHORS'

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> Ludovic Courtès (2015-06-28 23:43 +0300) wrote:
>
>> I think we should consider generating ‘AUTHORS’ upon ‘make dist’
>> eventually, ideally with a list of those who contributed to the last
>> release, and then the list of all those who contributed at all.  Any
>> takers?  :-)
>
> I can try.  IIUC it requires:
>
> - adding a script (let's say "generate-authors.scm") into "build-aux"
>   directory that will call an appropriate "git log" command and mess
>   with its output; something like this:
>
>
> (use-modules (ice-9 popen)
>              (ice-9 rdelim)
>              (srfi srfi-1))
>
> (define* (authors #:optional (range "HEAD"))
>   "Return a list of authors for commit RANGE."
>   (let* ((port (open-pipe* OPEN_READ
>                            "git" "log" "--format=%aN <%aE>" range))
>          (output (read-string port)))
>     (close-port port)
>     (let ((authors (string-split output #\newline)))
>       (delete-duplicates authors))))
>
> ;; (authors "v0.8.2..HEAD")
>
>
> - adding a new target to "Makefile.am" (and to 'dist-hook' there).
>
> Right?

Yes!

Cyril Roelandt <tipecaml@gmail.com> skribis:

> On 06/29/2015 09:26 PM, Alex Kost wrote:
>> However I see an issue with the autogenerated AUTHORS.  There will be
>> duplicates since people not always use a single name/e-mail.  For
>> example, there are:
>
> The proper way to fix this (and this should probably be done with or
> without this patch) is to use a .mailmap[1] file in our git repo. This
> will allow us to group all commits of an author even if they used
> different emails/name spellings.

Nice, didn’t know that.  I guess we should create a .mailmap based on
the current AUTHORS file, which is authoritative.  Alex, are you willing
to do that?

Thanks!

Ludo’.

Re: Generate 'AUTHORS'

[Alex Kost]

Ludovic Courtès (2015-06-30 15:59 +0300) wrote:
>
> Cyril Roelandt <tipecaml@gmail.com> skribis:
>
>> On 06/29/2015 09:26 PM, Alex Kost wrote:
>>> However I see an issue with the autogenerated AUTHORS.  There will be
>>> duplicates since people not always use a single name/e-mail.  For
>>> example, there are:
>>
>> The proper way to fix this (and this should probably be done with or
>> without this patch) is to use a .mailmap[1] file in our git repo. This
>> will allow us to group all commits of an author even if they used
>> different emails/name spellings.

Wow, great!  I didn't know about this feature, thank you!

> Nice, didn’t know that.  I guess we should create a .mailmap based on
> the current AUTHORS file, which is authoritative.  Alex, are you willing
> to do that?

Yes, I will do that.  But before sending a patch I have some questions
to people about their "canonical" names/e-mails that should be put in
.mailmap:

- Ricardo: <ricardo.wurmus@mdc-berlin.de> or <rekado@elephly.net>?

- Mark: Mark H Weaver or Mark H. Weaver?

- Amirouche: "amz3 <amirouche@hypermove.net>" or "Amirouche Boubekki
  <amirouche.boubekki@gmail.com>"?  (I suppose these belongs to a single
  person)

- Ben: <b.woodcroft@uq.edu.au> or <donttrustben@gmail.com>?

- Christopher: Christopher Allan Webber or Christopher A. Webber?

- Tomáš: <sleep_walker@suse.cz> or <sleep_walker@gnu.org>?

- Taylan: Taylan Ulrich Bayirli/Kammer or Taylan Ulrich Bayırlı/Kammer?

- David: <dthompson2@worcester.edu> or <dthompson@member.fsf.org>?

- Cyprien Nicolas: Nicolas is a name, right?  So I think the preferable
  form would be "Nicolas Cyprien", no?


P.S.: I Cc-ed all the people, so make sure to remove them all during
answering to prevent spamming them.

-- 
Alex

Re: Generate 'AUTHORS'

[Mark H Weaver]

Alex Kost <alezost@gmail.com> writes:
> - Mark: Mark H Weaver or Mark H. Weaver?

"Mark H Weaver" please.

    Thanks,
      Mark

Re: Generate 'AUTHORS'

[Ben Woodcroft]

On 01/07/15 05:26, Alex Kost wrote:
> - Ben: <b.woodcroft@uq.edu.au> or <donttrustben@gmail.com>?
b.woodcroft@uq.edu.au please.

Re: Generate 'AUTHORS'

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> - Cyprien Nicolas: Nicolas is a name, right?  So I think the preferable
>   form would be "Nicolas Cyprien", no?

Should be “Cyprien Nicolas” (Cyprien is the first name.)

Ludo’.

[PATCH] Add '.mailmap'.

[Alex Kost]

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

Thanks to all for answering!  As may be checked with:

  git shortlog --email | grep -e '^[^ ]'

after applying the attached patch there will be a unique entry for each
contributor.  So now "git log" may be used to generate an AUTHORS file.


[-- Attachment #2: 0001-Add-.mailmap.patch --]
[-- Type: text/x-patch, Size: 2016 bytes --]

From ac0d941b2b098e31c549b9e4269e2a31547287bb Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Tue, 30 Jun 2015 23:08:32 +0300
Subject: [PATCH] Add '.mailmap'.

* .mailmap: New file.
---
 .mailmap | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..8187f5d
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,27 @@
+# This list is used to avoid multiple name/email instances of the same
+# contributors reported by "git log" and "git shortlog" commands.
+
+Alexander I. Grafov <grafov@gmail.com>
+Amirouche Boubekki <amirouche@hypermove.net>
+Ben Woodcroft <b.woodcroft@uq.edu.au> <donttrustben@gmail.com>
+Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com>
+Cyprien Nicolas <cyprien@nicolas.tf> <c.nicolas+gitorious@gmail.com>
+David Thompson <davet@gnu.org> <dthompson2@worcester.edu>
+David Thompson <davet@gnu.org> <dthompson@member.fsf.org>
+Deck Pickard <deck.r.pickard@gmail.com> <nebu@kipple>
+Eric Bavier <bavier@member.fsf.org> <ericbavier@gmail.com>
+John Darrington <jmd@gnu.org> <john@darrington.wattle.id.au>
+Joshua Grant <tadni@riseup.net> <gzg@riseup.net>
+Joshua Grant <tadni@riseup.net> <jgrant@parenthetical.io>
+Joshua Grant <tadni@riseup.net> <tadnimi@gmail.com>
+Joshua Grant <tadni@riseup.net> <youlysses@riseup.net>
+Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr>
+Mathieu Lirzin <mthl@openmailbox.org> <mathieu.lirzin@openmailbox.org>
+Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
+Pjotr Prins <pjotr.public01@thebird.nl>
+Pjotr Prins <pjotr.public01@thebird.nl> <pjotr.public12@thebird.nl>
+Ricardo Wurmus <rekado@elephly.net>
+Ricardo Wurmus <rekado@elephly.net> <ricardo.wurmus@mdc-berlin.de>
+Sou Bunnbu (宋文武) <iyzsong@gmail.com>
+Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+Tomáš Čech <sleep_walker@gnu.org> <sleep_walker@suse.cz>
-- 
2.4.3

Re: [PATCH] Add '.mailmap'.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> From ac0d941b2b098e31c549b9e4269e2a31547287bb Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> Date: Tue, 30 Jun 2015 23:08:32 +0300
> Subject: [PATCH] Add '.mailmap'.
>
> * .mailmap: New file.

Please push, thanks!

Ludo’.

[PATCH] build: Generate 'AUTHORS'.

[Alex Kost]

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

I hope the number of commits by each contributor in the generated
AUTHORS file addresses (at least partially) John's concerns about
«the measure of contribution».

The new "build-aux/generate-authors.scm" file may be tested like so:

  guile ~/src/guix/build-aux/generate-authors.scm ~/src/guix /tmp/guix-authors


Not related: I wonder is there a reason to ignore (in .gitignore) the
whole "build-aux" directory?  IIUC this led to commit 8bc35f8, right?


[-- Attachment #2: 0001-build-Generate-AUTHORS.patch --]
[-- Type: text/x-patch, Size: 6480 bytes --]

From 3f8c6b024b3df310f2076ff897af8169d45005da Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Sat, 4 Jul 2015 12:27:26 +0300
Subject: [PATCH] build: Generate 'AUTHORS'.

* build-aux/generate-authors.scm: New file.
* Makefile.am (gen-AUTHORS): New target.
  (dist-hook, .PHONY): Add it.
---
 Makefile.am                    |  12 ++++-
 build-aux/generate-authors.scm | 120 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+), 2 deletions(-)
 create mode 100644 build-aux/generate-authors.scm

diff --git a/Makefile.am b/Makefile.am
index cc0b135..44d3b09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 # GNU Guix --- Functional package management for GNU
 # Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Andreas Enge <andreas@enge.fr>
+# Copyright © 2015 Alex Kost <alezost@gmail.com>
 #
 # This file is part of GNU Guix.
 #
@@ -363,7 +364,9 @@ guix-binary.%.tar.xz:
 	  "$(top_srcdir)/build-aux/make-binary-tarball.scm" "$*" "$@"
 
 
-dist-hook: sync-descriptions gen-ChangeLog assert-no-store-file-names
+dist-hook: sync-descriptions gen-ChangeLog gen-AUTHORS
+dist-hook: assert-no-store-file-names
+
 distcheck-hook: assert-binaries-available assert-final-inputs-self-contained
 
 sync-descriptions:
@@ -378,6 +381,11 @@ gen-ChangeLog:
 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;	\
 	fi
 
+gen-AUTHORS:
+	$(top_builddir)/pre-inst-env "$(GUILE)"			\
+	  "$(top_srcdir)/build-aux/generate-authors.scm"	\
+	  "$(top_srcdir)" "$(distdir)/AUTHORS"
+
 # Make sure we're not shipping a file that embeds a local /gnu/store file name.
 assert-no-store-file-names:
 	if grep -r --exclude=*.texi --exclude=*.info				\
@@ -397,6 +405,6 @@ assert-final-inputs-self-contained:
 	$(top_builddir)/pre-inst-env "$(GUILE)"				\
 	  "$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm"
 
-.PHONY: sync-descriptions gen-ChangeLog clean-go
+.PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go
 .PHONY: assert-no-store-file-names assert-binaries-available
 .PHONY: assert-final-inputs-self-contained
diff --git a/build-aux/generate-authors.scm b/build-aux/generate-authors.scm
new file mode 100644
index 0000000..1dc882f
--- /dev/null
+++ b/build-aux/generate-authors.scm
@@ -0,0 +1,120 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+;;;
+;;; Generate AUTHORS file for directory with the Guix git repository.
+;;;
+
+(use-modules
+ (ice-9 popen)
+ (ice-9 rdelim)
+ (ice-9 match)
+ (srfi srfi-1)
+ (guix config)
+ (guix utils)
+ (guix build utils))
+
+(define %guix-dir
+  (make-parameter #f))
+
+(define-syntax-rule (append-maybe init-lst (test add-lst) ...)
+  (let* ((lst init-lst)
+         (lst (if test
+                  (append lst add-lst)
+                  lst))
+         ...)
+    lst))
+
+(define (command-output cmd . args)
+  "Execute CMD with ARGS and return its output without trailing newspace."
+  (let* ((port (apply open-pipe* OPEN_READ cmd args))
+         (output (read-string port)))
+    (close-port port)
+    (string-trim-right output #\newline)))
+
+(define (git-output . args)
+  "Execute git command with ARGS and return its output without trailing
+newspace."
+  (with-directory-excursion (%guix-dir)
+    (apply command-output "git" args)))
+
+(define* (contributors-string #:optional (range "HEAD"))
+  "Return a string with names of people contributed to commit RANGE."
+  (git-output "shortlog" "--numbered" "--summary" "--email" range))
+
+(define* (tags #:key pattern sort)
+  "Return a list of the git repository tags.
+PATTERN is passed to '--list' and SORT is passed to '--sort' options of
+'git tag' command."
+  (let* ((args (append-maybe
+                '("tag")
+                (pattern (list "--list" pattern))
+                (sort    (list "--sort" sort))))
+         (output (apply git-output args)))
+    (string-split output #\newline)))
+
+(define (version-tags)
+  "Return only version tags (v0.8, etc.) sorted from the biggest version
+to the smallest one."
+  (tags #:pattern "v*"
+        #:sort "-version:refname"))
+
+(define (generate-authors-file file)
+  "Generate authors FILE."
+  (define previous-release-tag
+    (find (lambda (tag)
+            (version>? %guix-version
+                       (substring tag 1))) ; remove leading 'v'
+          (version-tags)))
+
+  (define release-range
+    (string-append previous-release-tag "..HEAD"))
+
+  (with-output-to-file file
+    (lambda ()
+      (display "\
+GNU Guix consists of Scheme code that implements the deployment model
+of the Nix package management tool.  In fact, it currently talks to a
+build daemon whose code comes from Nix (see the manual for details.)
+
+Nix was initially written by Eelco Dolstra; other people have been
+contributing to it.  See `nix/AUTHORS' for details.\n\n")
+      (format #t "Contributors to GNU Guix ~a:\n\n"
+              %guix-version)
+      (display (contributors-string release-range))
+      (newline) (newline)
+      (display "Overall contributors:\n\n")
+      (display (contributors-string))
+      (newline))))
+
+(define (show-help)
+  (match (command-line)
+    ((me _ ...)
+     (format #t "Usage: guile ~a DIRECTORY AUTHORS
+Generate AUTHORS file for DIRECTORY with the Guix git repository.\n"
+             me))))
+
+(match (command-line)
+  ((_ guix-dir authors-file)
+   (parameterize ((%guix-dir guix-dir))
+     (generate-authors-file authors-file)))
+  (_
+   (show-help)
+   (exit 1)))
+
+;;; generate-authors.scm ends here
-- 
2.4.3

Re: "/build-aux" in ".gitignore" (was [PATCH] build: Generate 'AUTHORS'.)

[Mathieu Lirzin]

Alex Kost <alezost@gmail.com> writes:

> Not related: I wonder is there a reason to ignore (in .gitignore) the
> whole "build-aux" directory?  IIUC this led to commit 8bc35f8, right?

As you have pointed out and to be more explicit about the context, the
commit 8bc35f8 was introduced because of a falsely ignored file from
"build-aux" directory, which should have be bundled with commit 9d3fb6c.

IMO in order to avoid such mistakes, only specific files in "build-aux"
dir should be added to ".gitignore".  I can send a patch to fix this (if
everybody is OK with the change of course).  :)

--
Mathieu Lirzin

Re: "/build-aux" in ".gitignore" (was [PATCH] build: Generate 'AUTHORS'.)

[Ludovic Courtès]

Mathieu Lirzin <mthl@openmailbox.org> skribis:

> Alex Kost <alezost@gmail.com> writes:
>
>> Not related: I wonder is there a reason to ignore (in .gitignore) the
>> whole "build-aux" directory?  IIUC this led to commit 8bc35f8, right?
>
> As you have pointed out and to be more explicit about the context, the
> commit 8bc35f8 was introduced because of a falsely ignored file from
> "build-aux" directory, which should have be bundled with commit 9d3fb6c.

Right.

> IMO in order to avoid such mistakes, only specific files in "build-aux"
> dir should be added to ".gitignore".  I can send a patch to fix this (if
> everybody is OK with the change of course).  :)

I would gladly accept that.  :-)

Thanks,
Ludo’.

[PATCH] Prevent Git from silently ignoring new files.

[Mathieu Lirzin]

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

ludo@gnu.org (Ludovic Courtès) writes:

>> only specific files in "build-aux" dir should be added to
>> ".gitignore".  I can send a patch to fix this [...]
>
> I would gladly accept that.  :-)

Here it is!

--
Mathieu Lirzin


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Prevent-Git-from-silently-ignoring-new-files.patch --]
[-- Type: text/x-diff, Size: 805 bytes --]

From 34987afe669a2c90161ef661356beac2198be071 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@openmailbox.org>
Date: Mon, 6 Jul 2015 10:47:22 +0200
Subject: [PATCH] Prevent Git from silently ignoring new files.

* .gitignore: Ignore only specific files instead of the whole
  'build-aux' directory.
---
 .gitignore | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index a0f19d7..c1061d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,16 @@
 *.go
 tmp
 *.log
-/build-aux
+/build-aux/compile
+/build-aux/config.guess
+/build-aux/config.rpath
+/build-aux/config.sub
+/build-aux/depcomp
+/build-aux/install-sh
+/build-aux/mdate-sh
+/build-aux/missing
+/build-aux/test-driver
+/build-aux/texinfo.tex
 /configure
 Makefile.in
 Makefile
-- 
2.1.4

Re: [PATCH] Prevent Git from silently ignoring new files.

[Ludovic Courtès]

Mathieu Lirzin <mthl@openmailbox.org> skribis:

> From 34987afe669a2c90161ef661356beac2198be071 Mon Sep 17 00:00:00 2001
> From: Mathieu Lirzin <mthl@openmailbox.org>
> Date: Mon, 6 Jul 2015 10:47:22 +0200
> Subject: [PATCH] Prevent Git from silently ignoring new files.
>
> * .gitignore: Ignore only specific files instead of the whole
>   'build-aux' directory.

OK, please push.

Ludo’.

Re: [PATCH] build: Generate 'AUTHORS'.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> From 3f8c6b024b3df310f2076ff897af8169d45005da Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> Date: Sat, 4 Jul 2015 12:27:26 +0300
> Subject: [PATCH] build: Generate 'AUTHORS'.
>
> * build-aux/generate-authors.scm: New file.
> * Makefile.am (gen-AUTHORS): New target.
>   (dist-hook, .PHONY): Add it.

Looks all right too me, please push.

Thanks!

Ludo’.

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 795 bytes --]

On Sun, Jun 28, 2015 at 10:43:23PM +0200, Ludovic Court??s wrote:
     
     
     I think we should consider generating ???AUTHORS??? upon ???make dist???
     eventually, ideally with a list of those who contributed to the last
     release, and then the list of all those who contributed at all.  Any
     takers?  :-)
     

I'm against.  

The measure of contribution of any one individual cannot be determined by
any parametric algorithm.  

Attempting to generate such a list might lead to people makeing trivial or
frivolous contributions in order to get their name in the list.

J'
     

-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Cyril Roelandt]

On 06/29/2015 09:35 PM, John Darrington wrote:
> The measure of contribution of any one individual cannot be determined by
> any parametric algorithm.  
> 

Right.

> Attempting to generate such a list might lead to people makeing trivial or
> frivolous contributions in order to get their name in the list.

Well, I don't think that will happen, or that it would be such an issue
:) Still, it feels nice to have your name included in THANKS/AUTHORS
because someone actually thought "damn, this developer does a lot of
work, how is their name not in AUTHORS ?". Having a make target adding
it is a bit "meh", imho.

Cyril.

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Ludovic Courtès]

John Darrington <john@darrington.wattle.id.au> skribis:

> The measure of contribution of any one individual cannot be determined by
> any parametric algorithm.  

‘THANKS’ definitely has to be maintained manually, for the reason you
give.  There are people who are helping in ways that do not involve Git
commits, and we want to acknowledge that.

‘AUTHORS’ is meant to list people who contributed code, so generating it
is fine IMO.

Ludo’.

Re: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

[Alex Kost]

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

After gathering some information about people, I updated this patch
(attached) to fix some names and emails.  I'm going to wait for a couple
of days before pushing it to let people check this info.


[-- Attachment #2: 0001-Clean-up-THANKS-and-AUTHORS.patch --]
[-- Type: text/x-patch, Size: 5691 bytes --]

From 0d0b74ec009dee0147a2bca2b314e9294e69c897 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Sat, 27 Jun 2015 20:42:32 +0300
Subject: [PATCH] Clean up 'THANKS' and 'AUTHORS'.

* THANKS: Add Konrad Hinsen, Cyprien Nicolas, Yakkala Yagnesh Raghava
  and Alexander Shendi.  Remove Federico Beffa, Marek Benc, John
  Darrington, rekado, Cyrill Schenkel and Andy Wingo because they are
  placed in AUTHORS.  Move Amirouche Boubekki and Alex Kost to ...
* AUTHORS: ... here.  Add Arne Babenhauserheide, Ian Denhardt, Kevin
  Lemonnier, Mathieu Lirzin, Pierre-Antoine Rault and Ben Woodcroft.
  Fix some names and emails.
---
 AUTHORS | 22 +++++++++++++++-------
 THANKS  | 14 +++++---------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 6eadb7f..d589242 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-GNU Guix is consists of Scheme code that implements the deployment model
+GNU Guix consists of Scheme code that implements the deployment model
 of the Nix package management tool.  In fact, it currently talks to a
 build daemon whose code comes from Nix (see the manual for details.)
 
@@ -8,14 +8,17 @@ contributing to it.  See `nix/AUTHORS' for details.
 The fine people listed below have contributed code to GNU Guix (in
 alphabetical order):
 
+           Arne Babenhauserheide <arne.babenhauserheide@kit.edu>
            Eric Bavier <bavier@member.fsf.org>
-  Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
+  Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
        Federico Beffa <beffa@fbengineering.ch>
           Marek Benc <merkur32@gmail.com>
+      Amirouche Boubekki <amirouche.boubekki@gmail.com>
             Sou Bunnbu (宋文武) <iyzsong@gmail.com>
-          Tomáš Čech <sleep_walker@suse.cz>
+          Tomáš Čech <sleep_walker@gnu.org>
         Ludovic Courtès <ludo@gnu.org>
            John Darrington <jmd@gnu.org>
+            Ian Denhardt <ian@zenhack.net>
         Andreas Enge <andreas@enge.fr>
          Alírio Eyng <alirioeyng@gmail.com>
    Alexander I. Grafov <grafov@gmail.com>
@@ -23,19 +26,24 @@ alphabetical order):
          Raimon Grau <raimonster@gmail.com>
           David Hashe <david.hashe@dhashe.com>
          Nikita Karetnikov <nikita@karetnikov.org>
+           Alex Kost <alezost@gmail.com>
+          Kevin Lemonnier <lemonnierk@ulrar.net>
          Julien Lepiller <julien@lepiller.eu>
+        Mathieu Lirzin <mthl@openmailbox.org>
         Aljosha Papsch <misc@rpapsch.de>
            Deck Pickard <deck.r.pickard@gmail.com>
         Manolis Ragkousis <manolis837@gmail.com>
+ Pierre-Antoine Rault <par@rigelk.eu>
           Cyril Roelandt <tipecaml@gmail.com>
            Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
          Cyrill Schenkel <cyrill.schenkel@gmail.com>
           Jason Self <j@jxself.org>
     Sree Harsha Totakura <sreeharsha@totakura.in>
-          David Thompson <dthompson2@worcester.edu>
+          David Thompson <davet@gnu.org>
           Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com>
-           Paul van der Walt <paul@denknerd.org>
-        Mark H. Weaver <mhw@netris.org>
+   Paul van der Walt <paul@denknerd.org>
+         Mark H Weaver <mhw@netris.org>
  Christopher A. Webber <cwebber@dustycloud.org>
            Andy Wingo <wingo@pobox.com>
-        Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
+            Ben Woodcroft <b.woodcroft@uq.edu.au>
+        Ricardo Wurmus <rekado@elephly.net>
diff --git a/THANKS b/THANKS
index 8093d8c..ce2e42d 100644
--- a/THANKS
+++ b/THANKS
@@ -7,38 +7,34 @@ suggestions, bug reports, patches, internationalization, or general
 infrastructure help:
 
 	    Lluís Batlle i Rossell <viric@viric.name>
-         Federico Beffa <beffa@ieee.org>
-            Marek Benc <merkur32@gmail.com>
           Sylvain Beucler <beuc@beuc.net>
-        Amirouche Boubekki <amirouche.boubekki@gmail.com>
 	   Carlos Carleos <carleos@uniovi.es>
 	   Felipe Castro <fefcas@gmail.com>
 	   Daniel Clark <dclark@pobox.com>
 	Alexandru Cojocaru <xojoc@gmx.com>
 	    Aleix Conchillo Flaqué <aconchillo@gmail.com>
-	     John Darrington <jmd@gnu.org>
 	   Rafael Ferreira <rafael.f.f1@gmail.com>
 	Christian Grothoff <christian@grothoff.org>
+           Konrad Hinsen <konrad.hinsen@fastmail.net>
           Brandon Invergo <brandon@gnu.org>
 	  Jeffrin Jose <ahiliation@yahoo.co.in>
-	     Kete <kete@ninthfloor.org>
+	          Kete <kete@ninthfloor.org>
            Daniel Kochmański <dkochmanski@hellsgate.pl>
-             Alex Kost <alezost@gmail.com>
 	  Matthew Lien <bluet@bluet.org>
 	    Niels Möller <nisse@lysator.liu.se>
+          Cyprien Nicolas <cyprien@nicolas.tf>
 	   Yutaka Niibe <gniibe@fsij.org>
            Andrei Osipov <andrspv@gmail.com>
              Adam Pribyl <pribyl@lowlevel.cz>
             Pjotr Prins <pjotr.public12@thebird.nl>
-                  rekado <rekado@elephly.net>
+  Yakkala Yagnesh Raghava <hi@yagnesh.org>
            Joshua Randall <jcrandall@alum.mit.edu>
       Bruno Félix Rezende Ribeiro <oitofelix@gnu.org>
-	   Cyrill Schenkel <cyrill.schenkel@gmail.com>
 	    Benno Schulenberg <coordinator@translationproject.org>
            Thomas Schwinge <thomas@codesourcery.com>
+        Alexander Shendi <Alexander.Shendi@web.de>
 	     Alen Skondro <askondro@gmail.com>
 	 Matthias Wachs <wachs@net.in.tum.de>
-             Andy Wingo <wingo@pobox.com>
            Philip Woods <elzairthesorcerer@gmail.com>
 
 GNU Guix also includes non-software works.  Thanks to the following
-- 
2.4.3