Merge branch 'master' into pylons0.10

* master:
  add support for GPG key lookup finger command and HTTP URL

ddportfolioservice/controllers/ddportfolio.py

@@ -104,6 +104,8 @@ developer name on all bug logs)'),
             'links' : N_('links'),
             'website' : N_('Debian website'),
             'search' : N_('Debian search'),
+            'gpgfinger' : N_('GPG public key via finger'),
+            'gpgweb' : N_('GPG public key via HTTP'),
             },
         'ssh' : {
             'label' : N_('Information reachable via ssh (for DDs)'),

ddportfolioservice/i18n/ddportfolioservice.pot

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ddportfolioservice 0.2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-06-12 00:22+0200\n"
+"POT-Creation-Date: 2010-06-12 00:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -190,29 +190,37 @@ msgstr ""
 msgid "Debian search"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:109
+#: ddportfolioservice/controllers/ddportfolio.py:107
-msgid "Information reachable via ssh (for DDs)"
+msgid "GPG public key via finger"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:110
+#: ddportfolioservice/controllers/ddportfolio.py:108
-msgid "owned debian.net domains"
+msgid "GPG public key via HTTP"
 msgstr ""
 
 #: ddportfolioservice/controllers/ddportfolio.py:111
+msgid "Information reachable via ssh (for DDs)"
+msgstr ""
+
+#: ddportfolioservice/controllers/ddportfolio.py:112
+msgid "owned debian.net domains"
+msgstr ""
+
+#: ddportfolioservice/controllers/ddportfolio.py:113
 msgid ""
 "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
 "information"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:112
+#: ddportfolioservice/controllers/ddportfolio.py:114
 msgid "Group membership information"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:115
+#: ddportfolioservice/controllers/ddportfolio.py:117
 msgid "Ubuntu"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:116
+#: ddportfolioservice/controllers/ddportfolio.py:118
 msgid "Available patches from Ubuntu"
 msgstr ""
 

ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po

@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: ddportfolioservice 0.2\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
 "POT-Creation-Date: 2009-01-20 23:13+0100\n"
-"PO-Revision-Date: 2010-06-12 00:23+0200\n"
+"PO-Revision-Date: 2010-06-12 00:53+0200\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language-Team: de <de@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -202,15 +202,23 @@ msgstr "Debian Webseite"
 msgid "Debian search"
 msgstr "Debian-Suche"
 
-#: ddportfolioservice/controllers/ddportfolio.py:109
+#: ddportfolioservice/controllers/ddportfolio.py:107
+msgid "GPG public key via finger"
+msgstr "öffentlicher GPG-Schlüssel per finger"
+
+#: ddportfolioservice/controllers/ddportfolio.py:108
+msgid "GPG public key via HTTP"
+msgstr "öffentlicher GPG-Schlüssel per HTTP"
+
+#: ddportfolioservice/controllers/ddportfolio.py:111
 msgid "Information reachable via ssh (for DDs)"
 msgstr "Per ssh erreichbare Informationen (für DDs)"
 
-#: ddportfolioservice/controllers/ddportfolio.py:110
+#: ddportfolioservice/controllers/ddportfolio.py:112
 msgid "owned debian.net domains"
 msgstr "Besitz von debian.net-Domains"
 
-#: ddportfolioservice/controllers/ddportfolio.py:111
+#: ddportfolioservice/controllers/ddportfolio.py:113
 msgid ""
 "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database"
 " information"
@@ -218,15 +226,15 @@ msgstr ""
 "Informationen in der <a "
 "href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"
 
-#: ddportfolioservice/controllers/ddportfolio.py:112
+#: ddportfolioservice/controllers/ddportfolio.py:114
 msgid "Group membership information"
 msgstr "Information über Gruppenmitgliedschaften"
 
-#: ddportfolioservice/controllers/ddportfolio.py:115
+#: ddportfolioservice/controllers/ddportfolio.py:117
 msgid "Ubuntu"
 msgstr "Ubuntu"
 
-#: ddportfolioservice/controllers/ddportfolio.py:116
+#: ddportfolioservice/controllers/ddportfolio.py:118
 msgid "Available patches from Ubuntu"
 msgstr "Verfügbare Patches aus Ubuntu"
 

ddportfolioservice/model/ddportfolio.ini

@@ -86,11 +86,16 @@ forum.pattern=http://forums.debian.net/memberlist.php?mode=viewprofile&u=%(forum
 forum.optional=true
 
 [miscellaneous]
-urls=debtags,links,website,search
+urls=debtags,links,website,search,gpgfinger,gpgweb
 debtags.pattern=http://debtags.alioth.debian.org/todo.html?maint=%(email)s
 links.pattern=http://www.google.com/search?hl=en&lr=&q=site%%3Adebian.org+%%22%(name)s%%22+-site%%3Anm.debian.org+-site%%3Alintian.debian.org+-site%%3Abugs.debian.org+-site%%3Alists.debian.org+-site%%3Apackages.debian.org+-site%%3Alists.alioth.debian.org+-site%%3Aftp.debian.org++-site%%3Apackages.qa.debian.org++-site%%3Aftp*.*.debian.org+-inurl%%3Adebian.org%%2Fdevel%%2Fpeople.+-inurl%%3Aindices%%2FMaintainers+-inurl%%3Adebian.org%%2Fdebian%%2Fproject++-inurl%%3A%%2Fdists%%2F&btnG=Search
 website.pattern=http://www.google.com/search?q=site:www.debian.org+%(name)s
 search.pattern=http://search.debian.org/?q=%%22%(name)s%%22
+gpgfinger.pattern=finger %(username)s/key@db.debian.org
+gpgfinger.type=finger
+gpgfinger.optional=true
+gpgweb.pattern=http://db.debian.org/fetchkey.cgi?fingerprint=%(gpgfp)s
+gpgweb.optional=true
 
 [ssh]
 # SSH functions