Current state

diff --git a/X11/xinit.d/libcanberra-gtk-module.sh b/X11/xinit.d/libcanberra-gtk-module.sh
new file mode 100644 (file)
index 0000000..63c16af
--- /dev/null
+++ b/X11/xinit.d/libcanberra-gtk-module.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# to be sourced
+
+case "$SESSION" in
+       GNOME)
+               # Done by gnome-settings-daemon
+               ;;
+       *)
+               if [ -z "$GTK_MODULES" ] ; then
+                       GTK_MODULES="canberra-gtk-module"
+               else
+                       GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
+               fi
+               export GTK_MODULES
+               ;;
+esac

diff --git a/csh.env b/csh.env
index 2ad6657fd36f3593b067bd005a29861452029a8d..0203b798b3055d2808eb6df235daa5f7f2f6ef05 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -42,7 +42,6 @@ setenv PYTHONDOCS_3_3 '/usr/share/doc/python-docs-3.3.2/html/library'
 setenv QT_GRAPHICSSYSTEM 'raster'
 setenv QT_PLUGIN_PATH '/usr/lib64/kde4/plugins'
 setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.3:/usr/lib64/subversion/bin'
-setenv RUBYOPT '-rauto_gem'
 setenv R_HOME '/usr/lib64/R'
 setenv VBOX_APP_HOME '/usr/lib64/virtualbox'
 setenv XDG_CONFIG_DIRS '/etc/xdg'

diff --git a/dbus-1/system.d/nm-dhcp-client.conf b/dbus-1/system.d/nm-dhcp-client.conf
deleted file mode 100644 (file)
index 0aeae60..0000000
--- a/dbus-1/system.d/nm-dhcp-client.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-        <policy user="root">
-                <allow own="org.freedesktop.nm_dhcp_client"/>
-        </policy>
-        <policy context="default">
-                <deny own="org.freedesktop.nm_dhcp_client"/>
-               <deny send_destination="org.freedesktop.nm_dhcp_client"/>
-        </policy>
-</busconfig>
-

diff --git a/dbus-1/system.d/org.freedesktop.ModemManager1.conf b/dbus-1/system.d/org.freedesktop.ModemManager1.conf
index 5c963846268f03db30f36651cf3fdde396919609..d1ea1669682f9ed17f7624755417d82c78e22732 100644 (file)
--- a/dbus-1/system.d/org.freedesktop.ModemManager1.conf
+++ b/dbus-1/system.d/org.freedesktop.ModemManager1.conf
@@ -158,7 +158,7 @@
     <!-- Protected by the Device.Control policy rule -->
     <allow send_destination="org.freedesktop.ModemManager1"
            send_interface="org.freedesktop.ModemManager1.Modem.Location"
-           send_member="Enable"/>
+           send_member="Setup"/>
 
     <!-- Protected by the Location policy rule -->
     <allow send_destination="org.freedesktop.ModemManager1"

diff --git a/dbus-1/system.d/org.freedesktop.NetworkManager.conf b/dbus-1/system.d/org.freedesktop.NetworkManager.conf
index db68374cc8a72ff034d24d1272ba8a88a6660f54..bdfe3e67736238e359b18bab4134f3b8708e7c76 100644 (file)
--- a/dbus-1/system.d/org.freedesktop.NetworkManager.conf
+++ b/dbus-1/system.d/org.freedesktop.NetworkManager.conf
@@ -26,93 +26,99 @@
                 <allow send_destination="org.freedesktop.NetworkManager.ssh"/>
                 <allow send_destination="org.freedesktop.NetworkManager.iodine"/>
         </policy>
-        <policy at_console="true">
-                <allow send_destination="org.freedesktop.NetworkManager"/>
+        <policy context="default">
+                <deny own="org.freedesktop.NetworkManager"/>
 
+                <deny send_destination="org.freedesktop.NetworkManager"/>
+
+               <!-- Basic D-Bus API stuff -->
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.DBus.Introspectable"/>
-
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.DBus.Properties"/>
 
+               <!-- Devices (read-only properties, no methods) -->
                 <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager"/>
-
+                       send_interface="org.freedesktop.NetworkManager.Device.Adsl"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.AccessPoint"/>
-
+                       send_interface="org.freedesktop.NetworkManager.Device.Bond"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Connection.Active"/>
-
+                       send_interface="org.freedesktop.NetworkManager.Device.Bridge"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Modem"/>
-
+                       send_interface="org.freedesktop.NetworkManager.Device.Bluetooth"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.Device.Wired"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Device.Generic"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Device.Gre"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Device.Infiniband"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Device.Macvlan"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Device.Modem"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Device.OlpcMesh"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Device.Team"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Device.Tun"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Device.Veth"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Device.Vlan"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.WiMax.Nsp"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.AccessPoint"/>
 
+               <!-- Devices (read-only, no security required) -->
                 <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Serial"/>
+                       send_interface="org.freedesktop.NetworkManager.Device.WiMax"/>
 
+               <!-- Devices (read/write, secured with PolicyKit) -->
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.Device.Wireless"/>
-
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.Device"/>
 
+               <!-- Core stuff (read-only properties, no methods) -->
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Connection.Active"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.DHCP4Config"/>
-
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.DHCP6Config"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.IP4Config"/>
-
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.IP6Config"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
 
+               <!-- Core stuff (read/write, secured with PolicyKit) -->
                 <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.AgentManager"/>
-
-                <deny send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager"
-                       send_member="SetLogging"/>
-
-                <deny send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager"
-                       send_member="Sleep"/>
-
-                <deny send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager"
-                       send_member="sleep"/>
-
-                <deny send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager"
-                       send_member="wake"/>
-        </policy>
-        <policy context="default">
-                <deny own="org.freedesktop.NetworkManager"/>
-
-                <deny send_destination="org.freedesktop.NetworkManager"/>
-
+                       send_interface="org.freedesktop.NetworkManager"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.Settings"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Settings.Connection"/>
 
+               <!-- Agents; secured with PolicyKit.  Any process can talk to
+                    the AgentManager API, but only NetworkManager can talk
+                    to the agents themselves. -->
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.AgentManager"/>
-
-                <deny send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager"
-                       send_member="SetLogging"/>
-
-                <deny send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager"
-                       send_member="Sleep"/>
-
-                <deny send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager"
-                       send_member="sleep"/>
-
-                <deny send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager"
-                       send_member="wake"/>
+                <deny send_interface="org.freedesktop.NetworkManager.SecretAgent"/>
+
+               <!-- Root-only functions -->
+                <deny send_interface="org.freedesktop.NetworkManager" send_member="SetLogging"/>
+                <deny send_interface="org.freedesktop.NetworkManager" send_member="Sleep"/>
+                <deny send_interface="org.freedesktop.NetworkManager.Settings" send_member="LoadConnections"/>
+                <deny send_interface="org.freedesktop.NetworkManager.Settings" send_member="ReloadConnections"/>
+                <deny send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
+                <deny send_interface="org.freedesktop.NetworkManager.PPP"/>
         </policy>
 </busconfig>
 

diff --git a/dbus-1/system.d/org.kde.kalarmrtcwake.conf b/dbus-1/system.d/org.kde.kalarmrtcwake.conf
deleted file mode 100644 (file)
index e3f2de1..0000000
--- a/dbus-1/system.d/org.kde.kalarmrtcwake.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
- 
-  <!-- Only user root can own the foo helper -->
-  <policy user="root">
-    <allow own="org.kde.kalarmrtcwake"/>
-  </policy>
- 
-</busconfig>

diff --git a/dbus-1/system.d/org.kde.nepomuk.filewatch.conf b/dbus-1/system.d/org.kde.nepomuk.filewatch.conf
deleted file mode 100644 (file)
index b134503..0000000
--- a/dbus-1/system.d/org.kde.nepomuk.filewatch.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
- 
-  <!-- Only user root can own the foo helper -->
-  <policy user="root">
-    <allow own="org.kde.nepomuk.filewatch"/>
-  </policy>
- 
-</busconfig>

diff --git a/env.d/10rubygems b/env.d/10rubygems
deleted file mode 100644 (file)
index f512216..0000000
--- a/env.d/10rubygems
+++ /dev/null
@@ -1 +0,0 @@
-RUBYOPT="-rauto_gem"

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 84b83cd7c0957800bcc5ae682883190dd342b229..582be9d545333ce4e806e385851efc6da46d1c24 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -2382,88 +2382,88 @@
                        <dir name="thumbnailers">
                                <entry name="disable_all" mtime="1335179349" schema="/schemas/desktop/gnome/thumbnailers/disable_all"/>
                                <dir name="image@x-samsung-srw">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/enable"/>
                                </dir>
                                <dir name="image@x-panasonic-rw2">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/enable"/>
                                </dir>
                                <dir name="image@x-nikon-nrw">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/enable"/>
                                </dir>
                                <dir name="image@x-sony-arw">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/enable"/>
                                </dir>
                                <dir name="image@x-sony-sr2">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/enable"/>
                                </dir>
                                <dir name="image@x-sony-srf">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/enable"/>
                                </dir>
                                <dir name="image@x-sigma-x3f">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/enable"/>
                                </dir>
                                <dir name="image@x-pentax-pef">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/enable"/>
                                </dir>
                                <dir name="image@x-panasonic-raw">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/enable"/>
                                </dir>
                                <dir name="image@x-olympus-orf">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/enable"/>
                                </dir>
                                <dir name="image@x-nikon-nef">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/enable"/>
                                </dir>
                                <dir name="image@x-minolta-mrw">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/enable"/>
                                </dir>
                                <dir name="image@x-kodak-kdc">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/enable"/>
                                </dir>
                                <dir name="image@x-kodak-k25">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/enable"/>
                                </dir>
                                <dir name="image@x-kodak-dcr">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/enable"/>
                                </dir>
                                <dir name="image@x-fuji-raf">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/enable"/>
                                </dir>
                                <dir name="image@x-canon-cr2">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/enable"/>
                                </dir>
                                <dir name="image@x-canon-crw">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/enable"/>
                                </dir>
                                <dir name="image@x-adobe-dng">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/enable"/>
                                </dir>
                                <dir name="image@x-dcraw">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/enable"/>
                                </dir>
                                <dir name="application@x-ufraw">
-                                       <entry name="command" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/command"/>
-                                       <entry name="enable" mtime="1416832765" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/enable"/>
+                                       <entry name="command" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/command"/>
+                                       <entry name="enable" mtime="1419183462" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/enable"/>
                                </dir>
                                <dir name="application@x-cbt">
                                        <entry name="command" mtime="1342526498" schema="/schemas/desktop/gnome/thumbnailers/application@x-cbt/command"/>
@@ -18205,296 +18205,338 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </local_schema>
                                        </entry>
                                        <dir name="image@x-samsung-srw">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-panasonic-rw2">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-nikon-nrw">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sony-arw">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sony-sr2">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sony-srf">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sigma-x3f">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-pentax-pef">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-panasonic-raw">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-olympus-orf">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-nikon-nef">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-minolta-mrw">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-kdc">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-k25">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-dcr">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-fuji-raf">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-canon-cr2">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-canon-crw">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-adobe-dng">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-dcraw">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="application@x-ufraw">
-                                               <entry name="command" mtime="1416832765" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1419183462" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1416832765" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1419183462" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>

diff --git a/obex-data-server/capability.xml b/obex-data-server/capability.xml
deleted file mode 100644 (file)
index 399ae78..0000000
--- a/obex-data-server/capability.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE Capability SYSTEM "obex-capability.dtd">
-<Capability Version="1.0">
-       <General>
-               <Manufacturer>Generic</Manufacturer>
-               <Model>Computer</Model>
-               <SW Version="{$ODS_VER}"/>
-               <Memory>
-                       <MemType>Filesystem</MemType>
-                       <Free>{$MEM_FREE}</Free>
-                       <Used>{$MEM_USED}</Used>
-                       <CaseSenN/>
-               </Memory>
-       </General>
-</Capability>

diff --git a/obex-data-server/imaging_capabilities.xml b/obex-data-server/imaging_capabilities.xml
deleted file mode 100644 (file)
index 9156963..0000000
--- a/obex-data-server/imaging_capabilities.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<imaging-capabilities version="1.0">
-<preferred-format encoding="JPEG"/>
-<image-formats encoding="JPEG" pixel="80*60-65535*65535"/>
-<image-formats encoding="GIF" pixel="80*60-65535*65535"/>
-<image-formats encoding="PNG" pixel="80*60-65535*65535"/>
-</imaging-capabilities>

diff --git a/pango/x86_64-pc-linux-gnu/.keep_x11-libs_pango-0 b/pango/x86_64-pc-linux-gnu/.keep_x11-libs_pango-0
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/pango/x86_64-pc-linux-gnu/pango.modules b/pango/x86_64-pc-linux-gnu/pango.modules
deleted file mode 100644 (file)
index 7585325..0000000
--- a/pango/x86_64-pc-linux-gnu/pango.modules
+++ /dev/null
@@ -1,16 +0,0 @@
-# Pango Modules file
-# Automatically generated file, do not edit
-#
-/usr/lib64/pango/1.8.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
-/usr/lib64/pango/1.8.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc common:
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:*
-

diff --git a/portage/package.use b/portage/package.use
index f000ebec4a5b74cb4277b28fcb0b9024fd1bea67..f43c731dabdc26402400b3d20981d234ecc221ab 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -22,6 +22,7 @@ app-crypt/seahorse-plugins            applet
 #app-doc/xorg-docs                     -doc
 app-doc/doxygen                                dot
 
+app-editors/gedit                      -python_targets_python3_3
 #app-editors/vim                               vim-pager vim-with-x
 #app-editors/gvim                      netbeans
 app-emulation/virtualbox               extensions vnc
@@ -75,6 +76,7 @@ dev-libs/cyrus-sasl                   authdaemond openldap sample
 dev-libs/geoip                         city perl-geoipupdate
 dev-libs/libburn                       track-src-odirect
 dev-libs/libgcrypt                     idea static-libs
+dev-libs/libpeas                       -python_targets_python3_3
 dev-libs/libusb                                -doc
 dev-libs/openssl                       rfc3779
 dev-libs/STLport                       boost
@@ -251,7 +253,7 @@ net-libs/xulrunner                  system-sqlite wifi
 
 net-misc/curl                          libssh2
 net-misc/iputils                       caps gnutls
-net-misc/networkmanager                        dhcpcd nss
+net-misc/networkmanager                        -dhclient dhcpcd nss
 net-misc/ntp                           parse-clocks -zeroconf
 net-misc/openssh                       -X509 sftplogging
 net-misc/openvpn                       down-root eurephia iproute2 passwordsave
@@ -302,6 +304,7 @@ sys-power/acpid                             logrotate
 sys-process/daemontools-scripts                withsamplescripts
 
 virtual/ffmpeg                         vaapi
+virtual/postgresql                     -server
 
 www-apps/bugzilla                      extras
 www-apps/egroupware                    gallery

diff --git a/profile.env b/profile.env
index 1c65a1733b33c94ab7b4595782e71c5e2c53e44c..370d87b40006cd1e700db2d0bf35144e1f1ebbc4 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -42,7 +42,6 @@ export PYTHONDOCS_3_3='/usr/share/doc/python-docs-3.3.2/html/library'
 export QT_GRAPHICSSYSTEM='raster'
 export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins'
 export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.3:/usr/lib64/subversion/bin'
-export RUBYOPT='-rauto_gem'
 export R_HOME='/usr/lib64/R'
 export VBOX_APP_HOME='/usr/lib64/virtualbox'
 export XDG_CONFIG_DIRS='/etc/xdg'

diff --git a/xdg/autostart/caribou-autostart.desktop b/xdg/autostart/caribou-autostart.desktop
index 445ad14c4f4787586aaba46b1f746c32712181e2..cf2d60c7253618def55d1f4853208a5d7ad5ceb9 100644 (file)
--- a/xdg/autostart/caribou-autostart.desktop
+++ b/xdg/autostart/caribou-autostart.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Caribou
-Exec=caribou
+Exec=/usr/libexec/caribou
 AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
 X-GNOME-AutoRestart=true
 #X-GNOME-Autostart-Phase=Initialization

diff --git a/xdg/autostart/tracker-extract.desktop b/xdg/autostart/tracker-extract.desktop
index f6e39037ee74fe721eb130c2ebb664f24a351855..d28e25261bfd69dab99d52ed191f8655266c252c 100644 (file)
--- a/xdg/autostart/tracker-extract.desktop
+++ b/xdg/autostart/tracker-extract.desktop
@@ -1,9 +1,7 @@
 [Desktop Entry]
 Name=Tracker Metadata Extractor
 Name[de]=Tracker Metadaten-Entdecker
-Name[ru]=Экстрактор метаданных
 Comment=Extracts metadata from local files
-Comment[de]=Liest Metadaten aus lokalen Dateien
 Comment[ru]=Извлечь метаданные из локальных файлов
 Icon=
 Exec=/usr/libexec/tracker-extract
@@ -20,4 +18,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=tracker
 X-GNOME-Bugzilla-Component=Extractor
-X-GNOME-Bugzilla-Version=1.0.2
+X-GNOME-Bugzilla-Version=1.0.6

diff --git a/xdg/autostart/tracker-miner-fs.desktop b/xdg/autostart/tracker-miner-fs.desktop
index 425385b9174b65e62f1fd288b225a50737a3dc9e..1b34ce97676372462374cc1d12b1d8ae2ac6a8ad 100644 (file)
--- a/xdg/autostart/tracker-miner-fs.desktop
+++ b/xdg/autostart/tracker-miner-fs.desktop
@@ -2,10 +2,8 @@
 Name=Tracker File System Miner
 Name[de]=Tracker Dateisystem-Indizierung
 Name[en_GB]=Tracker File System Miner
-Name[ru]=Индексатор файловой системы
 Comment=Crawls and processes files on the file system
 Comment[de]=Spürt Dateien in Ihrem System auf und verarbeitet diese
-Comment[en_GB]=Crawls and processes files on the file system
 Comment[ru]=Перебирает и обрабатывает файлы в файловой системе
 Icon=
 Exec=/usr/libexec/tracker-miner-fs
@@ -22,4 +20,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=tracker
 X-GNOME-Bugzilla-Component=Miners
-X-GNOME-Bugzilla-Version=1.0.2
+X-GNOME-Bugzilla-Version=1.0.6

diff --git a/xdg/autostart/tracker-store.desktop b/xdg/autostart/tracker-store.desktop
index afd9b3b154c2f6e510fbffe432952e583fd9f9f9..9737b25db810873ca9f27c0a9c57ed15b46e535a 100644 (file)
--- a/xdg/autostart/tracker-store.desktop
+++ b/xdg/autostart/tracker-store.desktop
@@ -21,4 +21,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=tracker
 X-GNOME-Bugzilla-Component=Store
-X-GNOME-Bugzilla-Version=1.0.2
+X-GNOME-Bugzilla-Version=1.0.6