Package: www.debian.org Hi,
Please find attached a patch that: - replace "delegation mail" with "appointment mail" for the secretary - adds a few missing delegations: + DM keyring team + GSOC 2013 - add a pointer to the delegation mail for the Keyring team. - add (delegate) next to names of delegates. Thanks, Lucas
? about.en.html ? cn.en.html ? cooperation.en.html ? diversity.en.html ? free.en.html ? help.en.html ? index.en.html ? license_disc.en.html ? organization.data.diff ? organization.en.html ? search.en.html ? why_debian.en.html Index: organization.data =================================================================== RCS file: /cvs/webwml/webwml/english/intro/organization.data,v retrieving revision 1.461 diff -u -r1.461 organization.data --- organization.data 23 May 2013 19:44:06 -0000 1.461 +++ organization.data 24 May 2013 12:48:51 -0000 @@ -11,6 +11,8 @@ <define-tag job><li>%attributes —</define-tag> <define-tag genericemail><<a href="mailto:%0">%0</a>></define-tag> <define-tag delegationmail>— <a href="http://lists.debian.org/%0";><gettext domain="organization">delegation mail</gettext></a></define-tag> +<define-tag appointmentmail>— <a href="http://lists.debian.org/%0";><gettext domain="organization">appointment mail</gettext></a></define-tag> +<define-tag delegate> (<gettext domain="organization">delegate</gettext>)</define-tag> # current* is only for positions necessarily transitional, such as the leader <define-tag current><br> <spaces><em><gettext domain="organization">current</gettext></em> </define-tag> @@ -65,7 +67,7 @@ <member>Ian Jackson <member>Steve Langasek <member>Colin Watson - <job <a href="$(HOME)/devel/secretary"><gettext domain="organization">Secretary</gettext></a>> <genericemail secret...@debian.org> <delegationmail 20130208193756.ga30...@upsilon.cc> + <job <a href="$(HOME)/devel/secretary"><gettext domain="organization">Secretary</gettext></a>> <genericemail secret...@debian.org> <appointmentmail 20130208193756.ga30...@upsilon.cc> <current>Kurt Roeckx <assistant>Neil McGovern </ul> @@ -78,9 +80,9 @@ <job <a href="http://ftp-master.debian.org/";><gettext domain="organization">FTP Archives</gettext></a>> <genericemail ftpmas...@debian.org> <delegationmail 20121017091648.ga32...@upsilon.cc> <ul> <job <gettext domain="organization">FTP Masters</gettext>> - <member>Ansgar Burchardt - <member>Joerg Jaspert - <member>Mark Hymers + <member>Ansgar Burchardt <delegate> + <member>Joerg Jaspert <delegate> + <member>Mark Hymers <delegate> <job <gettext domain="organization">FTP Assistants</gettext>> <member>Mike O'Connor <member>Alexander Reichle-Schmehl @@ -91,8 +93,8 @@ <job <a href="http://backports-master.debian.org/";><gettext domain="organization">Backports</gettext></a>> <genericemail t...@backports.debian.org> <delegationmail 20110706145100.ga13...@upsilon.cc> <ul> <job <gettext domain="organization">Backports Team</gettext>> - <member>Alexander Wirt - <member>Gerfried Fuchs + <member>Alexander Wirt<delegate> + <member>Gerfried Fuchs<delegate> </ul> <job <a href="$(HOME)/devel/people"><gettext domain="organization">Individual Packages</gettext></a>> <var><packagename></var>@packages.debian.org <job <a href="http://release.debian.org/";><gettext domain="organization">Release Management</gettext></a>> <genericemail debian-rele...@lists.debian.org> @@ -215,9 +217,9 @@ <ul> <job <gettext domain="organization">Press Contact</gettext>> <genericemail pr...@debian.org> <delegationmail 20120321153254.ga6...@upsilon.cc> - <member>Francesca Ciceri - <member>Martin Schulze - <member>Neil McGovern + <member>Francesca Ciceri<delegate> + <member>Martin Schulze<delegate> + <member>Neil McGovern<delegate> <assistant>Paul Wise <assistant>Moray Allan <assistant>Kai Wasserbäch @@ -238,8 +240,8 @@ <member>Marcelo Santana <member>Martin Schulze <job <a href="http://bits.debian.org/";><gettext domain="organization">Bits from Debian</gettext></a>> <genericemail debian-public...@lists.debian.org> <delegationmail 20130520093925.gb5...@xanadu.blop.info> - <member>Francesca Ciceri - <member>Ana Beatriz Guerrero López + <member>Francesca Ciceri<delegate> + <member>Ana Beatriz Guerrero López<delegate> </ul> <a name="support"></a> @@ -327,17 +329,21 @@ <current>Martin Zobel-Helas <current>Pascal Hakim <job <a href="$(HOME)/devel/join/newmaint#FrontDesk"><gettext domain="organization">New Members Front Desk</gettext></a>> <genericemail n...@debian.org> <delegationmail 20121017091656.gb32...@upsilon.cc> - <member>Bernd Zeimetz - <member>Enrico Zini - <member>Jan Hauke Rahm - <member>Jonathan Wiltshire + <member>Bernd Zeimetz<delegate> + <member>Enrico Zini<delegate> + <member>Jan Hauke Rahm<delegate> + <member>Jonathan Wiltshire<delegate> <job <a href="$(HOME)/devel/join/newmaint#DAM"><gettext domain="organization">Debian Account Managers</gettext></a>> <genericemail da-mana...@debian.org> <delegationmail 20101019212322.ga6...@upsilon.cc> - <member>Joerg Jaspert - <member>Christoph Berg - <member>Enrico Zini - <job <a href="http://keyring.debian.org/";><gettext domain="organization">Keyring Maintainers (PGP and GPG)</gettext></a>> <genericemail keyring-ma...@debian.org> - <member>Jonathan McDowell + <member>Joerg Jaspert<delegate> + <member>Christoph Berg<delegate> + <member>Enrico Zini<delegate> + <job <a href="http://keyring.debian.org/";><gettext domain="organization">Keyring Maintainers (PGP and GPG)</gettext></a>> <genericemail keyring-ma...@debian.org> <delegationmail 20080515012327.gi23...@einval.com> + <member>Jonathan McDowell<delegate> <member>Gunnar Wolf + <job <a href="http://wiki.debian.org/DebianMaintainer";><gettext domain="organization">Debian Maintainer (DM) Keyring Maintainers</gettext></a>> <genericemail debian-newma...@lists.debian.org> <delegationmail 20071118163748.ga13...@zoy.org> + <member>Anibal Monsalve Salazar<delegate > + <member>Anthony Towns<delegate > + <member>Joey Hess<delegate > <job <a href="$(HOME)/security/"><gettext domain="organization">Security Team</gettext></a>> <genericemail t...@security.debian.org> <member>Aurelien Jarno <member>Dann Frazier @@ -390,18 +396,18 @@ <member>Joerg Jaspert <member>Jordi Mallach <job <a href="$(DOC)/debian-policy/"><gettext domain="organization">Policy</gettext></a>> <genericemail debian-pol...@lists.debian.org> <delegationmail 20121017195148.ga26...@upsilon.cc> - <member>Andreas Barth - <member>Bill Allombert - <member>Charles Plessy - <member>Russ Allbery + <member>Andreas Barth<delegate> + <member>Bill Allombert<delegate> + <member>Charles Plessy<delegate> + <member>Russ Allbery<delegate> <job <a href="http://dsa.debian.org/";><gettext domain="organization">System Administration</gettext></a>> <genericemail debian-ad...@lists.debian.org> <delegationmail 20111017111338.ga5...@upsilon.cc> <note <gettext domain="organization">This is the address to use when encountering problems on one of Debian's machines, including password problems or you need a package installed.</gettext>> - <member>Luca Filipozzi - <member>Tollef Fog Heen - <member>Stephen Gran - <member>Faidon Liambotis - <member>Peter Palfrader - <member>Martin Zobel-Helas + <member>Luca Filipozzi<delegate> + <member>Tollef Fog Heen<delegate> + <member>Stephen Gran<delegate> + <member>Faidon Liambotis<delegate> + <member>Peter Palfrader<delegate> + <member>Martin Zobel-Helas<delegate> <note <gettext domain="organization">If you have hardware problems with Debian machines, please see <a href="http://db.debian.org/machines.cgi";>Debian Machines</a> page, it should contain per-machine administrator information.</gettext>> <job <a href="http://db.debian.org/";><gettext domain="organization">LDAP Developer Directory Administrator</gettext></a>> <genericemail ad...@db.debian.org> <job <a href="$(HOME)/mirror/"><gettext domain="organization">Mirrors</gettext></a>> <genericemail mirr...@debian.org> @@ -418,7 +424,7 @@ <member>Benjamin Mako Hill <member>Rob Bradford <job <a href="http://wiki.debian.org/Teams/Auditor";><gettext domain="organization">Auditor</gettext></a>> <genericemail audi...@debian.org> <delegationmail 20101009140120.ga26...@upsilon.cc> - <member>Martin Michlmayr + <member>Martin Michlmayr<delegate> <member>Martin Wuertele <job <gettext domain="organization"><a href="m4_HOME/trademark">Trademark</a> use requests</gettext>> <genericemail tradem...@debian.org> <member><em><gettext domain="organization">current Debian Project Leader</gettext></em> @@ -437,9 +443,12 @@ <member>Margarita Manterola <member>Meike Reichle <job <a href="http://www.debconf.org/";><gettext domain="organization">DebConf chairs</gettext></a>> <genericemail debconf-cha...@debian.org> <delegationmail 20110309091510.ga22...@upsilon.cc> - <member>Holger Levsen - <member>Moray Allan - <member>Gunnar Wolf + <member>Holger Levsen<delegate> + <member>Moray Allan<delegate> + <member>Gunnar Wolf<delegate> + <job <a href="http://wiki.debian.org/SummerOfCode2013";><gettext domain="organization">Summer of Code 2013 Administrators</gettext></a>> <genericemail soc-coordinat...@lists.alioth.debian.org> <delegationmail 20130218080807.gd3...@upsilon.cc> + <member>David Bremner<delegate> + <member>Paul Tagliamonte<delegate> </ul>
