Update list of maintainers

Fixes https://gitlab.gnome.org/GNOME/tracker/issues/118

2 files changed, 29 insertions, 44 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index be93a10cb..1198a4e0a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,30 +1,7 @@
-Martyn Russell
-E-mail: martyn@lanedo.com
-Userid: mr
-
-Jürg Billeter
-E-mail: juerg.billeter@codethink.co.uk
-Userid: juergbi
-
-Philip Van Hoof
-E-mail: philip@codeminded.be
-Userid: pvanhoof
-
 Carlos Garnacho
 E-mail: carlos@lanedo.com
 Userid: carlosg
 
-Mikael Ottela
-E-mail: mikael.ottela@ixonos.com
-Userid: mottela
-
-Aleksander Morgado
-E-mail: aleksander@lanedo.com
-Userid: aleksm
-
-Ivan Frade
-E-mail: ivan.frade@nokia.com
-Userid: ifrade
-
-
-
+Sam Thursfield
+E-mail: sam@afuera.me.uk
+Userid: sthursfield
diff --git a/tracker.doap b/tracker.doap
index 3c27b7432..945e9518c 100644
--- a/tracker.doap
+++ b/tracker.doap
@@ -24,66 +24,74 @@ mixing contacts with files, locations, activities and etc.).</description>
 
   <maintainer>
     <foaf:Person>
-      <foaf:name>Aleksander Morgado</foaf:name>
-      <foaf:mbox rdf:resource="mailto:aleksander@aleksander.es" />
-      <gnome:userid>aleksm</gnome:userid>
+      <foaf:name>Carlos Garnacho</foaf:name>
+      <foaf:mbox rdf:resource="mailto:carlosg@gnome.org" />
+      <gnome:userid>carlosg</gnome:userid>
     </foaf:Person>
   </maintainer>
 
   <maintainer>
     <foaf:Person>
-      <foaf:name>Carlos Garnacho</foaf:name>
-      <foaf:mbox rdf:resource="mailto:carlosg@gnome.org" />
-      <gnome:userid>carlosg</gnome:userid>
+      <foaf:name>Sam Thursfield</foaf:name>
+      <foaf:mbox rdf:resource="mailto:sam@afuera.me.uk" />
+      <gnome:userid>sthursfield</gnome:userid>
     </foaf:Person>
   </maintainer>
 
-  <maintainer>
+  <author>
+    <foaf:Person>
+      <foaf:name>Aleksander Morgado</foaf:name>
+      <foaf:mbox rdf:resource="mailto:aleksander@aleksander.es" />
+      <gnome:userid>aleksm</gnome:userid>
+    </foaf:Person>
+  </author>
+
+  <author>
     <foaf:Person>
       <foaf:name>Ivan Frade</foaf:name>
       <foaf:mbox rdf:resource="mailto:ifrade@gnome.org" />
       <gnome:userid>ifrade</gnome:userid>
     </foaf:Person>
-  </maintainer>
+  </author>
 
-  <maintainer>
+  <author>
     <foaf:Person>
       <foaf:name>Jamie McCracken</foaf:name>
       <foaf:mbox rdf:resource="mailto:jamie.mccrack@gmail.com" />
       <gnome:userid>jamiemcc</gnome:userid>
     </foaf:Person>
-  </maintainer>
+  </author>
 
-  <maintainer>
+  <author>
     <foaf:Person>
       <foaf:name>Jürg Billeter</foaf:name>
       <foaf:mbox rdf:resource="mailto:j@bitron.ch" />
       <gnome:userid>juergbi</gnome:userid>
     </foaf:Person>
-  </maintainer>
+  </author>
 
-  <maintainer>
+  <author>
     <foaf:Person>
       <foaf:name>Martyn Russell</foaf:name>
       <foaf:mbox rdf:resource="mailto:martyn@lanedo.com" />
       <gnome:userid>mr</gnome:userid>
     </foaf:Person>
-  </maintainer>
+  </author>
 
-  <maintainer>
+  <author>
     <foaf:Person>
       <foaf:name>Mikael Ottela</foaf:name>
       <foaf:mbox rdf:resource="mailto:mikael.ottela@ixonos.com" />
       <gnome:userid>mottela</gnome:userid>
     </foaf:Person>
-  </maintainer>
+  </author>
 
-  <maintainer>
+  <author>
     <foaf:Person>
       <foaf:name>Philip Van Hoof</foaf:name>
       <foaf:mbox rdf:resource="mailto:pvanhoof@gnome.org" />
       <gnome:userid>pvanhoof</gnome:userid>
     </foaf:Person>
-  </maintainer>
+  </author>
 
 </Project>