-take maintainership (per PM from jmmv)

-pull in gnome2.dirs and regen PLIST

2 files changed, 39 insertions, 32 deletions

diff --git a/misc/deskbar-applet/Makefile b/misc/deskbar-applet/Makefile
index 28603d4d593..a4d8e522571 100644
--- a/misc/deskbar-applet/Makefile
+++ b/misc/deskbar-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/06/05 05:37:30 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/07/13 17:12:27 drochner Exp $
 #
 
 DISTNAME=	deskbar-applet-2.18.1
@@ -7,12 +7,12 @@ CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/deskbar-applet/2.18/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	jmmv@NetBSD.org
+MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://raphael.slinckx.net/deskbar/
 COMMENT=	Omnipresent, versatile search interface for the GNOME Desktop
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		xdg-1.1
+USE_DIRS+=		xdg-1.1 gnome2-1.5
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
diff --git a/misc/deskbar-applet/PLIST b/misc/deskbar-applet/PLIST
index 2c88fdc99ac..81fe8f71384 100644
--- a/misc/deskbar-applet/PLIST
+++ b/misc/deskbar-applet/PLIST
@@ -1,29 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/04/15 08:53:40 wiz Exp $
-lib/deskbar-applet/handlers/recent.py
-lib/deskbar-applet/handlers/recent.pyc
-lib/deskbar-applet/handlers/recent.pyo
-lib/python2.4/site-packages/deskbar/ModuleInstaller.py
-lib/python2.4/site-packages/deskbar/ModuleInstaller.pyc
-lib/python2.4/site-packages/deskbar/ModuleInstaller.pyo
-lib/python2.4/site-packages/deskbar/updater/ErrorDialog.py
-lib/python2.4/site-packages/deskbar/updater/ErrorDialog.pyc
-lib/python2.4/site-packages/deskbar/updater/ErrorDialog.pyo
-lib/python2.4/site-packages/deskbar/updater/NewStuffUpdater.py
-lib/python2.4/site-packages/deskbar/updater/NewStuffUpdater.pyc
-lib/python2.4/site-packages/deskbar/updater/NewStuffUpdater.pyo
-lib/python2.4/site-packages/deskbar/updater/ProgressbarDialog.py
-lib/python2.4/site-packages/deskbar/updater/ProgressbarDialog.pyc
-lib/python2.4/site-packages/deskbar/updater/ProgressbarDialog.pyo
-lib/python2.4/site-packages/deskbar/updater/__init__.py
-lib/python2.4/site-packages/deskbar/updater/__init__.pyc
-lib/python2.4/site-packages/deskbar/updater/__init__.pyo
-share/gnome/help/deskbar/C/deskbar.xml
-share/gnome/help/deskbar/C/figures/deskbar-applet.png
-share/gnome/help/deskbar/C/legal.xml
-share/locale/ar/LC_MESSAGES/deskbar-applet.mo
-share/locale/fa/LC_MESSAGES/deskbar-applet.mo
-share/locale/ro/LC_MESSAGES/deskbar-applet.mo
-share/omf/deskbar/deskbar-C.omf
+@comment $NetBSD: PLIST,v 1.7 2007/07/13 17:12:27 drochner Exp $
 lib/bonobo/servers/Deskbar_Applet.server
 lib/deskbar-applet/deskbar-applet
 lib/deskbar-applet/handlers/beagle-live.py
@@ -62,6 +37,9 @@ lib/deskbar-applet/handlers/mozilla.pyo
 lib/deskbar-applet/handlers/programs.py
 lib/deskbar-applet/handlers/programs.pyc
 lib/deskbar-applet/handlers/programs.pyo
+lib/deskbar-applet/handlers/recent.py
+lib/deskbar-applet/handlers/recent.pyc
+lib/deskbar-applet/handlers/recent.pyo
 lib/deskbar-applet/handlers/web_address.py
 lib/deskbar-applet/handlers/web_address.pyc
 lib/deskbar-applet/handlers/web_address.pyo
@@ -99,6 +77,9 @@ ${PYSITELIB}/deskbar/Match.pyo
 ${PYSITELIB}/deskbar/ModuleContext.py
 ${PYSITELIB}/deskbar/ModuleContext.pyc
 ${PYSITELIB}/deskbar/ModuleContext.pyo
+${PYSITELIB}/deskbar/ModuleInstaller.py
+${PYSITELIB}/deskbar/ModuleInstaller.pyc
+${PYSITELIB}/deskbar/ModuleInstaller.pyo
 ${PYSITELIB}/deskbar/ModuleList.py
 ${PYSITELIB}/deskbar/ModuleList.pyc
 ${PYSITELIB}/deskbar/ModuleList.pyo
@@ -219,6 +200,18 @@ ${PYSITELIB}/deskbar/ui/window/CuemiacWindowUI.pyo
 ${PYSITELIB}/deskbar/ui/window/__init__.py
 ${PYSITELIB}/deskbar/ui/window/__init__.pyc
 ${PYSITELIB}/deskbar/ui/window/__init__.pyo
+${PYSITELIB}/deskbar/updater/ErrorDialog.py
+${PYSITELIB}/deskbar/updater/ErrorDialog.pyc
+${PYSITELIB}/deskbar/updater/ErrorDialog.pyo
+${PYSITELIB}/deskbar/updater/NewStuffUpdater.py
+${PYSITELIB}/deskbar/updater/NewStuffUpdater.pyc
+${PYSITELIB}/deskbar/updater/NewStuffUpdater.pyo
+${PYSITELIB}/deskbar/updater/ProgressbarDialog.py
+${PYSITELIB}/deskbar/updater/ProgressbarDialog.pyc
+${PYSITELIB}/deskbar/updater/ProgressbarDialog.pyo
+${PYSITELIB}/deskbar/updater/__init__.py
+${PYSITELIB}/deskbar/updater/__init__.pyc
+${PYSITELIB}/deskbar/updater/__init__.pyo
 share/deskbar-applet/Deskbar_Applet.xml
 share/deskbar-applet/art/delicious.png
 share/deskbar-applet/art/deskbar-applet-panel-h.png
@@ -236,12 +229,15 @@ share/deskbar-applet/mozilla-search.glade
 share/deskbar-applet/prefs-dialog.glade
 share/deskbar-applet/smart-bookmarks.glade
 share/gconf/schemas/deskbar-applet.schemas
+share/gnome/help/deskbar/C/deskbar.xml
+share/gnome/help/deskbar/C/figures/deskbar-applet.png
+share/gnome/help/deskbar/C/legal.xml
 share/icons/hicolor/16x16/apps/deskbar-applet.png
 share/icons/hicolor/22x22/apps/deskbar-applet.png
 share/icons/hicolor/32x32/apps/deskbar-applet.png
 share/icons/hicolor/48x48/apps/deskbar-applet.png
-share/icons/hicolor/icon-theme.cache
 share/icons/hicolor/scalable/apps/deskbar-applet.svg
+share/locale/ar/LC_MESSAGES/deskbar-applet.mo
 share/locale/be/LC_MESSAGES/deskbar-applet.mo
 share/locale/bg/LC_MESSAGES/deskbar-applet.mo
 share/locale/bn/LC_MESSAGES/deskbar-applet.mo
@@ -258,6 +254,7 @@ 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/eu/LC_MESSAGES/deskbar-applet.mo
+share/locale/fa/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
@@ -286,6 +283,7 @@ 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/ro/LC_MESSAGES/deskbar-applet.mo
 share/locale/ru/LC_MESSAGES/deskbar-applet.mo
 share/locale/sk/LC_MESSAGES/deskbar-applet.mo
 share/locale/sl/LC_MESSAGES/deskbar-applet.mo
@@ -301,18 +299,27 @@ 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
+share/omf/deskbar/deskbar-C.omf
 @dirrm share/omf/deskbar
-@comment in GConf2: @dirrm share/gconf/schemas
+@comment in scrollkeeper: @dirrm share/omf
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gnome/help/deskbar/C/figures
 @dirrm share/gnome/help/deskbar/C
 @dirrm share/gnome/help/deskbar
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/deskbar-applet/art
 @dirrm share/deskbar-applet
+@dirrm ${PYSITELIB}/deskbar/updater
 @dirrm ${PYSITELIB}/deskbar/ui/window
 @dirrm ${PYSITELIB}/deskbar/ui/entriac
 @dirrm ${PYSITELIB}/deskbar/ui/cuemiac
 @dirrm ${PYSITELIB}/deskbar/ui
-@dirrm ${PYSITELIB}/deskbar/updater
 @dirrm ${PYSITELIB}/deskbar/osutils
 @dirrm ${PYSITELIB}/deskbar/keybinder
 @dirrm ${PYSITELIB}/deskbar/iconentry