Merge branch 'release/0.2.16'

ddportfolioservice/controllers/ddportfolio.py

@@ -90,6 +90,7 @@ developer name on all bug logs)'),
             'nm': N_('NM'),
             'dbfinger': N_('DB information via finger'),
             'db': N_('DB information via HTTP'),
+            'webid': N_('FOAF profile'),
             'alioth': N_('Alioth'),
             'wiki': N_('Wiki'),
             'forum': N_('Forum'),

ddportfolioservice/model/ddportfolio.ini

@@ -53,9 +53,9 @@ duck.pattern=http://duck.debian.net/?searchstring=%(email)s
 
 [lists]
 urls=dolists,adolists,gmane
-dolists.pattern=http://lists.debian.org/cgi-bin/search?author=%(name)s&sort=date
+dolists.pattern=http://lists.debian.org/cgi-bin/search?author=%(name)s&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&group=gmane.linux.debian.*
+gmane.pattern=http://search.gmane.org/?email=%(name)s&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
@@ -70,13 +70,15 @@ alioth.pattern=http://alioth.debian.org/~%(aliothusername)s/
 alioth.optional=true
 
 [membership]
-urls=nm,dbfinger,db,alioth,wiki,forum
+urls=nm,dbfinger,db,webid,alioth,wiki,forum
 nm.pattern=https://nm.debian.org/public/nmstatus/%(username)s
 dbfinger.pattern=finger %(username)s@db.debian.org
 dbfinger.type=finger
 dbfinger.optional=true
-db.pattern=http://db.debian.org/search.cgi?uid=%(username)s&dosearch=Search
+db.pattern=http://db.debian.org/search.cgi?uid=%(username)s&dosearch=Search
 db.optional=true
+webid.pattern=http://webid.debian.net/maintainers/%(username)
+webid.optional=true
 alioth.pattern=http://alioth.debian.org/users/%(aliothusername)s/
 alioth.optional=true
 wiki.pattern=http://wiki.debian.org/%(wikihomepage)s

setup.py

@@ -29,7 +29,7 @@ except ImportError:
 
 setup(
     name='ddportfolioservice',
-    version='0.2.15',
+    version='0.2.16',
     description='service to create DDPortfolio URLs',
     long_description="""This is a service implementation that
 returns a set of personalized URLs as outlined in