From daed37c4abe68253aa79823dd27cca651067912c Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sun, 6 Jun 2010 00:26:49 +0200
Subject: [PATCH 1/3] add flattr button

---
 ddportfolioservice/templates/base.mako | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ddportfolioservice/templates/base.mako b/ddportfolioservice/templates/base.mako
index a189e4b..1d3a34f 100644
--- a/ddportfolioservice/templates/base.mako
+++ b/ddportfolioservice/templates/base.mako
@@ -33,6 +33,11 @@ License along with this program.  If not, see
       id='debianlogo')}
       <h1>${_('Debian Developer Portfolio Service')}</h1>
       <p>${_('''This service has been inspired by Stefano Zacchiroli's <a href="http://wiki.debian.org/DDPortfolio">DDPortfolio page in the Debian Wiki</a>. You can create a set of customized links leading to a Debian Developer's or package maintainer's information regarding Debian.''')}</p>
+      <p><script type="text/javascript">
+	var flattr_url = 'http://ddportfolio.debian.net/';
+	var flattr_btn='compact';
+</script>
+<script src="http://api.flattr.com/button/load.js" type="text/javascript"></script></p>
     </div>
     <div id="content">
       ${self.body()}

From 3e0df60e17ded357cdacc4c3cc35a7440b71d853 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sun, 6 Jun 2010 00:31:41 +0200
Subject: [PATCH 2/3] fix path handling in keyringanalyzer

---
 ddportfolioservice/model/keyringanalyzer.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ddportfolioservice/model/keyringanalyzer.py b/ddportfolioservice/model/keyringanalyzer.py
index 7ef1cbe..8af2449 100644
--- a/ddportfolioservice/model/keyringanalyzer.py
+++ b/ddportfolioservice/model/keyringanalyzer.py
@@ -31,6 +31,7 @@ import pkg_resources
 import glob
 import ConfigParser
 import os
+import os.path
 
 
 def _get_keyrings():
@@ -38,10 +39,10 @@ def _get_keyrings():
     configured in ddportfolio.ini."""
     my_config = ConfigParser.ConfigParser()
     my_config.readfp(pkg_resources.resource_stream(__name__, 'ddportfolio.ini'))
-    keyrings = glob.glob(my_config.get('DEFAULT', 'keyring.dir') +
-                         '/*.gpg')
-    keyrings.extend(glob.glob(my_config.get('DEFAULT', 'keyring.dir') +
-                              '/*.pgp'))
+    keyringdir = os.path.expanduser(my_config.get('DEFAULT', 'keyring.dir'))
+    print "keyrings dir %r" % keyringdir
+    keyrings = glob.glob(os.path.join(keyringdir, '*.gpg'))
+    keyrings.extend(glob.glob(os.path.join(keyringdir, '*.pgp')))
     keyrings.sort()
     return keyrings
 

From 71c24cf9e36452cbbc9bf90cb0bf46aaab43d276 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sun, 6 Jun 2010 00:39:20 +0200
Subject: [PATCH 3/3] silence keyringanalyzer

---
 ddportfolioservice/model/keyringanalyzer.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ddportfolioservice/model/keyringanalyzer.py b/ddportfolioservice/model/keyringanalyzer.py
index 8af2449..378552e 100644
--- a/ddportfolioservice/model/keyringanalyzer.py
+++ b/ddportfolioservice/model/keyringanalyzer.py
@@ -40,7 +40,6 @@ def _get_keyrings():
     my_config = ConfigParser.ConfigParser()
     my_config.readfp(pkg_resources.resource_stream(__name__, 'ddportfolio.ini'))
     keyringdir = os.path.expanduser(my_config.get('DEFAULT', 'keyring.dir'))
-    print "keyrings dir %r" % keyringdir
     keyrings = glob.glob(os.path.join(keyringdir, '*.gpg'))
     keyrings.extend(glob.glob(os.path.join(keyringdir, '*.pgp')))
     keyrings.sort()