Merge branch 'newrules' into pylons0.10

* newrules:
  updated translations
  add ideas for SSH functions as comment
  add idea for debconf list search as comment
  add Debian search
  add website google search
  add patch tracker
  add piuparts
  add support for "firstchar" in patterns
  add ubuntudiff to new group Ubuntu

Resolved conflicts:
	ddportfolioservice/i18n/ddportfolioservice.pot
	ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
	ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
	ddportfolioservice/model/ddportfolio.ini

ddportfolioservice/model/ddportfolio.ini

@@ -1,6 +1,6 @@
 #
 # Configuration for DDPortfolio service
-# Copyright (c) 2009 Jan Dittberner <jan@dittberner.info>
+# Copyright © 2009, 2010 Jan Dittberner <jan@dittberner.info>
 #
 # This file is part of DDPortfolio service.
 #
@@ -21,7 +21,7 @@
 [DEFAULT]
 keyring.dir=${HOME}/debian/keyring.debian.org/keyrings
 urlbuilder.sections=overview,bugs,build,qa,upload,lists,files,membership,
- miscellaneous
+ miscellaneous,ubuntu
 
 [overview]
 urls=ddpo,alladdresses
@@ -44,10 +44,12 @@ buildd.pattern=http://buildd.debian.org/pkg.cgi?maint=%(email)s
 svnbuildstat.pattern=http://svnbuildstat.debian.net/packages/list/%(email)s
 
 [qa]
-urls=lintian,lintianfull,dehs
+urls=lintian,lintianfull,dehs,piuparts,patchtracker
 lintian.pattern=http://lintian.debian.org/maintainer/%(email)s.html
 lintianfull.pattern=http://lintian.debian.org/full/%(email)s.html
 dehs.pattern=http://dehs.alioth.debian.org/report.php?login=%(email)s
+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
@@ -58,6 +60,11 @@ urls=dolists,adolists,gmane
 dolists.pattern=http://lists.debian.org/cgi-bin/search?author=%(name)s&amp;sort=date
 adolists.pattern=http://www.google.com/search?q=site%%3Alists.alioth.debian.org+%%22%(name)s%%22
 gmane.pattern=http://search.gmane.org/?email=%(name)s&amp;group=gmane.linux.debian.*
+# debconf list search has a tricky URL format
+# http://lists.debconf.org/lurker/search \
+#  /20100510.202949.00000000@au:%(firstname)s,au:%(lastname)s.en.html
+#  /YYYYMMDD.HHmmss.hashcode@au:%(firstname)s,au:%(lastname)s.en.html
+# maybe this could be implemented using some custom formatter function
 
 [files]
 urls=people,alioth
@@ -71,6 +78,23 @@ db.pattern=http://db.debian.org/search.cgi?uid=%(username)s&amp;dosearch=Search
 alioth.pattern=http://alioth.debian.org/users/%(aliothusername)s/
 
 [miscellaneous]
-urls=debtags,links
+urls=debtags,links,website,search
 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
+# SSH functions
+#
+# owned *.debian.net domains
+# ssh merkel.debian.org ldapsearch -u -x -H ldap://db.debian.org -b dc=debian,dc=org \
+#  uid=%(username)s dnsZoneEntry
+#
+# MIA information
+# ssh merkel.debian.org /srv/qa.debian.org/mia/mia-query %(username)s
+#
+# Group information
+# ssh merkel.debian.org id %(username)s
+
+[ubuntu]
+urls=ubuntudiff
+ubuntudiff.pattern=http://ubuntudiff.debian.net/q/uploaders/%(email)s

ddportfolioservice/model/urlbuilder.py

@@ -56,6 +56,7 @@ def build_urls(fields):
         fpr = keyfinder.getFingerprintByEmail(fields['email'].encode('utf8'))
         if fpr:
             qfields['gpgfp'] = fpr[0]
+    qfields['firstchar'] = fields['email'][0].encode('utf8')
     for section in [section.strip() for section in \
                         my_config.get('DEFAULT',
                                       'urlbuilder.sections').split(',')]: