From 3297f41aaa8aceff2bd9be5cbc2525e1c2c25032 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Mon, 26 Mar 2012 17:59:23 +0200
Subject: [PATCH] remove keylog URL (no replacement available)

---
 ddportfolioservice/controllers/ddportfolio.py |   5 --
 .../i18n/ddportfolioservice.pot               |  70 ++++++++----------
 .../i18n/de/LC_MESSAGES/ddportfolioservice.mo | Bin 7050 -> 6882 bytes
 .../i18n/de/LC_MESSAGES/ddportfolioservice.po |  70 ++++++++----------
 ddportfolioservice/model/ddportfolio.ini      |   7 +-
 5 files changed, 60 insertions(+), 92 deletions(-)

diff --git a/ddportfolioservice/controllers/ddportfolio.py b/ddportfolioservice/controllers/ddportfolio.py
index ef30451..4063f87 100644
--- a/ddportfolioservice/controllers/ddportfolio.py
+++ b/ddportfolioservice/controllers/ddportfolio.py
@@ -71,11 +71,6 @@ developer name on all bug logs)'),
             'piuparts': N_('piuparts'),
             'patchtracker': N_('Debian patch tracking system'),
             },
-        'upload': {
-            'label': N_('Upload'),
-            'keylog': N_('''keylog (per-key upload list)
-(note: uses key fingerprint)'''),
-            },
         'lists': {
             'label': N_('Mailing Lists'),
             'dolists': N_('lists.d.o'),
diff --git a/ddportfolioservice/i18n/ddportfolioservice.pot b/ddportfolioservice/i18n/ddportfolioservice.pot
index ff0cf77..8d56957 100644
--- a/ddportfolioservice/i18n/ddportfolioservice.pot
+++ b/ddportfolioservice/i18n/ddportfolioservice.pot
@@ -7,9 +7,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ddportfolioservice 0.2.5\n"
+"Project-Id-Version: ddportfolioservice 0.2.6\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-03-24 22:06+0100\n"
+"POT-Creation-Date: 2012-03-26 17:56+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"
@@ -100,127 +100,117 @@ msgid "Debian patch tracking system"
 msgstr ""
 
 #: ddportfolioservice/controllers/ddportfolio.py:75
-msgid "Upload"
-msgstr ""
-
-#: ddportfolioservice/controllers/ddportfolio.py:76
-msgid ""
-"keylog (per-key upload list)\n"
-"(note: uses key fingerprint)"
-msgstr ""
-
-#: ddportfolioservice/controllers/ddportfolio.py:80
 msgid "Mailing Lists"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:81
+#: ddportfolioservice/controllers/ddportfolio.py:76
 msgid "lists.d.o"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:82
+#: ddportfolioservice/controllers/ddportfolio.py:77
 msgid "lists.a.d.o"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:83
+#: ddportfolioservice/controllers/ddportfolio.py:78
 msgid "gmane"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:86
+#: ddportfolioservice/controllers/ddportfolio.py:81
 msgid "Files"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:87
+#: ddportfolioservice/controllers/ddportfolio.py:82
 msgid "people.d.o"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:88
+#: ddportfolioservice/controllers/ddportfolio.py:83
 msgid "oldpeople"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:89
-#: ddportfolioservice/controllers/ddportfolio.py:96
+#: ddportfolioservice/controllers/ddportfolio.py:84
+#: ddportfolioservice/controllers/ddportfolio.py:91
 msgid "Alioth"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:92
+#: ddportfolioservice/controllers/ddportfolio.py:87
 msgid "Membership"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:93
+#: ddportfolioservice/controllers/ddportfolio.py:88
 msgid "NM"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:94
+#: ddportfolioservice/controllers/ddportfolio.py:89
 msgid "DB information via finger"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:95
+#: ddportfolioservice/controllers/ddportfolio.py:90
 msgid "DB information via HTTP"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:97
+#: ddportfolioservice/controllers/ddportfolio.py:92
 msgid "Wiki"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:98
+#: ddportfolioservice/controllers/ddportfolio.py:93
 msgid "Forum"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:101
+#: ddportfolioservice/controllers/ddportfolio.py:96
 msgid "Miscellaneous"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:102
+#: ddportfolioservice/controllers/ddportfolio.py:97
 msgid "debtags"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:103
+#: ddportfolioservice/controllers/ddportfolio.py:98
 msgid "links"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:104
+#: ddportfolioservice/controllers/ddportfolio.py:99
 msgid "Debian website"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:105
+#: ddportfolioservice/controllers/ddportfolio.py:100
 msgid "Debian search"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:106
+#: ddportfolioservice/controllers/ddportfolio.py:101
 msgid "GPG public key via finger"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:107
+#: ddportfolioservice/controllers/ddportfolio.py:102
 msgid "GPG public key via HTTP"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:108
+#: ddportfolioservice/controllers/ddportfolio.py:103
 msgid "NM, AM participation"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:111
+#: ddportfolioservice/controllers/ddportfolio.py:106
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:112
+#: ddportfolioservice/controllers/ddportfolio.py:107
 msgid "owned debian.net domains"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:113
+#: ddportfolioservice/controllers/ddportfolio.py:108
 msgid ""
 "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
 "information"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:115
+#: ddportfolioservice/controllers/ddportfolio.py:110
 msgid "Group membership information"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:118
+#: ddportfolioservice/controllers/ddportfolio.py:113
 msgid "Ubuntu"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:119
+#: ddportfolioservice/controllers/ddportfolio.py:114
 msgid "Available patches from Ubuntu"
 msgstr ""
 
diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
index b7b03e089229d9466ecbb383cc6ec0a5c8dc0816..7695ee0eeb59593ad28b313e393e222421c90b2d 100644
GIT binary patch
delta 1384
zcmYMzPe@cz6vy#1lhdfFqc-WNrDA_nQYpj6KLr&LB}8RVEsE^VW{jd-w8-eCn2QP{
z#-L_VO3|XClqo@oh%zXUB6MM7f2crcQLEah)%WK-XwdoG`{uoS&OPV8^WiTw&d2Pe
zE5>IB{|ouQ<<;!}r^07e#k3N4;$945KhDJ$n295pg&%Mc{=_6q=O%`hjU^buYHYw<
zGsliG$m2p6&cois4|WfWm=9wye#3R>^CuGBgz3x=p%OTON}vNXu*d!VraK=%t@jl3
z@iY2}Z&R}aGf#5jK|cn#AqTbaG9*(AqY~YQs#FBE!!Fd0F1Yh2sKlOQD!z5+6Q~5g
zql!F@LE_tA23jbXk|<RkhL{(j0@k8-)P&q>2T%*OAi3LVR7*N>++%hPld+X@&f$7n
zTB21Bsuf+Rco)&pPA@Z<kA1iqA7KanLG7fSFYV+K=3opJcmNx42(|Dp*C|&IS!;bi
zs<pXDZnoI9GK2c7Ct)sV$GcI1j-z(k=HA$eF?Q6ARa`HpFZ*y0F2F(Lc-RPPBcrH_
zOkyEUyT2DuHYHkuORy}9`m1+axu8;?#R80>G9E<r`Wfo<enLIy%{E()rC5#;q*xY3
zCD4mX;3294uaKhHJ7f<wiKY14VW8Kgkf&7AHK+_XqITAZ#I$DQR%^wjcn-C|T~q?2
zsGiPXJ$i|*`C3%q4XD7|Q7zby{FxKsTc`01Do{J>!6+(`tEkuIy6X^Xp)pjez9KR0
z2dV;IvR1_cl7%ZUht_T371CjBrq62CVdQzojxbQblc*iGp<2+5O?U_Ua0Zp&4f>?O
z1E|;XF{*N7*oYIT#7oIqR=Tc2j)B#oTHA;z7B<^8J0LUEX>LKa<TfhMFzPVAL6vSC
xE&4jMIDXVu?~mV4JLQQV%qa7ut}b2~uCJ+EzM?wb6R1szkA_})qVMw``~!GyfyV#<

delta 1543
zcmYMzduWYu9LMqRVY4}AW7wTNX3Gvu92<71QPOfPmncnf_UvNE**a%4YIR(T6+%j`
zxh+|QNt8b<DdZ3GkD|HzONpf9`u=QBIc?|l`~9Bt{C?ld^SrI-oSEp$OgdtGR`6fI
z|BXSK{r@aZHk-n93F<c;I2xbe5d456@Dq;2-#8XCxR``x$dU!I2xnms*J8F=!uB)B
zWuXg);oX4?_81G9zefj?Qq1OJ2`bP!9F99t0USgHa2C_?hIjp*H-C!S?=|M3r7Ez5
zS$_Y(Y&`15iI{;iP#Z5mBDK}1K$}qk>_uhRh03VgoA;ptdxw7f;>~}d0`w0xQ;`dB
zH0N6(18r1}Dpe)sU=`}XHK@R1$R4&GwNWRMjGaKW<UBt2ncc=zJVZGMvwl2npjD?m
zyHMv`#)J;;VW5m};V687)%X&3U<v6cql<hgqnnt8y{G`5<7|A5+PHvdWf4|lsW;z%
zI;R2E>MiNipI~hl3vxfIM@LZ=xP?0KDJt`qsNa3SV`TUlr!eoNPc?WO$6z+);jytY
zR6^yb3RUActnsdQjHLdGbSDeNxEIySE2z@H!F>FQia0xSp!X9{PxD;VePNu3doX~H
zkmA`lQ~*A{6u=l%1tuZIvQUBnNmw;b#MP+RN9!u>NmPIrP?>cju~;v%w>`rW{D`_g
zjZ+jrIjXhmFoa=mehPK)In=p{YYbG<yU3qC;!98GE7U=6Q5$_j1@Z&+`uz3GBPwlF
zfoj!!Bo<qSsz4a^wzNn#-iKMV?h>yQ4`;%9X|#HE-}5nQqi3jt`%sy_L$%^NF2_vz
za|T^hpeaP9`*KmQYcZ;Vb8sQfM<sB;^9WYiN?s3d;RWh_e}n4vS5#&Gc&2i?p7Kmo
zi<Y7ejG!LQcGT~;<@ZcVu1QI5i8QaT?b)5y;j3(Nw?>-lozfOJR>s(A>%Zni8sn`2
ze`&P2)eSjqaX0ShVqIgj-i@`y8l$a&>*)cXzuXB1LsMr?o;s~(dd94wLskv!yfNpY
zuWC{M&i>MQ(M@iwsV!O`ayGlMb~jq<wmP+L)LGEK+xiW)v9@p%D{*H<xFK@yPCV{L
L;(^1#ysQ5JP#U$&

diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
index bed6158..c240abb 100644
--- a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
+++ b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: ddportfolioservice 0.2.1\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
 "POT-Creation-Date: 2009-01-20 23:13+0100\n"
-"PO-Revision-Date: 2012-03-24 22:07+0100\n"
+"PO-Revision-Date: 2012-03-26 17:58+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"
@@ -110,115 +110,103 @@ msgid "Debian patch tracking system"
 msgstr "Debian Nachverfolgungssystem für Patches"
 
 #: ddportfolioservice/controllers/ddportfolio.py:75
-msgid "Upload"
-msgstr "Upload"
-
-#: ddportfolioservice/controllers/ddportfolio.py:76
-msgid ""
-"keylog (per-key upload list)\n"
-"(note: uses key fingerprint)"
-msgstr ""
-"Keylog\n"
-"(Anmerkung: verwendet den Fingerabdruck des Schlüssels)"
-
-#: ddportfolioservice/controllers/ddportfolio.py:80
 msgid "Mailing Lists"
 msgstr "Mailinglisten"
 
-#: ddportfolioservice/controllers/ddportfolio.py:81
+#: ddportfolioservice/controllers/ddportfolio.py:76
 msgid "lists.d.o"
 msgstr "lists.d.o"
 
-#: ddportfolioservice/controllers/ddportfolio.py:82
+#: ddportfolioservice/controllers/ddportfolio.py:77
 msgid "lists.a.d.o"
 msgstr "lists.a.d.o"
 
-#: ddportfolioservice/controllers/ddportfolio.py:83
+#: ddportfolioservice/controllers/ddportfolio.py:78
 msgid "gmane"
 msgstr "Gmane"
 
-#: ddportfolioservice/controllers/ddportfolio.py:86
+#: ddportfolioservice/controllers/ddportfolio.py:81
 msgid "Files"
 msgstr "Dateien"
 
-#: ddportfolioservice/controllers/ddportfolio.py:87
+#: ddportfolioservice/controllers/ddportfolio.py:82
 msgid "people.d.o"
 msgstr "people.d.o"
 
-#: ddportfolioservice/controllers/ddportfolio.py:88
+#: ddportfolioservice/controllers/ddportfolio.py:83
 msgid "oldpeople"
 msgstr "oldpeople"
 
-#: ddportfolioservice/controllers/ddportfolio.py:89
-#: ddportfolioservice/controllers/ddportfolio.py:96
+#: ddportfolioservice/controllers/ddportfolio.py:84
+#: ddportfolioservice/controllers/ddportfolio.py:91
 msgid "Alioth"
 msgstr "Alioth"
 
-#: ddportfolioservice/controllers/ddportfolio.py:92
+#: ddportfolioservice/controllers/ddportfolio.py:87
 msgid "Membership"
 msgstr "Mitgliedschaft"
 
-#: ddportfolioservice/controllers/ddportfolio.py:93
+#: ddportfolioservice/controllers/ddportfolio.py:88
 msgid "NM"
 msgstr "NM"
 
-#: ddportfolioservice/controllers/ddportfolio.py:94
+#: ddportfolioservice/controllers/ddportfolio.py:89
 msgid "DB information via finger"
 msgstr "DB-Informationen per finger"
 
-#: ddportfolioservice/controllers/ddportfolio.py:95
+#: ddportfolioservice/controllers/ddportfolio.py:90
 msgid "DB information via HTTP"
 msgstr "DB-Informationen per HTTP"
 
-#: ddportfolioservice/controllers/ddportfolio.py:97
+#: ddportfolioservice/controllers/ddportfolio.py:92
 msgid "Wiki"
 msgstr "Wiki"
 
-#: ddportfolioservice/controllers/ddportfolio.py:98
+#: ddportfolioservice/controllers/ddportfolio.py:93
 msgid "Forum"
 msgstr "Forum"
 
-#: ddportfolioservice/controllers/ddportfolio.py:101
+#: ddportfolioservice/controllers/ddportfolio.py:96
 msgid "Miscellaneous"
 msgstr "Sonstiges"
 
-#: ddportfolioservice/controllers/ddportfolio.py:102
+#: ddportfolioservice/controllers/ddportfolio.py:97
 msgid "debtags"
 msgstr "debtags"
 
-#: ddportfolioservice/controllers/ddportfolio.py:103
+#: ddportfolioservice/controllers/ddportfolio.py:98
 msgid "links"
 msgstr "Links"
 
-#: ddportfolioservice/controllers/ddportfolio.py:104
+#: ddportfolioservice/controllers/ddportfolio.py:99
 msgid "Debian website"
 msgstr "Debian Webseite"
 
-#: ddportfolioservice/controllers/ddportfolio.py:105
+#: ddportfolioservice/controllers/ddportfolio.py:100
 msgid "Debian search"
 msgstr "Debian-Suche"
 
-#: ddportfolioservice/controllers/ddportfolio.py:106
+#: ddportfolioservice/controllers/ddportfolio.py:101
 msgid "GPG public key via finger"
 msgstr "öffentlicher GPG-Schlüssel per finger"
 
-#: ddportfolioservice/controllers/ddportfolio.py:107
+#: ddportfolioservice/controllers/ddportfolio.py:102
 msgid "GPG public key via HTTP"
 msgstr "öffentlicher GPG-Schlüssel per HTTP"
 
-#: ddportfolioservice/controllers/ddportfolio.py:108
+#: ddportfolioservice/controllers/ddportfolio.py:103
 msgid "NM, AM participation"
 msgstr "NM-, AM-Teilnahme"
 
-#: ddportfolioservice/controllers/ddportfolio.py:111
+#: ddportfolioservice/controllers/ddportfolio.py:106
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr "Per ssh erreichbare Informationen (für Debian Mitglieder)"
 
-#: ddportfolioservice/controllers/ddportfolio.py:112
+#: ddportfolioservice/controllers/ddportfolio.py:107
 msgid "owned debian.net domains"
 msgstr "Besitz von debian.net-Domains"
 
-#: ddportfolioservice/controllers/ddportfolio.py:113
+#: ddportfolioservice/controllers/ddportfolio.py:108
 msgid ""
 "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database"
 " information"
@@ -226,15 +214,15 @@ msgstr ""
 "Informationen in der <a "
 "href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"
 
-#: ddportfolioservice/controllers/ddportfolio.py:115
+#: ddportfolioservice/controllers/ddportfolio.py:110
 msgid "Group membership information"
 msgstr "Information über Gruppenmitgliedschaften"
 
-#: ddportfolioservice/controllers/ddportfolio.py:118
+#: ddportfolioservice/controllers/ddportfolio.py:113
 msgid "Ubuntu"
 msgstr "Ubuntu"
 
-#: ddportfolioservice/controllers/ddportfolio.py:119
+#: ddportfolioservice/controllers/ddportfolio.py:114
 msgid "Available patches from Ubuntu"
 msgstr "Verfügbare Patches aus Ubuntu"
 
diff --git a/ddportfolioservice/model/ddportfolio.ini b/ddportfolioservice/model/ddportfolio.ini
index 2811abd..b7df712 100644
--- a/ddportfolioservice/model/ddportfolio.ini
+++ b/ddportfolioservice/model/ddportfolio.ini
@@ -20,7 +20,7 @@
 #
 [DEFAULT]
 keyring.dir=~/debian/keyring.debian.org/keyrings
-urlbuilder.sections=overview,bugs,build,qa,upload,lists,files,membership,
+urlbuilder.sections=overview,bugs,build,qa,lists,files,membership,
  miscellaneous,ssh,ubuntu
 
 [overview]
@@ -49,11 +49,6 @@ lintianfull.pattern=http://lintian.debian.org/full/%(email)s.html
 piuparts.pattern=http://piuparts.debian.org/sid/maintainer/%(firstchar)s/%(email)s.html
 patchtracker.pattern=http://patch-tracker.debian.org/email/%(email)s
 
-[upload]
-urls=keylog
-keylog.pattern=http://merkel.debian.org/~enrico/keylog/%(gpgfp)s.html
-keylog.optional=true
-
 [lists]
 urls=dolists,adolists,gmane
 dolists.pattern=http://lists.debian.org/cgi-bin/search?author=%(name)s&amp;sort=date