- Update to 2.15.4

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6540 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 31 insertions, 35 deletions

diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 7f19c8ee6..9b688bc3b 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.29 2006/06/13 05:48:37 marcus Exp $
+#    $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.30 2006/06/15 17:51:15 marcus Exp $
 #
 
 PORTNAME=	deskbar-applet
-PORTVERSION=	2.15.3
-PORTREVISION=	1
+PORTVERSION=	2.15.4
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 00c46b79d..038399267 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-2.15.3.tar.bz2) = 97562c5c5935b9f580e73afc876c7a93
-SHA256 (gnome2/deskbar-applet-2.15.3.tar.bz2) = 535298c6427f5e14880fb17e3b1e9bea58a155158606295dcb9ed2fa2ad17000
-SIZE (gnome2/deskbar-applet-2.15.3.tar.bz2) = 532731
+MD5 (gnome2/deskbar-applet-2.15.4.tar.bz2) = 563ca79ec39bd4da9e7a9500ce5c9a67
+SHA256 (gnome2/deskbar-applet-2.15.4.tar.bz2) = bb26531c0e377a8f0baf94cfde6168f71fda2b3f44cb5804d260f5fdba061cf1
+SIZE (gnome2/deskbar-applet-2.15.4.tar.bz2) = 568215
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_ui_cuemiac_CuemiacPopupEntry.py b/deskutils/deskbar-applet/files/patch-deskbar_ui_cuemiac_CuemiacPopupEntry.py
deleted file mode 100644
index 784133fbc..000000000
--- a/deskutils/deskbar-applet/files/patch-deskbar_ui_cuemiac_CuemiacPopupEntry.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- deskbar/ui/cuemiac/CuemiacPopupEntry.py.orig	Thu Jun 15 13:47:05 2006
-+++ deskbar/ui/cuemiac/CuemiacPopupEntry.py	Thu Jun 15 13:47:17 2006
-@@ -115,11 +115,12 @@ class CuemiacPopupEntry (CuemiacLayoutPr
- 				print "WARNING in CuemiacEntryPopup : No toplevel window for entry!"
- 				return
- 
-+		self.popup_window.update_position()
-+		self.popup_window.show_all()
-+
- 		self.view.realize()
- 		self.selection.unselect_all()
- 		
--		self.popup_window.update_position()
--		self.popup_window.show_all ()
- 		self.view.grab_focus()
- 
- 		# Grab pointer
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index e6179660f..fe7f5ea54 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -8,9 +8,6 @@ lib/deskbar-applet/handlers/beagle-static.pyo
 lib/deskbar-applet/handlers/desklicious.py
 lib/deskbar-applet/handlers/desklicious.pyc
 lib/deskbar-applet/handlers/desklicious.pyo
-lib/deskbar-applet/handlers/email_address.py
-lib/deskbar-applet/handlers/email_address.pyc
-lib/deskbar-applet/handlers/email_address.pyo
 lib/deskbar-applet/handlers/epiphany.py
 lib/deskbar-applet/handlers/epiphany.pyc
 lib/deskbar-applet/handlers/epiphany.pyo
@@ -26,12 +23,12 @@ lib/deskbar-applet/handlers/galago.pyo
 lib/deskbar-applet/handlers/galeon.py
 lib/deskbar-applet/handlers/galeon.pyc
 lib/deskbar-applet/handlers/galeon.pyo
+lib/deskbar-applet/handlers/gdmactions.py
+lib/deskbar-applet/handlers/gdmactions.pyc
+lib/deskbar-applet/handlers/gdmactions.pyo
 lib/deskbar-applet/handlers/google-live.py
 lib/deskbar-applet/handlers/google-live.pyc
 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
@@ -41,15 +38,9 @@ lib/deskbar-applet/handlers/iswitch-window.pyo
 lib/deskbar-applet/handlers/mozilla.py
 lib/deskbar-applet/handlers/mozilla.pyc
 lib/deskbar-applet/handlers/mozilla.pyo
-lib/deskbar-applet/handlers/pathprograms.py
-lib/deskbar-applet/handlers/pathprograms.pyc
-lib/deskbar-applet/handlers/pathprograms.pyo
 lib/deskbar-applet/handlers/programs.py
 lib/deskbar-applet/handlers/programs.pyc
 lib/deskbar-applet/handlers/programs.pyo
-lib/deskbar-applet/handlers/volumes.py
-lib/deskbar-applet/handlers/volumes.pyc
-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
@@ -168,6 +159,9 @@ lib/deskbar-applet/new-stuff-manager
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHeader.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHeader.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHeader.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.pyo
@@ -204,6 +198,15 @@ lib/deskbar-applet/new-stuff-manager
 %%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/window/CuemiacWindowUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/window/CuemiacWindowUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/window/CuemiacWindowUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.py
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.py
 %%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.pyo
@@ -216,6 +219,7 @@ lib/deskbar-applet/new-stuff-manager
 libdata/bonobo/servers/Deskbar_Applet.server
 libdata/pkgconfig/deskbar-applet.pc
 share/dbus-1/services/org.gnome.NewStuffManager.service
+share/gnome/applications/deskbar-applet.desktop
 share/gnome/deskbar-applet/Deskbar_Applet.xml
 share/gnome/deskbar-applet/art/delicious.png
 share/gnome/deskbar-applet/art/deskbar-applet-panel-h.png
@@ -227,6 +231,8 @@ 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/gpm-suspend-to-disk.png
+share/gnome/deskbar-applet/art/gpm-suspend-to-ram.png
 share/gnome/deskbar-applet/art/yahoo.png
 share/gnome/deskbar-applet/mozilla-search.glade
 share/gnome/deskbar-applet/prefs-dialog.glade
@@ -236,6 +242,7 @@ share/icons/hicolor/48x48/apps/deskbar-applet.png
 share/icons/hicolor/scalable/apps/deskbar-applet.svg
 share/locale/bg/LC_MESSAGES/deskbar-applet.mo
 share/locale/bn/LC_MESSAGES/deskbar-applet.mo
+share/locale/bn_IN/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
@@ -251,6 +258,7 @@ 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/id/LC_MESSAGES/deskbar-applet.mo
@@ -260,6 +268,8 @@ 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/lv/LC_MESSAGES/deskbar-applet.mo
+share/locale/mg/LC_MESSAGES/deskbar-applet.mo
 share/locale/mk/LC_MESSAGES/deskbar-applet.mo
 share/locale/nb/LC_MESSAGES/deskbar-applet.mo
 share/locale/ne/LC_MESSAGES/deskbar-applet.mo
@@ -274,6 +284,7 @@ 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/ta/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
@@ -282,10 +293,13 @@ 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
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
 @dirrm share/gnome/deskbar-applet/specs
 @dirrm share/gnome/deskbar-applet/art
 @dirrm share/gnome/deskbar-applet
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/updater
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/window
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/entriac
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui