- Update to 0.31.1

PR:		ports/73947
Submitted by:	Franz Klammer <klammer@webonaut.com> (maintainer)

10 files changed, 319 insertions, 157 deletions

diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 67cba57a72d..0c8621e8d29 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gdesklets
-PORTVERSION=	0.26.2
-PORTREVISION=	2
+PORTVERSION=	0.31.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.pycage.de/download/${PORTNAME}/
 DISTNAME=	gDesklets-${PORTVERSION}
@@ -21,7 +20,7 @@ RUN_DEPENDS=	${PYXML} \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
 
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME:C/\.1//}
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	15
 USE_PYTHON=	yes
@@ -31,7 +30,8 @@ USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 
-MAN1=	gdesklets.1
+GCONF_SCHEMAS=	gdesklets-display-thumbnail.schemas
+MAN1=		gdesklets.1
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays
diff --git a/deskutils/gdesklets/distinfo b/deskutils/gdesklets/distinfo
index e43ecf22cc4..a68b950f2f4 100644
--- a/deskutils/gdesklets/distinfo
+++ b/deskutils/gdesklets/distinfo
@@ -1,2 +1,2 @@
-MD5 (gDesklets-0.26.2.tar.bz2) = f2629dcec5b198c3a8aeb8c19e4c740f
-SIZE (gDesklets-0.26.2.tar.bz2) = 400955
+MD5 (gDesklets-0.31.1.tar.bz2) = c7c0a5674a87378124b54cedc3e0f71d
+SIZE (gDesklets-0.31.1.tar.bz2) = 637182
diff --git a/deskutils/gdesklets/files/patch-data::Makefile.in b/deskutils/gdesklets/files/patch-data::Makefile.in
index 4631224af96..06dc56bff21 100644
--- a/deskutils/gdesklets/files/patch-data::Makefile.in
+++ b/deskutils/gdesklets/files/patch-data::Makefile.in
@@ -1,12 +1,17 @@
---- data/Makefile.in.orig	Mon Feb 23 09:58:01 2004
-+++ data/Makefile.in	Mon Feb 23 09:59:27 2004
-@@ -213,7 +213,8 @@
- @USERINST_TRUE@mimedir = ~/.gnome/mime-info
- mime_in_files = gdesklets.keys.in
- mime_DATA = $(mime_in_files:.keys.in=.keys) gdesklets.mime
--@USERINST_FALSE@mimeicondir = $(datadir)/icons/gnome/48x48/mimetypes
-+@USERINST_FALSE@mimeicondir = $(prefix)/share/icons/gnome/48x48/mimetypes
-+
+--- data/Makefile.in.orig	Mon Nov 15 01:17:16 2004
++++ data/Makefile.in	Mon Nov 15 01:18:12 2004
+@@ -165,12 +165,12 @@
+ desktop_in_files = gdesklets.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
  
- @USERINST_TRUE@mimeicondir = ~/.icons/gnome/48x48/mimetypes
- mimeicon_DATA = x-gdesklets-display.png
+-sharedmimedir = $(datadir)/mime
++sharedmimedir = $(prefix)/share/mime
+ sharedmimepackagedir = $(sharedmimedir)/packages
+ sharedmimepackage_in_files = gdesklets.xml.in
+ sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
+ 
+-mimeicondir = $(datadir)/icons/gnome/48x48/mimetypes
++mimeicondir = $(prefix)/share/icons/gnome/48x48/mimetypes
+ mimeicon_DATA = gnome-mime-application-x-gdesklets-display.png
+ 
+ pixmapdir = $(PIXMAPDIR)
diff --git a/deskutils/gdesklets/files/patch-display::TargetLabel.py b/deskutils/gdesklets/files/patch-display::TargetLabel.py
deleted file mode 100644
index 9c355009b2c..00000000000
--- a/deskutils/gdesklets/files/patch-display::TargetLabel.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- display/TargetLabel.py.orig	Mon Feb 23 09:55:46 2004
-+++ display/TargetLabel.py	Mon Feb 23 09:56:50 2004
-@@ -103,7 +103,14 @@
- 
- # determine the locale
- import commands
-+import string
- fail, CHARMAP = commands.getstatusoutput("locale charmap")
-+if (fail or not CHARMAP):
-+    fail, CHARMAP = commands.getstatusoutput("echo $MM_CHARSET")
-+    if (fail or not CHARMAP):
-+        fail, CHARMAP = commands.getstatusoutput("echo $LANG")
-+        CHARMAP = CHARMAP[string.find(CHARMAP, ".")+1:len(CHARMAP)]
-+
- if (fail or not CHARMAP):
-     print "Could not detect character encoding."
-     CHARMAP = "ASCII"
diff --git a/deskutils/gdesklets/files/patch-libdesklets::Disk.py b/deskutils/gdesklets/files/patch-libdesklets::Disk.py
deleted file mode 100644
index 077f487b617..00000000000
--- a/deskutils/gdesklets/files/patch-libdesklets::Disk.py
+++ /dev/null
@@ -1,67 +0,0 @@
---- libdesklets/Disk.py.orig	Fri Feb 20 14:29:07 2004
-+++ libdesklets/Disk.py	Fri Apr 30 15:50:42 2004
-@@ -1,6 +1,7 @@
- import glibtop
- import polling
--
-+import os
-+import statvfs
- 
- class Disk:
- 
-@@ -21,14 +22,19 @@
-     #
-     def __poll_partitions(self):
- 
--        data = glibtop.get_mountlist(0)
-+        fd = os.popen("mount -p")
-+        data = fd.readlines()
-+        fd.close()
-+
-         partitions = []
--        for size, device, mpoint, fstype in data:
--            if (fstype in ("ext2", "ext3", "msdos", "vfat", "ntfs", "hpfs"
--                           "jfs", "reiserfs", "xfs", "qnx4", "adfs", "ffs",
--                           "hfs", "befs", "bfs", "efs", "iso9660", "minix",
--                           "sysv", "coda", "nfs", "udf", "ufs", "xiafs")):
--                partitions.append((device, mpoint))
-+        for lines in data:
-+           fields = lines.strip().replace("\t", " ").split()
-+           if (fields[2] in ("ext2", "ext3", "msdos", "vfat", "ntfs", "hpfs"
-+                          "jfs", "reiserfs", "xfs", "qnx4", "adfs", "ffs",
-+                          "hfs", "befs", "bfs", "efs", "iso9660", "minix",
-+                          "sysv", "coda", "nfs", "udf", "ufs", "xiafs")):
-+               partitions.append((fields[0], fields[1]))
-+
- 
-         return partitions
-             
-@@ -43,15 +49,19 @@
-     #:/function
-     #
-     def __poll_size(self, partition):
--
--        blocks, bfree, bavail, files, ffree = glibtop.get_fsusage(partition)
--        free = float(bfree * 512)
--        total = float(blocks * 512)
--        used = total - free
--
--        return (total, used)#, free)
--
--
-+                                                                                                                                
-+          try:
-+              statvfs_data = os.statvfs(partition)
-+              free = float(statvfs_data[statvfs.F_BFREE] * statvfs_data[statvfs.F_FRSIZE])
-+              total = float(statvfs_data[statvfs.F_BLOCKS] * statvfs_data[statvfs.F_FRSIZE])
-+          except:
-+              blocks, bfree, bavail, files, ffree = glibtop.get_fsusage(partition)
-+              free = float(bfree * 512)
-+              total = float(blocks * 512)
-+                                                                                                                                
-+          used = total - free
-+                                                                                                                                
-+          return (total, used)#, free)
- 
-     #
-     #:function get_fs | partition | Returns the filesystem for the given
diff --git a/deskutils/gdesklets/files/patch-libdesklets::Network.py b/deskutils/gdesklets/files/patch-libdesklets::Network.py
deleted file mode 100644
index 1fd0d059ee8..00000000000
--- a/deskutils/gdesklets/files/patch-libdesklets::Network.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdesklets/Network.py.orig	Mon Feb 23 11:01:31 2004
-+++ libdesklets/Network.py	Mon Feb 23 11:01:55 2004
-@@ -142,7 +142,7 @@
-         
-         if ("FreeBSD" == platform or "NetBSD" == platform):
-             fd = os.popen("ifconfig -a | grep mtu", "r")
--            data = fs.readlines()
-+            data = fd.readlines()
-             fd.close()
- 
-             for lines in data:
diff --git a/deskutils/gdesklets/files/patch-libdesklets::system::Makefile.in b/deskutils/gdesklets/files/patch-libdesklets::system::Makefile.in
new file mode 100644
index 00000000000..4643bf0cfd5
--- /dev/null
+++ b/deskutils/gdesklets/files/patch-libdesklets::system::Makefile.in
@@ -0,0 +1,11 @@
+--- libdesklets/system/Makefile.in.orig	Mon Jul 12 12:55:59 2004
++++ libdesklets/system/Makefile.in	Mon Jul 12 12:56:12 2004
+@@ -775,7 +775,7 @@
+ 	$(CC) -o $@ $(GLIBTOP_CFLAGS) $(GLIBTOP_LIBS) $^
+ 
+ glibtop_wrap.c glibtop.py: glibtop.i glibtop.c
+-	swig -python glibtop.i
++#	swig -python glibtop.i
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/deskutils/gdesklets/files/patch-libdesklets_Disk.py b/deskutils/gdesklets/files/patch-libdesklets_Disk.py
new file mode 100644
index 00000000000..28eaf2395ef
--- /dev/null
+++ b/deskutils/gdesklets/files/patch-libdesklets_Disk.py
@@ -0,0 +1,22 @@
+--- libdesklets/Disk.py.orig	Mon Aug 16 12:43:05 2004
++++ libdesklets/Disk.py	Mon Aug 16 12:43:10 2004
+@@ -43,13 +43,14 @@
+     #:/function
+     #
+     def __poll_size(self, partition):
+-
+-        blocks, bfree, bavail, files, ffree = glibtop.get_fsusage(partition)[:5]
+-        free = float(bfree * 512)
+-        total = float(blocks * 512)
++	# code stolen from libgtop.py::fsusage()
++        buf = glibtop.get_fsusage(partition)
++        bsize = buf[glibtop.FSUSAGE_BLOCK_SIZE]
++        free = float(buf[glibtop.FSUSAGE_BFREE] * bsize)
++        total = float(buf[glibtop.FSUSAGE_BLOCKS] * bsize)
+         used = total - free
+ 
+-        return (total, used)#, free)
++        return (total, used)
+ 
+ 
+ 
diff --git a/deskutils/gdesklets/files/patch-utils-utils.c b/deskutils/gdesklets/files/patch-utils-utils.c
new file mode 100644
index 00000000000..5cddda29d36
--- /dev/null
+++ b/deskutils/gdesklets/files/patch-utils-utils.c
@@ -0,0 +1,19 @@
+--- utils/utils.c.orig	Wed Oct 20 16:46:10 2004
++++ utils/utils.c	Mon Nov 15 01:02:06 2004
+@@ -12,14 +12,14 @@
+ 
+   if(G_UNLIKELY(PyGObject_Type == NULL))
+     {
+-      PyObject *module, *modict;
++      PyObject *module, *modict, *moddict;
+ 
+       module = PyImport_ImportModule("gobject");
+ 
+       if(!module)
+ 	goto err_gobject;
+ 
+-      PyObject *moddict = PyModule_GetDict(module);
++      moddict = PyModule_GetDict(module);
+ 
+       PyGObject_Type = (PyTypeObject *) PyDict_GetItemString(moddict, "GObject");
+ 
diff --git a/deskutils/gdesklets/pkg-plist b/deskutils/gdesklets/pkg-plist
index ce3deb10578..e6d6f5c6371 100644
--- a/deskutils/gdesklets/pkg-plist
+++ b/deskutils/gdesklets/pkg-plist
@@ -1,32 +1,54 @@
 bin/gdesklets
 bin/gdesklets-display-thumbnailer
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gdesklets-display-thumbnail.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gdesklets-display-thumbnail.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gdesklets-display-thumbnail.schemas > /dev/null || /usr/bin/true
-libdata/pkgconfig/gdesklets-core.pc
-share/gnome/application-registry/gdesklets.applications
 share/gnome/applications/gdesklets.desktop
+share/gnome/gdesklets/Controls/Calendar/ICalendar.py
+share/gnome/gdesklets/Controls/Calendar/__init__.py
+share/gnome/gdesklets/Controls/Sensors/ISensor.py
+share/gnome/gdesklets/Controls/Sensors/__init__.py
+share/gnome/gdesklets/Controls/System/ISystem.py
+share/gnome/gdesklets/Controls/System/__init__.py
+share/gnome/gdesklets/Controls/Time/ITime.py
+share/gnome/gdesklets/Controls/Time/__init__.py
+share/gnome/gdesklets/Controls/URI/IURI.py
+share/gnome/gdesklets/Controls/URI/__init__.py
+share/gnome/gdesklets/Controls/__init__.py
+share/gnome/gdesklets/NullObject.py
 share/gnome/gdesklets/Sensors/External/__init__.py
 share/gnome/gdesklets/Sensors/FontSelector/__init__.py
+share/gnome/gdesklets/config/ConfigBoolean.py
+share/gnome/gdesklets/config/ConfigBoolean.pyc
+share/gnome/gdesklets/config/ConfigColor.py
+share/gnome/gdesklets/config/ConfigColor.pyc
+share/gnome/gdesklets/config/ConfigDialog.py
+share/gnome/gdesklets/config/ConfigDialog.pyc
+share/gnome/gdesklets/config/ConfigEnum.py
+share/gnome/gdesklets/config/ConfigEnum.pyc
+share/gnome/gdesklets/config/ConfigFloat.py
+share/gnome/gdesklets/config/ConfigFloat.pyc
+share/gnome/gdesklets/config/ConfigFont.py
+share/gnome/gdesklets/config/ConfigFont.pyc
+share/gnome/gdesklets/config/ConfigInteger.py
+share/gnome/gdesklets/config/ConfigInteger.pyc
 share/gnome/gdesklets/config/ConfigManager.py
 share/gnome/gdesklets/config/ConfigManager.pyc
-share/gnome/gdesklets/config/DummyBackend.py
-share/gnome/gdesklets/config/DummyBackend.pyc
+share/gnome/gdesklets/config/ConfigSettings.py
+share/gnome/gdesklets/config/ConfigSettings.pyc
+share/gnome/gdesklets/config/ConfigString.py
+share/gnome/gdesklets/config/ConfigString.pyc
+share/gnome/gdesklets/config/ConfigTitle.py
+share/gnome/gdesklets/config/ConfigTitle.pyc
+share/gnome/gdesklets/config/ConfigURI.py
+share/gnome/gdesklets/config/ConfigURI.pyc
+share/gnome/gdesklets/config/ConfigWidget.py
+share/gnome/gdesklets/config/ConfigWidget.pyc
 share/gnome/gdesklets/config/GConfBackend.py
 share/gnome/gdesklets/config/GConfBackend.pyc
 share/gnome/gdesklets/config/__init__.py
 share/gnome/gdesklets/config/__init__.pyc
-share/gnome/gdesklets/config/migration.py
-share/gnome/gdesklets/config/migration.pyc
 share/gnome/gdesklets/config/settings.py
 share/gnome/gdesklets/config/settings.pyc
+share/gnome/gdesklets/data/about.png
 share/gnome/gdesklets/data/gdesklets.png
-share/gnome/gdesklets/desktop/BGWatcher.py
-share/gnome/gdesklets/desktop/BGWatcher.pyc
-share/gnome/gdesklets/desktop/GlassWindow.py
-share/gnome/gdesklets/desktop/GlassWindow.pyc
-share/gnome/gdesklets/desktop/__init__.py
-share/gnome/gdesklets/desktop/__init__.pyc
 share/gnome/gdesklets/display/ContainerTarget.py
 share/gnome/gdesklets/display/ContainerTarget.pyc
 share/gnome/gdesklets/display/DataTarget.py
@@ -39,6 +61,8 @@ share/gnome/gdesklets/display/DisplayContainer.py
 share/gnome/gdesklets/display/DisplayContainer.pyc
 share/gnome/gdesklets/display/DisplayTarget.py
 share/gnome/gdesklets/display/DisplayTarget.pyc
+share/gnome/gdesklets/display/GlassWindow.py
+share/gnome/gdesklets/display/GlassWindow.pyc
 share/gnome/gdesklets/display/Plug.py
 share/gnome/gdesklets/display/Plug.pyc
 share/gnome/gdesklets/display/TargetAlignment.py
@@ -49,6 +73,8 @@ share/gnome/gdesklets/display/TargetBonoboControl.py
 share/gnome/gdesklets/display/TargetBonoboControl.pyc
 share/gnome/gdesklets/display/TargetCanvas.py
 share/gnome/gdesklets/display/TargetCanvas.pyc
+share/gnome/gdesklets/display/TargetEntry.py
+share/gnome/gdesklets/display/TargetEntry.pyc
 share/gnome/gdesklets/display/TargetExpander.py
 share/gnome/gdesklets/display/TargetExpander.pyc
 share/gnome/gdesklets/display/TargetFrame.py
@@ -63,20 +89,22 @@ share/gnome/gdesklets/display/TargetImage.py
 share/gnome/gdesklets/display/TargetImage.pyc
 share/gnome/gdesklets/display/TargetLabel.py
 share/gnome/gdesklets/display/TargetLabel.pyc
+share/gnome/gdesklets/display/TargetMenu.py
+share/gnome/gdesklets/display/TargetMenu.pyc
+share/gnome/gdesklets/display/TargetMenuItem.py
+share/gnome/gdesklets/display/TargetMenuItem.pyc
 share/gnome/gdesklets/display/TargetPlotter.py
 share/gnome/gdesklets/display/TargetPlotter.pyc
-share/gnome/gdesklets/display/TargetPopup.py
-share/gnome/gdesklets/display/TargetPopup.pyc
 share/gnome/gdesklets/display/Window.py
 share/gnome/gdesklets/display/Window.pyc
-share/gnome/gdesklets/display/WindowSnapper.py
-share/gnome/gdesklets/display/WindowSnapper.pyc
 share/gnome/gdesklets/display/__init__.py
 share/gnome/gdesklets/display/__init__.pyc
 share/gnome/gdesklets/display/layouters.py
 share/gnome/gdesklets/display/layouters.pyc
 share/gnome/gdesklets/display/targetregistry.py
 share/gnome/gdesklets/display/targetregistry.pyc
+share/gnome/gdesklets/factory/ControlFactory.py
+share/gnome/gdesklets/factory/ControlFactory.pyc
 share/gnome/gdesklets/factory/DisplayFactory.py
 share/gnome/gdesklets/factory/DisplayFactory.pyc
 share/gnome/gdesklets/factory/SensorFactory.py
@@ -84,10 +112,10 @@ share/gnome/gdesklets/factory/SensorFactory.pyc
 share/gnome/gdesklets/factory/__init__.py
 share/gnome/gdesklets/factory/__init__.pyc
 share/gnome/gdesklets/gdesklets
+share/gnome/gdesklets/gdesklets-daemon
+share/gnome/gdesklets/gdesklets-shell
 share/gnome/gdesklets/libdesklets/CPU.py
 share/gnome/gdesklets/libdesklets/CPU.pyc
-share/gnome/gdesklets/libdesklets/Convert.py
-share/gnome/gdesklets/libdesklets/Convert.pyc
 share/gnome/gdesklets/libdesklets/Disk.py
 share/gnome/gdesklets/libdesklets/Disk.pyc
 share/gnome/gdesklets/libdesklets/Memory.py
@@ -98,22 +126,69 @@ share/gnome/gdesklets/libdesklets/Sys.py
 share/gnome/gdesklets/libdesklets/Sys.pyc
 share/gnome/gdesklets/libdesklets/__init__.py
 share/gnome/gdesklets/libdesklets/__init__.pyc
-share/gnome/gdesklets/libdesklets/_glibtopmodule.so
-share/gnome/gdesklets/libdesklets/glibtop.py
-share/gnome/gdesklets/libdesklets/glibtop.pyc
+share/gnome/gdesklets/libdesklets/controls/__init__.py
+share/gnome/gdesklets/libdesklets/controls/__init__.pyc
+share/gnome/gdesklets/libdesklets/convert.py
+share/gnome/gdesklets/libdesklets/convert.pyc
 share/gnome/gdesklets/libdesklets/polling.py
 share/gnome/gdesklets/libdesklets/polling.pyc
+share/gnome/gdesklets/libdesklets/system/Arch.py
+share/gnome/gdesklets/libdesklets/system/Arch.pyc
+share/gnome/gdesklets/libdesklets/system/ArchFactory.py
+share/gnome/gdesklets/libdesklets/system/ArchFactory.pyc
+share/gnome/gdesklets/libdesklets/system/CPU.py
+share/gnome/gdesklets/libdesklets/system/CPU.pyc
+share/gnome/gdesklets/libdesklets/system/Device.py
+share/gnome/gdesklets/libdesklets/system/Device.pyc
+share/gnome/gdesklets/libdesklets/system/FreeBSD/Generic.py
+share/gnome/gdesklets/libdesklets/system/FreeBSD/Generic.pyc
+share/gnome/gdesklets/libdesklets/system/FreeBSD/__init__.py
+share/gnome/gdesklets/libdesklets/system/FreeBSD/__init__.pyc
+share/gnome/gdesklets/libdesklets/system/Linux/Generic.py
+share/gnome/gdesklets/libdesklets/system/Linux/Generic.pyc
+share/gnome/gdesklets/libdesklets/system/Linux/PPC.py
+share/gnome/gdesklets/libdesklets/system/Linux/PPC.pyc
+share/gnome/gdesklets/libdesklets/system/Linux/Sparc.py
+share/gnome/gdesklets/libdesklets/system/Linux/Sparc.pyc
+share/gnome/gdesklets/libdesklets/system/Linux/X86.py
+share/gnome/gdesklets/libdesklets/system/Linux/X86.pyc
+share/gnome/gdesklets/libdesklets/system/Linux/__init__.py
+share/gnome/gdesklets/libdesklets/system/Linux/__init__.pyc
+share/gnome/gdesklets/libdesklets/system/Net.py
+share/gnome/gdesklets/libdesklets/system/Net.pyc
+share/gnome/gdesklets/libdesklets/system/NetBSD/Generic.py
+share/gnome/gdesklets/libdesklets/system/NetBSD/Generic.pyc
+share/gnome/gdesklets/libdesklets/system/NetBSD/__init__.py
+share/gnome/gdesklets/libdesklets/system/NetBSD/__init__.pyc
+share/gnome/gdesklets/libdesklets/system/OpenBSD/Generic.py
+share/gnome/gdesklets/libdesklets/system/OpenBSD/Generic.pyc
+share/gnome/gdesklets/libdesklets/system/OpenBSD/__init__.py
+share/gnome/gdesklets/libdesklets/system/OpenBSD/__init__.pyc
+share/gnome/gdesklets/libdesklets/system/Swap.py
+share/gnome/gdesklets/libdesklets/system/Swap.pyc
+share/gnome/gdesklets/libdesklets/system/__init__.py
+share/gnome/gdesklets/libdesklets/system/__init__.pyc
+share/gnome/gdesklets/libdesklets/system/_glibtopmodule.so
+share/gnome/gdesklets/libdesklets/system/glibtop.py
+share/gnome/gdesklets/libdesklets/system/glibtop.pyc
+share/gnome/gdesklets/libdesklets/system/libgtop.py
+share/gnome/gdesklets/libdesklets/system/libgtop.pyc
 share/gnome/gdesklets/locale/ar/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/az/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/locale/bg/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/ca/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/cs/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/de/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/el/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/locale/en_CA/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/locale/en_GB/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/es/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/eu/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/fr/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/he/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/hr/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/locale/hu/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/locale/is/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/it/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/ja/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/ko/LC_MESSAGES/gdesklets.mo
@@ -130,69 +205,171 @@ share/gnome/gdesklets/locale/sr/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/sr@Latn/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/sv/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/tr/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/main/CmdLineParser.py
-share/gnome/gdesklets/main/CmdLineParser.pyc
+share/gnome/gdesklets/locale/uk/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/main/AboutDialog.py
+share/gnome/gdesklets/main/AboutDialog.pyc
+share/gnome/gdesklets/main/Control.py
+share/gnome/gdesklets/main/Control.pyc
+share/gnome/gdesklets/main/DisplayList.py
+share/gnome/gdesklets/main/DisplayList.pyc
+share/gnome/gdesklets/main/LogViewer.py
+share/gnome/gdesklets/main/LogViewer.pyc
+share/gnome/gdesklets/main/MetaData.py
+share/gnome/gdesklets/main/MetaData.pyc
+share/gnome/gdesklets/main/RemoteSocket.py
+share/gnome/gdesklets/main/RemoteSocket.pyc
 share/gnome/gdesklets/main/Starter.py
 share/gnome/gdesklets/main/Starter.pyc
+share/gnome/gdesklets/main/TrayIcon.py
+share/gnome/gdesklets/main/TrayIcon.pyc
 share/gnome/gdesklets/main/__init__.py
 share/gnome/gdesklets/main/__init__.pyc
-share/gnome/gdesklets/main/admin.py
-share/gnome/gdesklets/main/admin.pyc
-share/gnome/gdesklets/sensor/DefaultSensor.py
-share/gnome/gdesklets/sensor/DefaultSensor.pyc
-share/gnome/gdesklets/sensor/Menu.py
-share/gnome/gdesklets/sensor/Menu.pyc
+share/gnome/gdesklets/main/client.py
+share/gnome/gdesklets/main/client.pyc
+share/gnome/gdesklets/main/remotecommands.py
+share/gnome/gdesklets/main/remotecommands.pyc
+share/gnome/gdesklets/plugin/Interface.py
+share/gnome/gdesklets/plugin/Permission.py
+share/gnome/gdesklets/plugin/PluginRegistry.py
+share/gnome/gdesklets/plugin/__init__.py
+share/gnome/gdesklets/scripting/ControlWrapper.py
+share/gnome/gdesklets/scripting/Script.py
+share/gnome/gdesklets/scripting/TargetWrapper.py
+share/gnome/gdesklets/scripting/Vault.py
+share/gnome/gdesklets/scripting/__init__.py
+share/gnome/gdesklets/sensor/MetaSensor.py
+share/gnome/gdesklets/sensor/MetaSensor.pyc
 share/gnome/gdesklets/sensor/Sensor.py
 share/gnome/gdesklets/sensor/Sensor.pyc
 share/gnome/gdesklets/sensor/SensorConfigurator.py
 share/gnome/gdesklets/sensor/SensorConfigurator.pyc
 share/gnome/gdesklets/sensor/__init__.py
 share/gnome/gdesklets/sensor/__init__.pyc
+share/gnome/gdesklets/shell/BookmarkList.py
+share/gnome/gdesklets/shell/ItemBrowser.py
+share/gnome/gdesklets/shell/ListView.py
+share/gnome/gdesklets/shell/Plugin.py
+share/gnome/gdesklets/shell/PluginRegistry.py
+share/gnome/gdesklets/shell/PluginWrapper.py
+share/gnome/gdesklets/shell/SearchBar.py
+share/gnome/gdesklets/shell/__init__.py
+share/gnome/gdesklets/shell/interfaces/Browser.py
+share/gnome/gdesklets/shell/interfaces/Collection.py
+share/gnome/gdesklets/shell/interfaces/Installer.py
+share/gnome/gdesklets/shell/interfaces/Menu.py
+share/gnome/gdesklets/shell/interfaces/Shell.py
+share/gnome/gdesklets/shell/interfaces/Status.py
+share/gnome/gdesklets/shell/interfaces/View.py
+share/gnome/gdesklets/shell/interfaces/Widget.py
+share/gnome/gdesklets/shell/interfaces/__init__.py
+share/gnome/gdesklets/shell/interfaces/gDeskletsClient.py
+share/gnome/gdesklets/shell/plugins/ControlBrowser/ControlInspector.py
+share/gnome/gdesklets/shell/plugins/ControlBrowser/__init__.py
+share/gnome/gdesklets/shell/plugins/ControlBrowser/author.png
+share/gnome/gdesklets/shell/plugins/ControlBrowser/control.png
+share/gnome/gdesklets/shell/plugins/ControlBrowser/folder.png
+share/gnome/gdesklets/shell/plugins/ControlBrowser/interface.png
+share/gnome/gdesklets/shell/plugins/ControlCollection/__init__.py
+share/gnome/gdesklets/shell/plugins/ControlsView/__init__.py
+share/gnome/gdesklets/shell/plugins/DisplayBrowser/__init__.py
+share/gnome/gdesklets/shell/plugins/DisplayBrowser/author.png
+share/gnome/gdesklets/shell/plugins/DisplayBrowser/folder.png
+share/gnome/gdesklets/shell/plugins/DisplayCollection/__init__.py
+share/gnome/gdesklets/shell/plugins/DisplayView/__init__.py
+share/gnome/gdesklets/shell/plugins/Help/TipOfTheDay.py
+share/gnome/gdesklets/shell/plugins/Help/__init__.py
+share/gnome/gdesklets/shell/plugins/Help/tips.py
+share/gnome/gdesklets/shell/plugins/Menu/__init__.py
+share/gnome/gdesklets/shell/plugins/PackageInstaller/Downloader.py
+share/gnome/gdesklets/shell/plugins/PackageInstaller/Package.py
+share/gnome/gdesklets/shell/plugins/PackageInstaller/__init__.py
+share/gnome/gdesklets/shell/plugins/PackageInstaller/download.png
+share/gnome/gdesklets/shell/plugins/Profiles/__init__.py
+share/gnome/gdesklets/shell/plugins/Shell/__init__.py
+share/gnome/gdesklets/shell/plugins/StatusBar/__init__.py
+share/gnome/gdesklets/shell/plugins/ViewSwitch/__init__.py
+share/gnome/gdesklets/shell/plugins/gDeskletsClient/__init__.py
+share/gnome/gdesklets/test-control.py
+share/gnome/gdesklets/utils/BGWatcher.py
+share/gnome/gdesklets/utils/BGWatcher.pyc
 share/gnome/gdesklets/utils/BinTree.py
 share/gnome/gdesklets/utils/BinTree.pyc
 share/gnome/gdesklets/utils/FileWatcher.py
 share/gnome/gdesklets/utils/FileWatcher.pyc
 share/gnome/gdesklets/utils/GConfWatcher.py
 share/gnome/gdesklets/utils/GConfWatcher.pyc
-share/gnome/gdesklets/utils/Hash2D.py
-share/gnome/gdesklets/utils/Hash2D.pyc
 share/gnome/gdesklets/utils/Observable.py
 share/gnome/gdesklets/utils/Observable.pyc
+share/gnome/gdesklets/utils/QueryParser.py
+share/gnome/gdesklets/utils/QueryParser.pyc
+share/gnome/gdesklets/utils/Struct.py
+share/gnome/gdesklets/utils/Struct.pyc
 share/gnome/gdesklets/utils/TargetSettings.py
 share/gnome/gdesklets/utils/TargetSettings.pyc
 share/gnome/gdesklets/utils/TilingImage.py
 share/gnome/gdesklets/utils/TilingImage.pyc
+share/gnome/gdesklets/utils/Trie.py
+share/gnome/gdesklets/utils/Trie.pyc
 share/gnome/gdesklets/utils/TypeConverter.py
 share/gnome/gdesklets/utils/TypeConverter.pyc
+share/gnome/gdesklets/utils/Unit.py
+share/gnome/gdesklets/utils/Unit.pyc
+share/gnome/gdesklets/utils/WindowSnapper.py
+share/gnome/gdesklets/utils/WindowSnapper.pyc
 share/gnome/gdesklets/utils/__init__.py
 share/gnome/gdesklets/utils/__init__.pyc
-share/gnome/gdesklets/utils/_ewmhmodule.so
-share/gnome/gdesklets/utils/_systraymodule.so
 share/gnome/gdesklets/utils/actionparser.py
 share/gnome/gdesklets/utils/actionparser.pyc
 share/gnome/gdesklets/utils/datatypes.py
 share/gnome/gdesklets/utils/datatypes.pyc
 share/gnome/gdesklets/utils/dialog.py
 share/gnome/gdesklets/utils/dialog.pyc
+share/gnome/gdesklets/utils/ewmh.so
 share/gnome/gdesklets/utils/i18n.py
 share/gnome/gdesklets/utils/i18n.pyc
-share/gnome/gdesklets/utils/installer.py
-share/gnome/gdesklets/utils/installer.pyc
+share/gnome/gdesklets/utils/libutils.a
+share/gnome/gdesklets/utils/libutils.so
 share/gnome/gdesklets/utils/pwstore.py
 share/gnome/gdesklets/utils/pwstore.pyc
 share/gnome/gdesklets/utils/singleton.py
 share/gnome/gdesklets/utils/singleton.pyc
-share/gnome/gdesklets/utils/systray.py
-share/gnome/gdesklets/utils/systray.pyc
+share/gnome/gdesklets/utils/svg.so
+share/gnome/gdesklets/utils/systray.so
+share/gnome/gdesklets/utils/tiling.so
 share/gnome/gdesklets/utils/vfs.py
 share/gnome/gdesklets/utils/vfs.pyc
-share/gnome/mime-info/gdesklets.keys
-share/gnome/mime-info/gdesklets.mime
+share/gnome/gdesklets/utils/wallpaper.py
+share/gnome/gdesklets/utils/wallpaper.pyc
+share/gnome/gdesklets/utils/xdr.py
+share/gnome/gdesklets/utils/xdr.pyc
 share/gnome/pixmaps/gdesklets.png
-share/icons/gnome/48x48/mimetypes/x-gdesklets-display.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gdesklets-display.png
+share/mime/application/x-gdesklets-display.xml
+share/mime/packages/gdesklets.xml
 @dirrm share/gnome/gdesklets/utils
+@dirrm share/gnome/gdesklets/shell/plugins/gDeskletsClient
+@dirrm share/gnome/gdesklets/shell/plugins/ViewSwitch
+@dirrm share/gnome/gdesklets/shell/plugins/StatusBar
+@dirrm share/gnome/gdesklets/shell/plugins/Shell
+@dirrm share/gnome/gdesklets/shell/plugins/Profiles
+@dirrm share/gnome/gdesklets/shell/plugins/PackageInstaller
+@dirrm share/gnome/gdesklets/shell/plugins/Menu
+@dirrm share/gnome/gdesklets/shell/plugins/Help
+@dirrm share/gnome/gdesklets/shell/plugins/DisplayView
+@dirrm share/gnome/gdesklets/shell/plugins/DisplayCollection
+@dirrm share/gnome/gdesklets/shell/plugins/DisplayBrowser
+@dirrm share/gnome/gdesklets/shell/plugins/ControlsView
+@dirrm share/gnome/gdesklets/shell/plugins/ControlCollection
+@dirrm share/gnome/gdesklets/shell/plugins/ControlBrowser
+@dirrm share/gnome/gdesklets/shell/plugins
+@dirrm share/gnome/gdesklets/shell/interfaces
+@dirrm share/gnome/gdesklets/shell
 @dirrm share/gnome/gdesklets/sensor
+@dirrm share/gnome/gdesklets/scripting
+@dirrm share/gnome/gdesklets/plugin
 @dirrm share/gnome/gdesklets/main
+@dirrm share/gnome/gdesklets/locale/uk/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/uk
 @dirrm share/gnome/gdesklets/locale/tr/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/tr
 @dirrm share/gnome/gdesklets/locale/sv/LC_MESSAGES
@@ -225,6 +402,10 @@ share/icons/gnome/48x48/mimetypes/x-gdesklets-display.png
 @dirrm share/gnome/gdesklets/locale/ja
 @dirrm share/gnome/gdesklets/locale/it/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/it
+@dirrm share/gnome/gdesklets/locale/is/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/is
+@dirrm share/gnome/gdesklets/locale/hu/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/hu
 @dirrm share/gnome/gdesklets/locale/hr/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/hr
 @dirrm share/gnome/gdesklets/locale/he/LC_MESSAGES
@@ -235,6 +416,10 @@ share/icons/gnome/48x48/mimetypes/x-gdesklets-display.png
 @dirrm share/gnome/gdesklets/locale/eu
 @dirrm share/gnome/gdesklets/locale/es/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/es
+@dirrm share/gnome/gdesklets/locale/en_GB/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/en_GB
+@dirrm share/gnome/gdesklets/locale/en_CA/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/en_CA
 @dirrm share/gnome/gdesklets/locale/el/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/el
 @dirrm share/gnome/gdesklets/locale/de/LC_MESSAGES
@@ -243,19 +428,34 @@ share/icons/gnome/48x48/mimetypes/x-gdesklets-display.png
 @dirrm share/gnome/gdesklets/locale/cs
 @dirrm share/gnome/gdesklets/locale/ca/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/ca
+@dirrm share/gnome/gdesklets/locale/bg/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/bg
 @dirrm share/gnome/gdesklets/locale/az/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/az
 @dirrm share/gnome/gdesklets/locale/ar/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/ar
 @dirrm share/gnome/gdesklets/locale
+@dirrm share/gnome/gdesklets/libdesklets/system/OpenBSD
+@dirrm share/gnome/gdesklets/libdesklets/system/NetBSD
+@dirrm share/gnome/gdesklets/libdesklets/system/Linux
+@dirrm share/gnome/gdesklets/libdesklets/system/FreeBSD
+@dirrm share/gnome/gdesklets/libdesklets/system
+@dirrm share/gnome/gdesklets/libdesklets/controls
 @dirrm share/gnome/gdesklets/libdesklets
 @dirrm share/gnome/gdesklets/factory
 @dirrm share/gnome/gdesklets/display
-@dirrm share/gnome/gdesklets/desktop
 @dirrm share/gnome/gdesklets/data
 @dirrm share/gnome/gdesklets/config
 @dirrm share/gnome/gdesklets/Sensors/FontSelector
 @dirrm share/gnome/gdesklets/Sensors/External
 @dirrm share/gnome/gdesklets/Sensors
 @dirrm share/gnome/gdesklets/Displays
-@dirrm share/gnome/gdesklets
+@dirrm share/gnome/gdesklets/Controls/URI
+@dirrm share/gnome/gdesklets/Controls/Time
+@dirrm share/gnome/gdesklets/Controls/System
+@dirrm share/gnome/gdesklets/Controls/Sensors
+@dirrm share/gnome/gdesklets/Controls/Calendar
+@dirrm share/gnome/gdesklets/Controls
+@dirrm share/gnome/gdesklets/
+@exec update-mime-database %D/share/mime
+@unexec update-mime-database %D/share/mime