From 119114d15f5bca42e6eed8268c691c9890510889 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Sun, 21 Dec 2014 20:20:15 +0100 Subject: [PATCH] Current state --- X11/xinit.d/libcanberra-gtk-module.sh | 16 ++ csh.env | 1 - dbus-1/system.d/nm-dhcp-client.conf | 13 -- .../org.freedesktop.ModemManager1.conf | 2 +- .../org.freedesktop.NetworkManager.conf | 114 +++++----- dbus-1/system.d/org.kde.kalarmrtcwake.conf | 11 - .../system.d/org.kde.nepomuk.filewatch.conf | 11 - env.d/10rubygems | 1 - gconf/gconf.xml.defaults/%gconf-tree.xml | 210 +++++++++++------- obex-data-server/capability.xml | 15 -- obex-data-server/imaging_capabilities.xml | 6 - .../.keep_x11-libs_pango-0 | 0 pango/x86_64-pc-linux-gnu/pango.modules | 16 -- portage/package.use | 5 +- profile.env | 1 - xdg/autostart/caribou-autostart.desktop | 2 +- xdg/autostart/tracker-extract.desktop | 4 +- xdg/autostart/tracker-miner-fs.desktop | 4 +- xdg/autostart/tracker-store.desktop | 2 +- 19 files changed, 211 insertions(+), 223 deletions(-) create mode 100644 X11/xinit.d/libcanberra-gtk-module.sh delete mode 100644 dbus-1/system.d/nm-dhcp-client.conf delete mode 100644 dbus-1/system.d/org.kde.kalarmrtcwake.conf delete mode 100644 dbus-1/system.d/org.kde.nepomuk.filewatch.conf delete mode 100644 env.d/10rubygems delete mode 100644 obex-data-server/capability.xml delete mode 100644 obex-data-server/imaging_capabilities.xml delete mode 100644 pango/x86_64-pc-linux-gnu/.keep_x11-libs_pango-0 delete mode 100644 pango/x86_64-pc-linux-gnu/pango.modules diff --git a/X11/xinit.d/libcanberra-gtk-module.sh b/X11/xinit.d/libcanberra-gtk-module.sh new file mode 100644 index 00000000..63c16af7 --- /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 2ad6657f..0203b798 100644 --- 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 index 0aeae603..00000000 --- a/dbus-1/system.d/nm-dhcp-client.conf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/dbus-1/system.d/org.freedesktop.ModemManager1.conf b/dbus-1/system.d/org.freedesktop.ModemManager1.conf index 5c963846..d1ea1669 100644 --- a/dbus-1/system.d/org.freedesktop.ModemManager1.conf +++ b/dbus-1/system.d/org.freedesktop.ModemManager1.conf @@ -158,7 +158,7 @@ + send_member="Setup"/> - - + + + + + - + - + send_interface="org.freedesktop.NetworkManager.Device.Adsl"/> - + send_interface="org.freedesktop.NetworkManager.Device.Bond"/> - + send_interface="org.freedesktop.NetworkManager.Device.Bridge"/> - + send_interface="org.freedesktop.NetworkManager.Device.Bluetooth"/> + + + + + + + + + + + + + + send_interface="org.freedesktop.NetworkManager.Device.WiMax"/> + - + + - + - + + - - - - - - - - - - - - - - + send_interface="org.freedesktop.NetworkManager"/> + + - - - - - - - - + + + + + + + + + diff --git a/dbus-1/system.d/org.kde.kalarmrtcwake.conf b/dbus-1/system.d/org.kde.kalarmrtcwake.conf deleted file mode 100644 index e3f2de19..00000000 --- a/dbus-1/system.d/org.kde.kalarmrtcwake.conf +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - 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 index b1345031..00000000 --- a/dbus-1/system.d/org.kde.nepomuk.filewatch.conf +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/env.d/10rubygems b/env.d/10rubygems deleted file mode 100644 index f5122167..00000000 --- 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 84b83cd7..582be9d5 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2382,88 +2382,88 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -18205,296 +18205,338 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + diff --git a/obex-data-server/capability.xml b/obex-data-server/capability.xml deleted file mode 100644 index 399ae789..00000000 --- a/obex-data-server/capability.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Generic - Computer - - - Filesystem - {$MEM_FREE} - {$MEM_USED} - - - - diff --git a/obex-data-server/imaging_capabilities.xml b/obex-data-server/imaging_capabilities.xml deleted file mode 100644 index 9156963b..00000000 --- a/obex-data-server/imaging_capabilities.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - 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 index e69de29b..00000000 diff --git a/pango/x86_64-pc-linux-gnu/pango.modules b/pango/x86_64-pc-linux-gnu/pango.modules deleted file mode 100644 index 75853253..00000000 --- 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 f000ebec..f43c731d 100644 --- 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 1c65a173..370d87b4 100644 --- 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 445ad14c..cf2d60c7 100644 --- 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 f6e39037..d28e2526 100644 --- 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 425385b9..1b34ce97 100644 --- 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 afd9b3b1..9737b25d 100644 --- 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 -- 2.39.5