Index: doxygenplugin/0.11/doxygentrac/doxygentrac.py
===================================================================
--- doxygenplugin/0.10/doxygentrac/doxygentrac.py	(revision 1983)
+++ doxygenplugin/0.11/doxygentrac/doxygentrac.py	(revision 2069)
@@ -1,8 +1,8 @@
+# -*- coding: utf-8 -*-
 # vim: ts=4 expandtab
 #
 # Copyright (C) 2005 Jason Parks <jparks@jparks.net>. All rights reserved.
+# Copyright (C) 2006-2007 Christian Boos <cboos@neuf.fr>
 #
-
-from __future__ import generators
 
 import os
@@ -11,4 +11,6 @@
 import re
 import mimetypes
+
+from genshi.builder import tag
 
 from trac.config import Option
@@ -18,9 +20,8 @@
 from trac.web.chrome import INavigationContributor, ITemplateProvider, \
   add_stylesheet
-from trac.Search import ISearchSource
-from trac.wiki import WikiSystem, IWikiSyntaxProvider
+from trac.search.api import ISearchSource
+from trac.wiki.api import WikiSystem, IWikiSyntaxProvider
 from trac.wiki.model import WikiPage
 from trac.wiki.formatter import wiki_to_html
-from trac.util.html import html
 
 def compare_rank(x, y):
@@ -33,5 +34,5 @@
 class DoxygenPlugin(Component):
     implements(IPermissionRequestor, INavigationContributor, IRequestHandler,
-      ITemplateProvider, ISearchSource, IWikiSyntaxProvider)
+               ITemplateProvider, ISearchSource, IWikiSyntaxProvider)
 
     base_path = Option('doxygen', 'path', '/var/lib/trac/doxygen',
@@ -87,6 +88,6 @@
         if req.perm.has_permission('DOXYGEN_VIEW'):
             # Return mainnav buttons.
-            yield 'mainnav', 'doxygen', html.a(self.title,
-                                               href=req.href.doxygen())
+            yield ('mainnav', 'doxygen',
+                   tag.a(self.title, href=req.href.doxygen()))
 
     # IRequestHandler methods
@@ -224,15 +225,15 @@
             action, path, link = self._doxygen_lookup(segments)
             if action == 'index':
-                return html.a(label, title=self.title,
-                              href=formatter.href.doxygen())
+                return tag.a(label, title=self.title,
+                             href=formatter.href.doxygen())
             if action == 'redirect' and path:
-                return html.a(label, title="Search result for "+params,
-                              href=formatter.href.doxygen(link,path=path))
+                return tag.a(label, title="Search result for "+params,
+                             href=formatter.href.doxygen(link,path=path))
             if action == 'search':
-                return html.a(label, title=params, class_='missing',
-                              href=formatter.href.doxygen())
+                return tag.a(label, title=params, class_='missing',
+                             href=formatter.href.doxygen())
             else:
-                return html.a(label, title=params,
-                              href=formatter.href.doxygen(link, path=path))
+                return tag.a(label, title=params,
+                             href=formatter.href.doxygen(link, path=path))
         yield ('doxygen', doxygen_link)
 
Index: doxygenplugin/0.11/setup.py
===================================================================
--- doxygenplugin/0.10/setup.py	(revision 1983)
+++ doxygenplugin/0.11/setup.py	(revision 2069)
@@ -8,5 +8,5 @@
     description='Doxygen plugin for Trac',
     keywords='trac doxygen',
-    version='0.4',
+    version='0.11.1',
     url='http://trac-hacks.org/wiki/DoxygenPlugin',
     license = """Copyright (C) 2005 Jason Parks <jparks@jparks.net>
@@ -40,4 +40,6 @@
     author='Jason Parks, Radek Bartoň',
     author_email='blackhex@post.cz',
+    maintainer = "Christian Boos",
+    maintainer_email = "cboos@neuf.fr",
     long_description="""
     """,