From 7c7b5ea656b33f4f3c18f3899773ea4fad29263b Mon Sep 17 00:00:00 2001
From: Michael Gmelin <grembo@FreeBSD.org>
Date: Tue, 21 Jan 2014 13:26:26 +0000
Subject: [PATCH] Add grembo as a ports committer.
Approved by: flo (mentor)
---
.../contributors/contrib.additional.xml | 5 --
.../contributors/contrib.committers.xml | 4 ++
share/pgpkeys/grembo.key | 51 +++++++++++++++++++
share/pgpkeys/pgpkeys.ent | 1 +
share/xml/authors.ent | 3 ++
share/xml/news.xml | 8 +++
6 files changed, 67 insertions(+), 5 deletions(-)
create mode 100644 share/pgpkeys/grembo.key
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
index 244975144c..d52a4b2dab 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
@@ -6802,11 +6802,6 @@
<email>nerd@percival.rain.com</email></para>
</listitem>
- <listitem>
- <para>Michael Gmelin
- <email>freebsd@grem.de</email></para>
- </listitem>
-
<listitem>
<para>Michael Hancock
<email>michaelh@cet.co.jp</email></para>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 8792b76e97..35f03c8517 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -414,6 +414,10 @@
<para>&a.girgen.email;</para>
</listitem>
+ <listitem>
+ <para>&a.grembo.email;</para>
+ </listitem>
+
<listitem>
<para>&a.pgollucci.email;</para>
</listitem>
diff --git a/share/pgpkeys/grembo.key b/share/pgpkeys/grembo.key
new file mode 100644
index 0000000000..9192aed9c9
--- /dev/null
+++ b/share/pgpkeys/grembo.key
@@ -0,0 +1,51 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh grembo 6897F8C16BFAFF9F ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub 2048R/6897F8C16BFAFF9F 2014-01-20 [expires: 2017-01-19]
+ Key fingerprint = E842 4082 12D2 767A E29E FCA4 6897 F8C1 6BFA FF9F
+uid Michael Gmelin <grembo@freebsd.org>
+uid Michael Gmelin <freebsd@grem.de>
+sub 2048R/9A052F3BB4E23160 2014-01-20 [expires: 2017-01-19]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+vNELuqX+aHKSS6vEwwwZ
+=A9V4
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index f0a981e8eb..edb9dde9e1 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -162,6 +162,7 @@
<!ENTITY pgpkey.gordon SYSTEM "gordon.key">
<!ENTITY pgpkey.green SYSTEM "green.key">
<!ENTITY pgpkey.grehan SYSTEM "grehan.key">
+<!ENTITY pgpkey.grembo SYSTEM "grembo.key">
<!ENTITY pgpkey.gshapiro SYSTEM "gshapiro.key">
<!ENTITY pgpkey.gsutter SYSTEM "gsutter.key">
<!ENTITY pgpkey.guido SYSTEM "guido.key">
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index c3564d1cf3..d805f6f5e0 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -798,6 +798,9 @@
<!ENTITY a.greid "George C. A. Reid">
<!ENTITY a.greid.email "&a.greid; <email xmlns='http://docbook.org/ns/docbook'>greid@FreeBSD.org</email>">
+<!ENTITY a.grembo "Michael Gmelin">
+<!ENTITY a.grembo.email "&a.grembo; <email xmlns='http://docbook.org/ns/docbook'>grembo@FreeBSD.org</email>">
+
<!ENTITY a.grog "Greg Lehey">
<!ENTITY a.grog.email "&a.grog; <email xmlns='http://docbook.org/ns/docbook'>grog@FreeBSD.org</email>">
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 9c68bfb05d..4bc0a248dc 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -33,6 +33,14 @@
<month>
<name>1</name>
+ <day>
+ <name>21</name>
+ <p>New committer:
+ <a href="mailto:grembo@FreeBSD.org">Michael Gmelin</a> (ports)</p>
+ <event>
+ </event>
+ </day>
+
<day>
<name>20</name>