Merge branch 'newrules' into lenny

* newrules:
  add ubuntudiff to new group Ubuntu

ddportfolioservice/controllers/ddportfolio.py

@@ -94,6 +94,10 @@ developer name on all bug logs)'),
             'debtags' : N_('debtags'),
             'links' : N_('links'),
             },
+        'ubuntu' : {
+            'label' : N_('Ubuntu'),
+            'ubuntudiff' : N_('Available patches from Ubuntu'),
+            },
         }
 
 

ddportfolioservice/i18n/ddportfolioservice.pot

@@ -1,15 +1,15 @@
 # Translations template for ddportfolioservice.
-# Copyright (C) 2009 ORGANIZATION
+# Copyright (C) 2010 ORGANIZATION
 # This file is distributed under the same license as the ddportfolioservice
 # project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ddportfolioservice 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2009-08-14 22:02+0200\n"
+"POT-Creation-Date: 2010-05-10 20:09+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"
@@ -166,6 +166,14 @@ msgstr ""
 msgid "links"
 msgstr ""
 
+#: ddportfolioservice/controllers/ddportfolio.py:98
+msgid "Ubuntu"
+msgstr ""
+
+#: ddportfolioservice/controllers/ddportfolio.py:99
+msgid "Available patches from Ubuntu"
+msgstr ""
+
 #: ddportfolioservice/model/urlbuilder.py:40
 msgid "Email address"
 msgstr ""

ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po

@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: ddportfolioservice 0.1\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
 "POT-Creation-Date: 2009-01-20 23:13+0100\n"
-"PO-Revision-Date: 2009-08-14 22:03+0200\n"
+"PO-Revision-Date: 2010-05-10 20:10+0200\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language-Team: de <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -178,6 +178,14 @@ msgstr "debtags"
 msgid "links"
 msgstr "Links"
 
+#: ddportfolioservice/controllers/ddportfolio.py:98
+msgid "Ubuntu"
+msgstr "Ubuntu"
+
+#: ddportfolioservice/controllers/ddportfolio.py:99
+msgid "Available patches from Ubuntu"
+msgstr "Verfügbare Patches aus Ubuntu"
+
 #: ddportfolioservice/model/urlbuilder.py:40
 msgid "Email address"
 msgstr "E-Mailadresse"

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.
 #
@@ -19,9 +19,9 @@
 # <http://www.gnu.org/licenses/>.
 #
 [DEFAULT]
-keyring.dir=/home/www/usr01/debian/keyring.debian.org/keyrings
+keyring.dir=~/debian/keyring.debian.org/keyrings
 urlbuilder.sections=overview,bugs,build,qa,upload,lists,files,membership,
- miscellaneous
+ miscellaneous,ubuntu
 
 [overview]
 urls=ddpo,alladdresses
@@ -74,3 +74,7 @@ alioth.pattern=http://alioth.debian.org/users/%(aliothusername)s/
 urls=debtags,links
 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
+
+[ubuntu]
+urls=ubuntudiff
+ubuntudiff.pattern=http://ubuntudiff.debian.net/q/uploaders/%(email)s