6 files changed, 216 insertions, 70 deletions

diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 1a17923a65d4..3cbd3dc72671 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,27 +3,26 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.4 2005/11/02 01:42:00 marcus Exp $
+#    $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.24 2006/04/17 07:51:13 marcus Exp $
 #
 
 PORTNAME=	deskbar-applet
-PORTVERSION=	0.8.8
-PORTREVISION=	1
+PORTVERSION=	2.14.1.1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome panel applet similar to Google's (Windows only) Deskbar
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack pygnomeextras
+USE_GNOME=	gnomeprefix gnomehack pygnomedesktop intlhack
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--disable-beagle
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -35,7 +34,7 @@ OPTIONS=	EVO "Enable evolution support" on
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=	"Does not build on 4.X"
+BROKEN=	Does not build on 4.X
 .endif
 
 .if !defined(WITHOUT_EVO)
@@ -46,11 +45,36 @@ CONFIGURE_ARGS+=--disable-evolution
 PLIST_SUB+=	EVO="@comment "
 .endif
 
+.if !defined(DISPLAY)
+BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
+		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
+.if !defined(PACKAGE_BUILDING)
+CONFIGURE_ENV+=	DISPLAY="localhost:1001"
+.endif
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC}/deskbar -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/usr/share/applications|${X11BASE}/share/gnome/applications|g'
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/deskbar/handler_utils.py
+		${WRKSRC}/deskbar/handlers/mozilla.py \
+		${WRKSRC}/deskbar/Utils.py
+
+.if !defined(DISPLAY)
+pre-configure:
+	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
+		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
+		${RM} -f ${WRKDIR}/.Xvfb.pid ; \
+	fi
+	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
+	@sleep 5
+
+post-configure:
+	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
+		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
+		${RM} -f ${WRKDIR}/.Xvfb.pid ; \
+	fi
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 8491a6ac5474..147cebfffcc9 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-0.8.8.tar.bz2) = 2d45cd24feb023cd4083e53bdc8b478e
-SHA256 (gnome2/deskbar-applet-0.8.8.tar.bz2) = 89813323e0da4f68ed5b26ab8ae97968fda7472583b4ff2805743fc7ee80f74f
-SIZE (gnome2/deskbar-applet-0.8.8.tar.bz2) = 384587
+MD5 (gnome2/deskbar-applet-2.14.1.1.tar.bz2) = 9264c4cf5eaab4ac99009aea393d30ff
+SHA256 (gnome2/deskbar-applet-2.14.1.1.tar.bz2) = 0e623108df00e7a87a822661abe301537c0bbc3b0e512302f706fdf6b989d7b5
+SIZE (gnome2/deskbar-applet-2.14.1.1.tar.bz2) = 484608
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_handler_utils.py b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py
index 8173fc2d0db0..773c8e15ae77 100644
--- a/deskutils/deskbar-applet/files/patch-deskbar_handler_utils.py
+++ b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py
@@ -1,5 +1,5 @@
---- deskbar/handler_utils.py.orig	Tue Nov  1 20:32:51 2005
-+++ deskbar/handler_utils.py	Tue Nov  1 20:33:08 2005
+--- deskbar/Utils.py.orig	Tue Nov  1 20:32:51 2005
++++ deskbar/Utils.py	Tue Nov  1 20:33:08 2005
 @@ -10,7 +10,7 @@
  	
  	sysdirs = os.getenv("XDG_DATA_DIRS")
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
index 1cca47519b67..1cf0777c4a81 100644
--- a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
+++ b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
@@ -1,13 +1,17 @@
---- deskbar/deskbar-applet.py.orig	Sat Nov 19 14:15:58 2005
-+++ deskbar/deskbar-applet.py	Thu Dec  8 22:23:00 2005
-@@ -34,8 +34,8 @@
- gettext.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
+--- deskbar/deskbar-applet.py.orig	Mon Mar 13 23:23:20 2006
++++ deskbar/deskbar-applet.py	Mon Mar 13 23:23:52 2006
+@@ -42,10 +42,10 @@
+ 	gettext.bind_textdomain_codeset('deskbar-applet','UTF-8')
  gettext.textdomain('deskbar-applet')
  
 -locale.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
+-if hasattr(locale, 'bind_textdomain_codeset'):
+-	locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
 -locale.textdomain('deskbar-applet')
 +#locale.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
++#if hasattr(locale, 'bind_textdomain_codeset'):
++#	locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
 +#locale.textdomain('deskbar-applet')
  
- def applet_factory(applet, iid):
- 	print 'Starting Deskbar instance:', applet, iid
+ import gtkexcepthook
+ 
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py b/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
new file mode 100644
index 000000000000..a668777c193e
--- /dev/null
+++ b/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
@@ -0,0 +1,18 @@
+--- deskbar/handlers/mozilla.py.orig	Wed Mar  1 13:32:12 2006
++++ deskbar/handlers/mozilla.py	Wed Mar  1 13:33:19 2006
+@@ -189,6 +189,7 @@ class MozillaSearchHandler(deskbar.Handl
+ 				get_firefox_home_file("searchplugins"),
+ 				get_firefox_home_file("search"),
+ 				expanduser("~/.mozilla/searchplugins"),
++				"%%X11BASE%%/lib/firefox/searchplugins",
+ 				"/usr/lib/firefox/searchplugins",
+ 				"/usr/local/lib/firefox/searchplugins",
+ 				"/usr/lib/mozilla-firefox/searchplugins",
+@@ -197,6 +198,7 @@ class MozillaSearchHandler(deskbar.Handl
+ 			smart_dirs = [
+ 				get_mozilla_home_file("search"),
+ 				expanduser("~/.mozilla/searchplugins"),
++				"%%X11BASE%%/lib/mozilla/searchplugins",
+ 				"/usr/lib/mozilla/searchplugins",
+ 				"/usr/local/lib/mozilla/searchplugins"]
+ 		
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index 14ef80af14e7..bfeca0921357 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -2,9 +2,9 @@ lib/deskbar-applet/deskbar-applet
 lib/deskbar-applet/handlers/beagle-live.py
 lib/deskbar-applet/handlers/beagle-live.pyc
 lib/deskbar-applet/handlers/beagle-live.pyo
-lib/deskbar-applet/handlers/beagle.py
-lib/deskbar-applet/handlers/beagle.pyc
-lib/deskbar-applet/handlers/beagle.pyo
+lib/deskbar-applet/handlers/beagle-static.py
+lib/deskbar-applet/handlers/beagle-static.pyc
+lib/deskbar-applet/handlers/beagle-static.pyo
 lib/deskbar-applet/handlers/email_address.py
 lib/deskbar-applet/handlers/email_address.pyc
 lib/deskbar-applet/handlers/email_address.pyo
@@ -29,6 +29,9 @@ lib/deskbar-applet/handlers/google-live.pyo
 lib/deskbar-applet/handlers/gtkbookmarks.py
 lib/deskbar-applet/handlers/gtkbookmarks.pyc
 lib/deskbar-applet/handlers/gtkbookmarks.pyo
+lib/deskbar-applet/handlers/history.py
+lib/deskbar-applet/handlers/history.pyc
+lib/deskbar-applet/handlers/history.pyo
 lib/deskbar-applet/handlers/mozilla.py
 lib/deskbar-applet/handlers/mozilla.pyc
 lib/deskbar-applet/handlers/mozilla.pyo
@@ -44,107 +47,204 @@ lib/deskbar-applet/handlers/volumes.pyo
 lib/deskbar-applet/handlers/web_address.py
 lib/deskbar-applet/handlers/web_address.pyc
 lib/deskbar-applet/handlers/web_address.pyo
+lib/deskbar-applet/handlers/yahoo.py
+lib/deskbar-applet/handlers/yahoo.pyc
+lib/deskbar-applet/handlers/yahoo.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.py
+%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Categories.py
+%%PYTHON_SITELIBDIR%%/deskbar/Categories.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Categories.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.py
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.py
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.py
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Handler.py
+%%PYTHON_SITELIBDIR%%/deskbar/Handler.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Handler.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Indexer.py
+%%PYTHON_SITELIBDIR%%/deskbar/Indexer.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Indexer.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.py
+%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Match.py
+%%PYTHON_SITELIBDIR%%/deskbar/Match.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Match.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.py
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.py
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.py
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Utils.py
+%%PYTHON_SITELIBDIR%%/deskbar/Utils.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Utils.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Watcher.py
+%%PYTHON_SITELIBDIR%%/deskbar/Watcher.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Watcher.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/about.py
-%%PYTHON_SITELIBDIR%%/deskbar/about.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/about.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/applet.py
-%%PYTHON_SITELIBDIR%%/deskbar/applet.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/applet.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/applet_keybinder.py
-%%PYTHON_SITELIBDIR%%/deskbar/applet_keybinder.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/applet_keybinder.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/defs.py
 %%PYTHON_SITELIBDIR%%/deskbar/defs.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/defs.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/deskbarentry.py
-%%PYTHON_SITELIBDIR%%/deskbar/deskbarentry.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/deskbarentry.pyo
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.py
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyc
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyo
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.la
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.so
-%%PYTHON_SITELIBDIR%%/deskbar/filewatcher.py
-%%PYTHON_SITELIBDIR%%/deskbar/filewatcher.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/filewatcher.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.la
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.so
 %%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/_gnomedesktop.la
 %%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/_gnomedesktop.so
-%%PYTHON_SITELIBDIR%%/deskbar/handler.py
-%%PYTHON_SITELIBDIR%%/deskbar/handler.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/handler.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/handler_utils.py
-%%PYTHON_SITELIBDIR%%/deskbar/handler_utils.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/handler_utils.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/handlers_browsers.py
-%%PYTHON_SITELIBDIR%%/deskbar/handlers_browsers.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/handlers_browsers.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/history.py
-%%PYTHON_SITELIBDIR%%/deskbar/history.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/history.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.py
+%%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/iconentry/_iconentry.la
 %%PYTHON_SITELIBDIR%%/deskbar/iconentry/_iconentry.so
-%%PYTHON_SITELIBDIR%%/deskbar/indexer.py
-%%PYTHON_SITELIBDIR%%/deskbar/indexer.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/indexer.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/keybinder/_keybinder.la
 %%PYTHON_SITELIBDIR%%/deskbar/keybinder/_keybinder.so
-%%PYTHON_SITELIBDIR%%/deskbar/locale_utils.py
-%%PYTHON_SITELIBDIR%%/deskbar/locale_utils.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/locale_utils.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ltihooks.py
-%%PYTHON_SITELIBDIR%%/deskbar/ltihooks.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ltihooks.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/module_list.py
-%%PYTHON_SITELIBDIR%%/deskbar/module_list.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/module_list.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/preferences.py
-%%PYTHON_SITELIBDIR%%/deskbar/preferences.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/preferences.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/_osutils.la
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/_osutils.so
+%%PYTHON_SITELIBDIR%%/deskbar/ui/About.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/About.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/About.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/CompletionDeskbarUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/CompletionDeskbarUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/CompletionDeskbarUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/DeskbarEntry.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/DeskbarEntry.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/DeskbarEntry.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/Cuemiac.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/Cuemiac.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/Cuemiac.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.pyo
 libdata/bonobo/servers/Deskbar_Applet.server
 libdata/pkgconfig/deskbar-applet.pc
 share/gnome/deskbar-applet/Deskbar_Applet.xml
+share/gnome/deskbar-applet/art/deskbar-applet-panel-h.png
+share/gnome/deskbar-applet/art/deskbar-applet-panel-h.svg
+share/gnome/deskbar-applet/art/deskbar-applet-panel-v.png
+share/gnome/deskbar-applet/art/deskbar-applet-panel-v.svg
 share/gnome/deskbar-applet/art/deskbar-applet-small.png
 share/gnome/deskbar-applet/art/deskbar-applet.svg
+share/gnome/deskbar-applet/art/epiphany-history.png
 share/gnome/deskbar-applet/art/folder-bookmark.png
 share/gnome/deskbar-applet/art/generic.png
 share/gnome/deskbar-applet/art/google.png
-share/gnome/deskbar-applet/art/web-bookmark.png
+share/gnome/deskbar-applet/art/yahoo.png
+share/gnome/deskbar-applet/mozilla-search.glade
 share/gnome/deskbar-applet/prefs-dialog.glade
 share/gnome/deskbar-applet/smart-bookmarks.glade
 share/gnome/pixmaps/deskbar-applet.svg
 share/locale/bg/LC_MESSAGES/deskbar-applet.mo
+share/locale/ca/LC_MESSAGES/deskbar-applet.mo
+share/locale/cs/LC_MESSAGES/deskbar-applet.mo
+share/locale/cy/LC_MESSAGES/deskbar-applet.mo
+share/locale/da/LC_MESSAGES/deskbar-applet.mo
 share/locale/de/LC_MESSAGES/deskbar-applet.mo
+share/locale/dz/LC_MESSAGES/deskbar-applet.mo
+share/locale/el/LC_MESSAGES/deskbar-applet.mo
 share/locale/en_CA/LC_MESSAGES/deskbar-applet.mo
 share/locale/en_GB/LC_MESSAGES/deskbar-applet.mo
 share/locale/es/LC_MESSAGES/deskbar-applet.mo
+share/locale/et/LC_MESSAGES/deskbar-applet.mo
 share/locale/fi/LC_MESSAGES/deskbar-applet.mo
+share/locale/fr/LC_MESSAGES/deskbar-applet.mo
 share/locale/gl/LC_MESSAGES/deskbar-applet.mo
 share/locale/gu/LC_MESSAGES/deskbar-applet.mo
+share/locale/he/LC_MESSAGES/deskbar-applet.mo
+share/locale/hi/LC_MESSAGES/deskbar-applet.mo
 share/locale/hu/LC_MESSAGES/deskbar-applet.mo
+share/locale/it/LC_MESSAGES/deskbar-applet.mo
 share/locale/ja/LC_MESSAGES/deskbar-applet.mo
+share/locale/ka/LC_MESSAGES/deskbar-applet.mo
+share/locale/ko/LC_MESSAGES/deskbar-applet.mo
+share/locale/ku/LC_MESSAGES/deskbar-applet.mo
 share/locale/lt/LC_MESSAGES/deskbar-applet.mo
 share/locale/mk/LC_MESSAGES/deskbar-applet.mo
 share/locale/nb/LC_MESSAGES/deskbar-applet.mo
 share/locale/nl/LC_MESSAGES/deskbar-applet.mo
 share/locale/pa/LC_MESSAGES/deskbar-applet.mo
+share/locale/pl/LC_MESSAGES/deskbar-applet.mo
+share/locale/pt/LC_MESSAGES/deskbar-applet.mo
+share/locale/pt_BR/LC_MESSAGES/deskbar-applet.mo
+share/locale/ru/LC_MESSAGES/deskbar-applet.mo
 share/locale/sk/LC_MESSAGES/deskbar-applet.mo
+share/locale/sq/LC_MESSAGES/deskbar-applet.mo
+share/locale/sr/LC_MESSAGES/deskbar-applet.mo
+share/locale/sr@Latn/LC_MESSAGES/deskbar-applet.mo
 share/locale/sv/LC_MESSAGES/deskbar-applet.mo
 share/locale/th/LC_MESSAGES/deskbar-applet.mo
+share/locale/uk/LC_MESSAGES/deskbar-applet.mo
+share/locale/vi/LC_MESSAGES/deskbar-applet.mo
 share/locale/zh_CN/LC_MESSAGES/deskbar-applet.mo
+share/locale/zh_HK/LC_MESSAGES/deskbar-applet.mo
+share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrm share/gnome/deskbar-applet/art
 @dirrm share/gnome/deskbar-applet
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/entriac
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/completion
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/osutils
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/keybinder
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/iconentry
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop