From: Frank Brehm Date: Tue, 23 Oct 2012 12:12:22 +0000 (+0200) Subject: Current state X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=53dd772a937d159aa869a85eb622d1745c35215d;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/.etckeeper b/.etckeeper index ab95086..4c4d9de 100755 --- a/.etckeeper +++ b/.etckeeper @@ -25,10 +25,6 @@ mkdir -p './php/fpm-php5.4/ext' mkdir -p './php/fpm-php5.4/ext-active' mkdir -p './pm/power.d' mkdir -p './pm/sleep.d' -mkdir -p './polkit-1/localauthority/20-org.d' -mkdir -p './polkit-1/localauthority/30-site.d' -mkdir -p './polkit-1/localauthority/50-local.d' -mkdir -p './polkit-1/localauthority/90-mandatory.d' mkdir -p './portage/env/media-libs' mkdir -p './portage/env/net-libs' mkdir -p './ppp/peers' @@ -294,6 +290,7 @@ maybe chmod 0644 './conf.d/timidity' maybe chmod 0644 './conf.d/twistd' maybe chmod 0644 './conf.d/udev' maybe chmod 0644 './conf.d/urandom' +maybe chmod 0644 './conf.d/vde' maybe chmod 0644 './conf.d/wpa_supplicant' maybe chmod 0644 './conf.d/xdm' maybe chmod 0644 './conf.d/xinetd' @@ -709,6 +706,7 @@ maybe chmod 0644 './cron.d/.keep_sys-process_vixie-cron-0' maybe chmod 0750 './cron.daily' maybe chmod 0644 './cron.daily/.keep_sys-process_cronbase-0' maybe chmod 0755 './cron.daily/00-logwatch' +maybe chmod 0755 './cron.daily/hplip_cron' maybe chmod 0755 './cron.daily/logrotate.cron' maybe chmod 0755 './cron.daily/makewhatis' maybe chmod 0755 './cron.daily/mlocate' @@ -717,8 +715,6 @@ maybe chmod 0750 './cron.hourly' maybe chmod 0644 './cron.hourly/.keep_sys-process_cronbase-0' maybe chmod 0750 './cron.monthly' maybe chmod 0644 './cron.monthly/.keep_sys-process_cronbase-0' -maybe chmod 0755 './cron.monthly/update-pciids' -maybe chmod 0755 './cron.monthly/update-usbids' maybe chmod 0750 './cron.weekly' maybe chmod 0644 './cron.weekly/.keep_sys-process_cronbase-0' maybe chmod 0644 './crontab' @@ -781,8 +777,6 @@ maybe chmod 0644 './dbus-1/system.d/org.freedesktop.NetworkManager.conf' maybe chmod 0644 './dbus-1/system.d/org.freedesktop.PolicyKit1.conf' maybe chmod 0644 './dbus-1/system.d/org.freedesktop.UDisks.conf' maybe chmod 0644 './dbus-1/system.d/org.freedesktop.UPower.conf' -maybe chmod 0644 './dbus-1/system.d/org.freedesktop.colord-sane.conf' -maybe chmod 0644 './dbus-1/system.d/org.gnome.CPUFreqSelector.conf' maybe chmod 0644 './dbus-1/system.d/org.gnome.GConf.Defaults.conf' maybe chmod 0644 './dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf' maybe chmod 0644 './dbus-1/system.d/org.kde.auth.conf' @@ -988,6 +982,7 @@ maybe chmod 0755 './foomatic/direct' maybe chmod 0644 './foomatic/filter.conf' maybe chmod 0644 './foomatic/filter.conf.sample' maybe chmod 0644 './fstab' +maybe chmod 0644 './fuse.conf' maybe chmod 0644 './g15daemon.conf' maybe chmod 0644 './gai.conf' maybe chmod 0755 './gconf' @@ -1027,7 +1022,6 @@ maybe chmod 0644 './gconf/schemas/charpick.schemas' maybe chmod 0644 './gconf/schemas/cheese.schemas' maybe chmod 0644 './gconf/schemas/clock.schemas' maybe chmod 0644 './gconf/schemas/control-center.schemas' -maybe chmod 0644 './gconf/schemas/cpufreq-applet.schemas' maybe chmod 0644 './gconf/schemas/deskbar-applet.schemas' maybe chmod 0644 './gconf/schemas/desktop_default_applications.schemas' maybe chmod 0644 './gconf/schemas/desktop_gnome_accessibility_keyboard.schemas' @@ -1097,11 +1091,9 @@ maybe chmod 0644 './gconf/schemas/gnomine.schemas' maybe chmod 0644 './gconf/schemas/gnotravex.schemas' maybe chmod 0644 './gconf/schemas/gnotski.schemas' maybe chmod 0644 './gconf/schemas/gtali.schemas' -maybe chmod 0644 './gconf/schemas/gucharmap.schemas' maybe chmod 0644 './gconf/schemas/gweather.schemas' maybe chmod 0644 './gconf/schemas/hamster-applet.schemas' maybe chmod 0644 './gconf/schemas/iagno.schemas' -maybe chmod 0644 './gconf/schemas/libcanberra.schemas' maybe chmod 0644 './gconf/schemas/mahjongg.schemas' maybe chmod 0644 './gconf/schemas/metacity.schemas' maybe chmod 0644 './gconf/schemas/mixer.schemas' @@ -1152,7 +1144,6 @@ maybe chmod 0644 './gimp/2.0/controllerrc' maybe chmod 0644 './gimp/2.0/gimprc' maybe chmod 0644 './gimp/2.0/gtkrc' maybe chmod 0644 './gimp/2.0/menurc' -maybe chmod 0644 './gimp/2.0/ps-menurc' maybe chmod 0644 './gimp/2.0/sessionrc' maybe chmod 0644 './gimp/2.0/templaterc' maybe chmod 0644 './gimp/2.0/unitrc' @@ -1245,6 +1236,7 @@ maybe chmod 0755 './init.d/dmesg' maybe chmod 0755 './init.d/dmeventd' maybe chmod 0755 './init.d/fancontrol' maybe chmod 0755 './init.d/fsck' +maybe chmod 0755 './init.d/fuse' maybe chmod 0755 './init.d/g15daemon' maybe chmod 0755 './init.d/g15stats' maybe chmod 0755 './init.d/gem_server' @@ -1327,6 +1319,7 @@ maybe chmod 0755 './init.d/udev-mount' maybe chmod 0755 './init.d/udev-postmount' maybe chmod 0755 './init.d/ulogd' maybe chmod 0755 './init.d/urandom' +maybe chmod 0755 './init.d/vde' maybe chmod 0755 './init.d/vixie-cron' maybe chmod 0755 './init.d/wpa_supplicant' maybe chmod 0755 './init.d/xdm' @@ -1641,17 +1634,12 @@ maybe chmod 0755 './pm/power.d' maybe chmod 0755 './pm/sleep.d' maybe chmod 0755 './polkit-1' maybe chmod 0700 './polkit-1/localauthority' -maybe chmod 0755 './polkit-1/localauthority.conf.d' -maybe chmod 0644 './polkit-1/localauthority.conf.d/50-localauthority.conf' -maybe chmod 0644 './polkit-1/localauthority.conf.d/60-gentoo.conf' maybe chmod 0755 './polkit-1/localauthority/10-vendor.d' maybe chmod 0644 './polkit-1/localauthority/10-vendor.d/01-org.freedesktop.NetworkManager.settings.modify.system.pkla' -maybe chmod 0755 './polkit-1/localauthority/20-org.d' -maybe chmod 0755 './polkit-1/localauthority/30-site.d' -maybe chmod 0755 './polkit-1/localauthority/50-local.d' -maybe chmod 0755 './polkit-1/localauthority/90-mandatory.d' -maybe chmod 0755 './polkit-1/nullbackend.conf.d' -maybe chmod 0644 './polkit-1/nullbackend.conf.d/50-nullbackend.conf' +maybe chown polkitd './polkit-1/rules.d' +maybe chmod 0700 './polkit-1/rules.d' +maybe chown polkitd './polkit-1/rules.d/50-default.rules' +maybe chmod 0644 './polkit-1/rules.d/50-default.rules' maybe chmod 0755 './portage' maybe chmod 0644 './portage/bashrc' maybe chmod 0755 './portage/bin' @@ -2065,6 +2053,13 @@ maybe chmod 0755 './update-motd.d/99-footer' maybe chmod 0644 './updatedb.conf' maybe chmod 0755 './vbox' maybe chmod 0644 './vbox/vbox.cfg' +maybe chmod 0755 './vde2' +maybe chmod 0755 './vde2/libvdemgmt' +maybe chmod 0644 './vde2/libvdemgmt/asyncrecv.rc' +maybe chmod 0644 './vde2/libvdemgmt/closemachine.rc' +maybe chmod 0644 './vde2/libvdemgmt/openmachine.rc' +maybe chmod 0644 './vde2/libvdemgmt/sendcmd.rc' +maybe chmod 0644 './vde2/vdecmd' maybe chmod 0755 './vim' maybe chmod 0644 './vim/gvimrc' maybe chmod 0644 './vim/vimrc' @@ -2148,7 +2143,7 @@ maybe chmod 0644 './xinetd.d/telnetd' maybe chmod 0644 './xinetd.d/time-dgram' maybe chmod 0644 './xinetd.d/time-stream' maybe chmod 0755 './xml' -maybe chmod 0644 './xml/.keep_app-text_build-docbook-catalog-0' +maybe chmod 0644 './xml/.keep' maybe chmod 0644 './xml/.keep_app-text_docbook-xml-dtd-4.1.2' maybe chmod 0644 './xml/.keep_app-text_docbook-xml-dtd-4.2' maybe chmod 0644 './xml/.keep_app-text_docbook-xml-dtd-4.3' diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf index c08b2a6..db1f06d 100644 --- a/apache2/modules.d/00_apache_manual.conf +++ b/apache2/modules.d/00_apache_manual.conf @@ -3,9 +3,9 @@ # The documentation is always available at # http://httpd.apache.org/docs/2.2/ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22-r1/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.23/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff --git a/conf.d/vde b/conf.d/vde new file mode 100644 index 0000000..d879453 --- /dev/null +++ b/conf.d/vde @@ -0,0 +1,10 @@ +# load the tun module +VDE_MODPROBE_TUN="yes" +# virtual tap networking device to be used for vde +VDE_TAP="tap0" +# mode and group for the socket +VDE_SOCK_CHMOD="770" +VDE_SOCK_CHOWN=":qemu" + +# This is the actual options string passed to VDE. Change this at your own risk. +VDE_OPTS="-tap ${VDE_TAP} -daemon" diff --git a/cron.daily/hplip_cron b/cron.daily/hplip_cron new file mode 100755 index 0000000..95ffb07 --- /dev/null +++ b/cron.daily/hplip_cron @@ -0,0 +1,32 @@ +#!/bin/sh + +LC_ALL=C +LANG=C + +LOG_DIR=/var/log/hp/tmp + +# Default for number of days to keep old log files in /var/log/hp/tmp +LOGFILE_DAYS=1 +MAXSIZE=1048576 # 1 GB + +# Clears the logs which are less than 3 days. +if [ -d $LOG_DIR ]; then + find $LOG_DIR -name \* -mtime +$LOGFILE_DAYS -print0 2>/dev/null | xargs -r -0 rm -rf +fi + +USAGE=`du -c $LOG_DIR 2>/dev/null |grep total |cut -d't' -f1` + +# Clears the logs if size is greater that specificed limit +while [ $USAGE -gt $MAXSIZE ]; do + + # changing the user specified LOGFILE_DAYS days to 1 days lesser. + LOGFILE_DAYS=`expr $LOGFILE_DAYS "-" 1` + + # If same day logs are reaching Max size, deleting all log files. + if [ $LOGFILE_DAYS -eq 0 ]; then + find $LOG_DIR -name \* -print0 2>/dev/null | xargs -r -0 rm -rf + else + find $LOG_DIR -name \* -mtime +$LOGFILE_DAYS -print0 2>/dev/null | xargs -r -0 rm -rf + fi + USAGE=`du -c $LOG_DIR 2>/dev/null |grep total |cut -d't' -f1` +done diff --git a/cron.monthly/update-pciids b/cron.monthly/update-pciids deleted file mode 100755 index 4c69423..0000000 --- a/cron.monthly/update-pciids +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/sbin/update-pciids -q diff --git a/cron.monthly/update-usbids b/cron.monthly/update-usbids deleted file mode 100755 index 1018546..0000000 --- a/cron.monthly/update-usbids +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/sbin/update-usbids -q diff --git a/cupshelpers/preferreddrivers.xml b/cupshelpers/preferreddrivers.xml index 31052b9..fa80c0d 100644 --- a/cupshelpers/preferreddrivers.xml +++ b/cupshelpers/preferreddrivers.xml @@ -177,6 +177,11 @@ + + + + @@ -215,6 +220,18 @@ + + + + hpcups + + + *-postscript + manufacturer* + + + @@ -250,6 +267,7 @@ foomatic-recommended-hpijs foomatic-recommended-nonpostscript manufacturer* + pdf foomatic-recommended-postscript foomatic-postscript hpcups diff --git a/dbus-1/system.d/org.freedesktop.PolicyKit1.conf b/dbus-1/system.d/org.freedesktop.PolicyKit1.conf index c8ef513..5cb96ed 100644 --- a/dbus-1/system.d/org.freedesktop.PolicyKit1.conf +++ b/dbus-1/system.d/org.freedesktop.PolicyKit1.conf @@ -4,7 +4,7 @@ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - + @@ -13,7 +13,7 @@ - + diff --git a/dbus-1/system.d/org.freedesktop.colord-sane.conf b/dbus-1/system.d/org.freedesktop.colord-sane.conf deleted file mode 100644 index 3398b93..0000000 --- a/dbus-1/system.d/org.freedesktop.colord-sane.conf +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dbus-1/system.d/org.gnome.CPUFreqSelector.conf b/dbus-1/system.d/org.gnome.CPUFreqSelector.conf deleted file mode 100644 index 331b6bc..0000000 --- a/dbus-1/system.d/org.gnome.CPUFreqSelector.conf +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/elinks/keybind.conf.sample b/elinks/keybind.conf.sample index 3dded9c..a5270c3 100644 --- a/elinks/keybind.conf.sample +++ b/elinks/keybind.conf.sample @@ -4,12 +4,12 @@ # "elinks.conf" to include it. # vi-like navigation keys -bind "main" "j" = "down" -bind "main" "k" = "up" -bind "main" "h" = "back" -bind "main" "l" = "enter" -bind "main" "g" = "home" -bind "main" "G" = "end" +bind "main" "j" = "move-link-next" +bind "main" "k" = "move-link-prev" +bind "main" "h" = "history-move-back" +bind "main" "l" = "link-follow" +bind "main" "g" = "move-document-start" +bind "main" "G" = "move-document-end" # Keys close to the above bind "main" "i" = "scroll-up" @@ -22,8 +22,8 @@ bind "main" "Alt-o" = "goto-url" # Emacs-like paging keys # Ctrl prefixed keys must be capital :-( -bind "main" "Alt-v" = "page-up" -bind "main" "Ctrl-V" = "page-down" +bind "main" "Alt-v" = "move-page-up" +bind "main" "Ctrl-V" = "move-page-down" # Emacs-like editing keys bind "edit" "Ctrl-B" = "left" diff --git a/eselect/boost/active b/eselect/boost/active index 313b2f3..18df6a0 120000 --- a/eselect/boost/active +++ b/eselect/boost/active @@ -1 +1 @@ -//usr/share/boost-eselect/profiles/1.48/default \ No newline at end of file +//usr/share/boost-eselect/profiles/1.49/default \ No newline at end of file diff --git a/fuse.conf b/fuse.conf new file mode 100644 index 0000000..cb6c631 --- /dev/null +++ b/fuse.conf @@ -0,0 +1,9 @@ +# Set the maximum number of FUSE mounts allowed to non-root users. +# The default is 1000. +# +#mount_max = 1000 + +# Allow non-root users to specify the 'allow_other' or 'allow_root' +# mount options. +# +#user_allow_other diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index eedde8b..776d9f3 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2,51 +2,53 @@ - - - + + + - - - - - - + + + + + + - - - - - + + + + + + + - - + + - + - - - + + + - + - - - - + + + + - - - - + + + + @@ -139,306 +141,306 @@ - - + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + - + - - + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - - - + + + - + - - + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -630,21 +632,21 @@ - - - - - - - - + + + + + + + + - - - - - + + + + + @@ -1156,35 +1158,35 @@ - + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + @@ -1282,307 +1284,307 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + WnckletFactory::WorkspaceSwitcherApplet - - - - + + + + bottom_panel - + external-applet - - - - - - - - - + + + + + + + + + WnckletFactory::WindowListApplet - - - - + + + + bottom_panel - + external-applet - - - - - - - - - + + + + + + + + + WnckletFactory::ShowDesktopApplet - - - - + + + + bottom_panel - + external-applet - - - - - - - - - + + + + + + + + + NotificationAreaAppletFactory::NotificationArea - - - - + + + + top_panel - + external-applet - - - - - - - - - + + + + + + + + + ClockAppletFactory::ClockApplet - - - - + + + + top_panel - + external-applet - - - - - - - - - + + + + + + + + + WnckletFactory::WindowMenuApplet - - - - + + + + top_panel - + external-applet - - - - - - - - - + + + + + + + + + evolution.desktop - - - - + + + + top_panel - + launcher-object - - - - - - - - - + + + + + + + + + epiphany.desktop - - - - + + + + top_panel - + launcher-object - - - - - - - - - - - - - + + + + + + + + + + + + + top_panel - + menu-bar - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + bottom - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + top - + - - - - - - - + + + + + + + - +
  • window_menu
    • @@ -1602,7 +1604,7 @@ workspace_switcher     - +
  • menu_bar
    • @@ -1613,7 +1615,7 @@ email_launcher     - +
  • top_panel
    • @@ -3103,56 +3105,56 @@     - + Default manager window width - + Default manager window height - + Show system tray icon while app is running - + Whether we ask the user to apply or discard unapplied device changes - + Whether we require confirmation to start or stop a libvirt virtual interface - + Whether we require confirmation to remove a virtual device - + Whether we require confirmation to pause a VM - + Whether we require confirmation to poweroff/reboot a VM - + Whether we require confirmation to forcepoweroff a VM @@ -3160,7 +3162,7 @@ - + @@ -3168,7 +3170,7 @@ Default path for saving screenshots from VMs - + @@ -3176,7 +3178,7 @@ Default path for stored VM snapshots - + @@ -3184,7 +3186,7 @@ Default path for saving VM snapshots - + @@ -3192,7 +3194,7 @@ Default path for choosing media - + @@ -3202,6 +3204,22 @@ + + + + default + + Use selected format when creating new disk images in new VM wizard + + + + + + vnc + + Install selected graphics type for new VM. vnc or spice + + @@ -3210,13 +3228,13 @@ Install selected graphics type for new VM. vnc or spice - + Whether to install a sound device for remote VMs or not - + Whether to install a sound device for local VMs or not @@ -3224,7 +3242,7 @@ - + Whether to show toolbar containing Virtual Machine action buttons (such as Run, Pause, Shutdown) in the details display @@ -3232,19 +3250,19 @@ - + When to scale the VM graphical console. 0 = never, 1 = only when in full screen mode, 2 = Always - + Whether to show the notification hint when grabbing the mouse in the console - + Whether to enable menu accelerators while connected to the guest graphical console. @@ -3252,7 +3270,7 @@ - + The number of urls to keep in the history for the install media address page. @@ -3260,25 +3278,25 @@ - + Whether or not the app will poll VM network i/o statistics - + Whether or not the app will poll VM disk i/o statistics - + The number of samples to keep in the statistics history - + The statistics update interval in seconds @@ -3286,25 +3304,25 @@ - + Show the host cpu usage field in the domain list summary view - + Show the guest cpu usage field in the domain list summary view - + Show the network I/O field in the domain list summary view - + Show the disk I/O field in the domain list summary view @@ -3834,110 +3852,110 @@ - + The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). - + The configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). - + Flag that enables a much simplified user interface. - + Whether Evolution will start up in offline mode instead of online mode. - + Initial folder for GtkFileChooser dialogs. - + Initial view for attachment bar widgets. "0" is Icon View, "1" is List View. - + Whether the warning dialog in development versions of Evolution is skipped. - + URL that provides proxy configuration values. - + This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24). - + Password to pass as authentication when doing HTTP proxying. - + User name to pass as authentication when doing HTTP proxying. - + If true, then connections to the proxy server require authentication. The username is retrieved from the "/apps/evolution/shell/network_config/authentication_user" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file. - + Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet. - + The machine name to proxy socks through. - + The port on the machine defined by "/apps/evolution/shell/network_config/socks_host" that you proxy through. - + The machine name to proxy secure HTTP through. - + The port on the machine defined by "/apps/evolution/shell/network_config/secure_host" that you proxy through. - + The machine name to proxy HTTP through. - + The port on the machine defined by "/apps/evolution/shell/network_config/http_host" that you proxy through. - + Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing "use system settings", "no proxy", "use manual proxy configuration" and "use proxy configuration provided in the autoconfig url" respectively. @@ -3945,7 +3963,7 @@ - + mail @@ -3953,25 +3971,25 @@ ID or alias of the component to be shown by default at start-up. - + Whether the status bar should be visible. - + Whether the sidebar should be visible. - + Whether the toolbar should be visible. - + toolbar @@ -3979,42 +3997,42 @@ The style of the window buttons. Can be "text", "icons", "both", "toolbar". If "toolbar" is set, the style of the buttons is determined by the GNOME toolbar setting. - + Whether the window buttons should be visible. - + Whether or not the window should be maximized. - + The default height for the main window, in pixels. - + The default width for the main window, in pixels. - + The default X coordinate for the main window. - + The default Y coordinate for the main window. - + The default width for the sidebar, in pixels. @@ -4023,7 +4041,7 @@ - + @@ -4032,7 +4050,7 @@ - + Directory for saving alarm audio files @@ -4040,12 +4058,12 @@ - + The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain. - + @@ -4054,26 +4072,26 @@ - + Whether or not to use the notification tray for display alarms. - + Programs that are allowed to be run by alarms. - + - + Time the last alarm ran, in time_t. @@ -4081,13 +4099,13 @@ - + Count of default recurrence for a new event. -1 means forever. - + @@ -4095,13 +4113,13 @@ Units for a default reminder, "minutes", "hours" or "days". - + Number of units for determining a default reminder. - + Whether to set a default reminder for appointments. @@ -4109,13 +4127,13 @@ - + Whether to ask for confirmation when expunging appointments and tasks. - + Whether to ask for confirmation when deleting an appointment or task. @@ -4123,13 +4141,13 @@ - + Number of units for determining when to hide tasks. - + days @@ -4137,19 +4155,19 @@ Units for determining when to hide tasks, "minutes", "hours" or "days". - + Whether to hide completed tasks in the tasks view. - + URI of the highlighted ("primary") task list - + #ff0000 @@ -4157,7 +4175,7 @@ Background color of tasks that are overdue, in "#rrggbb" format. - + #1e90ff @@ -4168,14 +4186,14 @@ - + URI of the highlighted ("primary") memo list - + This can have three possible values. 0 for errors. 1 for warnings. @@ -4183,38 +4201,38 @@ - + Amount of time in seconds the error should be shown on the status bar. - + Whether to scroll a Month View by a week, not by a month. - + Whether to show week numbers in various places in the Calendar. - + Gradient of the events in calendar views. - + Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque). - + #ff0000 @@ -4222,7 +4240,7 @@ Color to draw the Marcus Bains Line in the Time bar (empty for default). - + #ff0000 @@ -4230,31 +4248,31 @@ Color to draw the Marcus Bains line in the Day View. - + Whether to draw the Marcus Bains Line (line at current time) in the calendar. - + Days on which the start and end of work hours should be indicated. - + Whether to display the end time of events in the week and month views. - + Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday. - + @@ -4262,7 +4280,7 @@ - + @@ -4270,7 +4288,7 @@ - + @@ -4278,7 +4296,7 @@ - + @@ -4289,7 +4307,7 @@ - + @@ -4297,7 +4315,7 @@ - + @@ -4305,7 +4323,7 @@ - + @@ -4313,7 +4331,7 @@ - + @@ -4324,128 +4342,128 @@ - + Position of the vertical pane, between the calendar lists and the date navigator calendar. - + Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels. - + Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels. - + Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels. - + Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels. - + Intervals shown in Day and Work Week views, in minutes. - + Minute the workday ends on, 0 to 59. - + Hour the workday ends on, in twenty four hour format, 0 to 23. - + Minute the workday starts on, 0 to 59. - + Hour the workday starts on, in twenty four hour format, 0 to 23. - + Weekday the week starts on, from Sunday (0) to Saturday (6). - + Whether to show categories field in the event/meeting editor - + Whether to show timezone field in the event/meeting editor - + Whether to show RSVP field in the event/task/meeting editor - + Whether to show type field in the event/task/meeting editor - + Whether to show status field in the event/task/meeting editor - + Whether to show role field in the event/task/meeting editor - + Whether to show times in twenty four hour format instead of using am/pm. - + Maximum number of recently used timezones to remember in a 'day_second_zones' list. - + List of recently used second time zones in a Day View. - + @@ -4453,14 +4471,14 @@ Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key. - + Use the system timezone instead of the timezone selected in Evolution. - + UTC @@ -4468,7 +4486,7 @@ The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like "America/New York". - + URI of the highlighted ("primary") calendar @@ -4477,13 +4495,13 @@ - + Whether to show the preview pane. - + @@ -4491,7 +4509,7 @@ - + @@ -4499,7 +4517,7 @@ - + @@ -4512,7 +4530,7 @@ - + @@ -4522,19 +4540,19 @@ - + Whether force showing the mail address with the name of the autocompleted contact in the entry. - + The number of characters that must be typed before Evolution will attempt to autocomplete. - + @@ -4546,7 +4564,7 @@ - + Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens. @@ -4554,13 +4572,13 @@ - + Automatically launch editor when key is pressed in the mail composer - + gedit @@ -4570,13 +4588,13 @@ - + Play themed sound when new messages arrive, if not in beep mode. - + @@ -4584,37 +4602,37 @@ Sound file to be played when new messages arrive, if not in beep mode. - + If "true", then beep, otherwise will play sound file when new messages arrive. - + Whether play sound or beep when new messages arrive. - + Whether show message over the icon when new messages arrive. - + Show new mail icon in notification area when new messages arrive. - + Generates a D-Bus message when new mail messages arrive. - + Whether to notify new messages in Inbox folder only. @@ -4622,7 +4640,7 @@ - +
  • @@ -4635,7 +4653,7 @@
    • - + @@ -4644,7 +4662,7 @@ - + @@ -4653,7 +4671,7 @@ - + Initial maximize state of the "Search Folder Editor" window. @@ -4664,7 +4682,7 @@ - + @@ -4673,7 +4691,7 @@ - + @@ -4682,7 +4700,7 @@ - + Initial maximize state of the "Send and Receive Mail" window. @@ -4693,7 +4711,7 @@ - + @@ -4702,7 +4720,7 @@ - + @@ -4711,7 +4729,7 @@ - + Initial maximize state of the "Filter Editor" window. @@ -4722,7 +4740,7 @@ - + @@ -4731,21 +4749,21 @@ - + Directory for saving mail component files. - + List of protocol names whose license has been accepted. - + List of accounts known to the mail component of @@ -4754,14 +4772,14 @@ - + UID string of the default account. - +
  • @@ -4787,25 +4805,25 @@ - + Default maximized state of the mail browser window. - + Default height of the mail browser window. - + Default width of the mail browser window. - +
  • @@ -4827,7 +4845,7 @@ - +
  • @@ -4847,7 +4865,7 @@ - +
  • @@ -4863,7 +4881,7 @@ - + @@ -4871,7 +4889,7 @@ - + @@ -4879,7 +4897,7 @@ - + @@ -4887,7 +4905,7 @@ - + Bogofilter @@ -4899,7 +4917,7 @@ - + @@ -4907,7 +4925,7 @@ - + @@ -4915,7 +4933,7 @@ - + @@ -4923,7 +4941,7 @@ - + @@ -4932,7 +4950,7 @@ - + @@ -4943,7 +4961,7 @@ - + @@ -4951,7 +4969,7 @@ - + @@ -4962,7 +4980,7 @@
    • - + @@ -4970,7 +4988,7 @@ - + @@ -4978,7 +4996,7 @@ - + @@ -4988,24 +5006,24 @@ - + - + - + - + @@ -5015,7 +5033,7 @@ - + @@ -5025,7 +5043,7 @@ - + @@ -5035,13 +5053,13 @@ - + Default height of the subscribe dialog. - + Default width of the subscribe dialog. @@ -5049,7 +5067,7 @@ - + @@ -5058,7 +5076,7 @@ - + @@ -5067,7 +5085,7 @@ - + @@ -5075,7 +5093,7 @@ - + @@ -5085,7 +5103,7 @@ - + @@ -5094,7 +5112,7 @@ - + @@ -5103,7 +5121,7 @@ - + @@ -5112,7 +5130,7 @@ - + @@ -5122,7 +5140,7 @@ - + @@ -5130,7 +5148,7 @@ - + @@ -5139,7 +5157,7 @@ - + @@ -5150,7 +5168,7 @@ - + @@ -5158,7 +5176,7 @@ - + @@ -5166,7 +5184,7 @@ - + @@ -5176,7 +5194,7 @@ - + @@ -5184,7 +5202,7 @@ - + @@ -5192,7 +5210,7 @@ - + @@ -5200,7 +5218,7 @@ - + @@ -5208,7 +5226,7 @@ - + @@ -5216,7 +5234,7 @@ - + @@ -5224,7 +5242,7 @@ - + If there isn't a builtin viewer for a particular MIME type inside Evolution, @@ -5233,7 +5251,7 @@ - + @@ -5241,7 +5259,7 @@ - + @@ -5249,7 +5267,7 @@ - + This key should contain a list of XML structures specifying custom headers, @@ -5259,7 +5277,7 @@ - + @@ -5267,7 +5285,7 @@ - + @@ -5275,7 +5293,7 @@ - + @@ -5286,7 +5304,7 @@ - + @@ -5296,7 +5314,7 @@ - + @@ -5304,7 +5322,7 @@ - + #737373 @@ -5314,7 +5332,7 @@ - + @@ -5322,21 +5340,21 @@ - + Enable to use a similar message list view settings for all folders. - + Enable this to use Space bar key to scroll in message preview, message list and folders. - + @@ -5344,7 +5362,7 @@ - + @@ -5352,7 +5370,7 @@ - + Enable animated images in HTML mail. Many users find animated @@ -5360,7 +5378,7 @@ - + @@ -5368,7 +5386,7 @@ - + Monospace 12 @@ -5378,7 +5396,7 @@ - + Sans 12 @@ -5391,14 +5409,14 @@ - + Directory for loading/attaching files to composer. - + @@ -5413,26 +5431,26 @@ - + Default height of the Composer Window. - + Default width of the Composer Window. - + Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail. - + Users get all up in arms over where their signature should go @@ -5440,7 +5458,7 @@ placed at the top of the message or the bottom. - + @@ -5448,7 +5466,7 @@ - + @@ -5457,7 +5475,7 @@ - + @@ -5466,7 +5484,7 @@ - + @@ -5475,7 +5493,7 @@ - + @@ -5484,7 +5502,7 @@ - + @@ -5493,14 +5511,14 @@ - + List of dictionary language codes used for spell checking. - + #FFFF00000000 @@ -5510,7 +5528,7 @@ - + @@ -5518,7 +5536,7 @@ - + @@ -5526,7 +5544,7 @@ - + Users get all up in arms over where the cursor should go when @@ -5534,7 +5552,7 @@ at the top of the message or the bottom. - + @@ -5545,7 +5563,7 @@ - + @@ -5553,7 +5571,7 @@ - + @@ -5561,7 +5579,7 @@ - + @@ -5569,7 +5587,7 @@ - + @@ -5581,7 +5599,7 @@ - + @@ -5590,13 +5608,13 @@ - + It disables/enables the repeated prompts to warn that you are trying sending a private reply to a message which arrived via a mailing list, but the list sets a Reply-To: header which redirects your reply back to the list - + @@ -5606,7 +5624,7 @@ - + @@ -5616,7 +5634,7 @@ - + @@ -5624,7 +5642,7 @@ - + @@ -5633,7 +5651,7 @@ - + @@ -5642,7 +5660,7 @@ - + @@ -5650,7 +5668,7 @@ - + @@ -5658,7 +5676,7 @@ - + @@ -5667,7 +5685,7 @@ - + Every time Evolution starts, check whether or not it is the default mailer. @@ -6838,197 +6856,197 @@ - + gnome-system-monitor.desktop - + #000000 - + #FF6700 - + #C65000 - + #000000 - + #d50000 - + #000000 - + #8b00c3 - + #000000 - + #c4a000 - + #edd400 - + #fce94f - + #000000 - + #AAF5D0 - + #00ff82 - + #00e675 - + #00b35b - + #000000 - + #002f3d - + #00a3ff - + #0092e6 - + #0072b3 - + For horizontal panels, the width of the graphs in pixels. For vertical panels, this is the height of the graphs. - + - + - + - + - + - + - + @@ -7037,37 +7055,37 @@ - + Empty notes are always deleted without confirmation. - + If this option is enabled, selecting the desktop in any way will automatically hide all the open notes. - + If this option is enabled, the custom colors and fonts that have been assigned to individual notes will be ignored. - + If this option is disabled, a custom font can be used as the default font for all sticky notes. - + If this option is disabled, a custom color can be used as the default color for all sticky notes. - + %x @@ -7075,13 +7093,13 @@ By default, sticky notes are given the current date as the title when they are created. This format is used; anything that can be parsed by strftime() is valid. - + Specifies whether the sticky notes are locked (non-editable) or not. - + Specifies whether the sticky notes are visible on ALL workspaces on the desktop, or not. @@ -7089,7 +7107,7 @@ - + Sans 10 @@ -7097,7 +7115,7 @@ Default font for new sticky notes. This should be a Pango Font Name, for example "Sans Italic 10". - + #000000 @@ -7105,7 +7123,7 @@ Default font color for new sticky notes. This should be in html hex specification, for example "#000000". - + #ECF833 @@ -7113,13 +7131,13 @@ Default color for new sticky notes. This should be in html hex specification, for example "#30FF50". - + Default height for new sticky notes in pixels. - + Default width for new sticky notes in pixels. @@ -7129,17 +7147,17 @@ - + List of strings containing the available palettes. - + The string that the user had selected when the applet was last used. This string will be displayed when the user starts the applet. - + @@ -7147,17 +7165,17 @@ - + - + - + @@ -7166,34 +7184,39 @@ - + + - + /mnt/floppy + - + + - + + - + + - + Time in seconds between status updates @@ -7203,7 +7226,7 @@ - + @@ -10022,7 +10045,7 @@ - + @@ -10032,7 +10055,7 @@ - + If activated, the detailed metadata list in the properties dialog @@ -10041,13 +10064,13 @@ the widget will be embedded on the "Metadata" page. - + If activated and no image is loaded in the active window, the file chooser will display the user's pictures folder using the XDG special user directories. If deactivated or the pictures folder has not been set up, it will show the current working directory. - + If activated, Eye of GNOME won't ask for confirmation when @@ -10055,44 +10078,44 @@ cannot be moved to the trash and would be deleted instead. - + - + - + - + - + - + - + - + A value greater than 0 determines the seconds an image stays @@ -10100,14 +10123,14 @@ disables the automatic browsing. - + If this is set to FALSE small images will not be stretched to fit into the screen initially. - + Whether the sequence of images should be shown in an @@ -10116,7 +10139,7 @@ - + #000000 @@ -10126,7 +10149,7 @@ - + The multiplier to be applied when using the mouse scroll wheel @@ -10135,13 +10158,13 @@ scroll event and 1.00 result in a 100% zoom increment. - + Whether the scroll wheel should be used for zooming. - + CHECK_PATTERN @@ -10152,7 +10175,7 @@ - + Whether the image should be extrapolated on zoom-in. @@ -10160,7 +10183,7 @@ non-extrapolated images. - + Whether the image should be interpolated on zoom-out. @@ -10168,13 +10191,13 @@ non-interpolated images. - + If this is active, the color set by the background-color key will be used to fill the area behind the image. If it is not set, the current GTK+ theme will determine the fill color. - + #000000 @@ -10184,7 +10207,7 @@ by the active GTK+ theme instead. - + Whether the image should be rotated automatically based on @@ -11209,7 +11232,7 @@ - + @@ -11220,7 +11243,7 @@ - + @@ -11229,7 +11252,7 @@ - + @@ -11244,7 +11267,7 @@ - + @@ -11253,7 +11276,7 @@ - + @@ -11262,7 +11285,7 @@ - + @@ -11272,7 +11295,7 @@ - + never @@ -11283,7 +11306,7 @@ - + @@ -11296,7 +11319,7 @@ - + If true, the panel will not allow a user to force @@ -11305,7 +11328,7 @@ - + If true, the panel will not allow a user to log out, @@ -11313,7 +11336,7 @@ - + This key is deprecated as it cannot be used to implement proper @@ -11322,7 +11345,7 @@ - + @@ -11333,7 +11356,7 @@ - + If true, the panel will not allow any changes to @@ -11343,7 +11366,7 @@ - + If true, a launcher is highlighted when the user @@ -11351,7 +11374,7 @@ - + If true, a dialog is shown asking for confirmation @@ -11359,7 +11382,7 @@ - + If true, a drawer will automatically be closed @@ -11367,72 +11390,72 @@ - + <Alt>Print - + Print - + <Alt>F2 - + <Alt>F1 - + - + - + panel-speed-medium - + - + - + - + - + If true, tooltips are shown for objects in panels. @@ -11441,7 +11464,7 @@ - + lock @@ -11453,7 +11476,7 @@ - + @@ -11465,7 +11488,7 @@ - + applications:/ @@ -11477,7 +11500,7 @@ - + @@ -11488,7 +11511,7 @@ - + @@ -11501,7 +11524,7 @@ - + @@ -11512,7 +11535,7 @@ - + @@ -11524,7 +11547,7 @@ - + @@ -11535,7 +11558,7 @@ - + @@ -11548,7 +11571,7 @@ - + @@ -11561,7 +11584,7 @@ - + @@ -11570,7 +11593,7 @@ - + @@ -11579,7 +11602,7 @@ - + @@ -11589,7 +11612,7 @@ - + @@ -11599,7 +11622,7 @@ - + menu-object @@ -11617,31 +11640,31 @@ - + - + OAFIID:GNOME_ClockApplet - + - + 00000002 - + bonobo-applet @@ -11650,31 +11673,31 @@ - + - + OAFIID:GNOME_MixerApplet - + - + 00000002 - + bonobo-applet @@ -11683,31 +11706,31 @@ - + - + OAFIID:GNOME_PagerApplet - + - + 00000001 - + bonobo-applet @@ -11716,31 +11739,31 @@ - + - + OAFIID:GNOME_TasklistApplet - + - + 00000001 - + bonobo-applet @@ -11749,31 +11772,31 @@ - + - + OAFIID:GNOME_ShowDesktopApplet - + - + 00000001 - + bonobo-applet @@ -11784,31 +11807,31 @@ - + - + - + 00000002 - + applications:///System/gnome-terminal.desktop - + launcher-object @@ -11817,31 +11840,31 @@ - + - + - + 00000002 - + applications:///nautilus.desktop - + launcher-object @@ -11852,67 +11875,67 @@ - + %I:%M %p - + #000000 - + - + - + - + - + no-background - + - + - + panel-size-x-small - + menu-panel @@ -11921,92 +11944,92 @@ - + - + #ffffff - + - + - + - + - + no-background - + - + - + panel-edge-bottom - + - + - + - + - + panel-size-x-small - + edge-panel @@ -12016,7 +12039,7 @@ - +
  • @@ -12028,7 +12051,7 @@ - +
  • @@ -12049,7 +12072,7 @@ - +
  • @@ -12065,7 +12088,7 @@
    • - + fast @@ -12077,7 +12100,7 @@ - + @@ -12087,7 +12110,7 @@ - + @@ -12098,7 +12121,7 @@ - + @@ -12108,7 +12131,7 @@ - + @@ -12117,7 +12140,7 @@ - + @@ -12127,7 +12150,7 @@ - + @@ -12136,7 +12159,7 @@ - + @@ -12146,7 +12169,7 @@ - + @@ -12158,7 +12181,7 @@ - + @@ -12170,7 +12193,7 @@ - + @@ -12184,7 +12207,7 @@ - + @@ -12198,7 +12221,7 @@ - + @@ -12209,7 +12232,7 @@ - + @@ -12220,7 +12243,7 @@ - + @@ -12231,7 +12254,7 @@ - + top @@ -12249,7 +12272,7 @@ - + @@ -12261,7 +12284,7 @@ - + @@ -12271,7 +12294,7 @@ - + @@ -12281,7 +12304,7 @@ - + @@ -12294,7 +12317,7 @@ - + @@ -12303,7 +12326,7 @@ - + @@ -12312,7 +12335,7 @@ - + @@ -12321,7 +12344,7 @@ - + @@ -12333,7 +12356,7 @@ - + @@ -12344,7 +12367,7 @@ - + #ffffff @@ -12355,7 +12378,7 @@ - + gtk @@ -12372,7 +12395,7 @@ - + @@ -12382,7 +12405,7 @@ - + @@ -12395,7 +12418,7 @@ - + @@ -12407,7 +12430,7 @@ - + @@ -12418,7 +12441,7 @@ - + @@ -12427,7 +12450,7 @@ - + @@ -12438,7 +12461,7 @@ - + @@ -12453,7 +12476,7 @@ - + Default @@ -12463,7 +12486,7 @@ - + Default @@ -12473,7 +12496,7 @@ - + @@ -12482,7 +12505,7 @@ - + @@ -12492,7 +12515,7 @@ - + @@ -12502,7 +12525,7 @@ - + @@ -12512,7 +12535,7 @@ - + @@ -12521,7 +12544,7 @@ - + @@ -12530,7 +12553,7 @@ - + @@ -12538,7 +12561,7 @@ - + @@ -12546,7 +12569,7 @@ - + @@ -12554,7 +12577,7 @@ - + @@ -12562,7 +12585,7 @@ - + @@ -12574,7 +12597,7 @@ - + @@ -12584,19 +12607,19 @@ - + If true, show the temperature next to the weather icon. - + If true, display a weather icon. - + @@ -12604,19 +12627,19 @@ - + If true, display date in the clock, in addition to time. - + If true, display seconds in time. - + @@ -12629,7 +12652,7 @@ - + 24-hour @@ -12676,7 +12699,7 @@ - + @@ -12685,7 +12708,7 @@ - + @@ -12694,7 +12717,7 @@ - + @@ -12703,7 +12726,7 @@ - + fortune @@ -12714,7 +12737,7 @@ - + wanda.png @@ -12726,7 +12749,7 @@ - + Wanda diff --git a/gconf/schemas/cpufreq-applet.schemas b/gconf/schemas/cpufreq-applet.schemas deleted file mode 100644 index 876dbfc..0000000 --- a/gconf/schemas/cpufreq-applet.schemas +++ /dev/null @@ -1,81 +0,0 @@ - - - - - /schemas/apps/cpufreq-applet/prefs/cpu - cpufreq-applet - int - 0 - - CPU to Monitor - Set the CPU to monitor. In a single processor system you don't have to change it. - - - - Zu überwachender Prozessor - Den zu überwachenden Prozessor festlegen. In einem Ein-Prozessorsystem kann dieser Wert nicht geändert werden. - - - - CPU to Monitor - Set the CPU to monitor. In a single processor system you don't have to change it. - - - - Отслеживаемый процессор - Устанавливает отслеживаемый процессор. На однопроцессорной системе изменять не надо. - - - - /schemas/apps/cpufreq-applet/prefs/show_mode - cpufreq-applet - int - 2 - - Mode to show cpu usage - A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode. - - - - Modus zur Anzeige der Prozessorlast - Der Wert 0 bedeutet, dass das Applet im Grafikmodus (nur Bilder), der Wert 1 dass das Applet im Textmodus (ohne Grafiken) und der Wert 2 dass das Applet im Grafik- und Textmodus angezeigt wird. - - - - Mode to show cpu usage - A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode. - - - - Режим показа использования ЦП - 0 - показывать апплет в графическом режиме (только изображение), 1 - текстовый режим (не показывать изображение), 2 - показывать и текст, и изображение. - - - - /schemas/apps/cpufreq-applet/prefs/show_text_mode - cpufreq-applet - int - 1 - - The type of text to display (if the text is enabled). - A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency. - - - - Die Art des anzuzeigenden Textes (falls der Text aktiviert ist). - Der Wert 0 bedeutet, dass der Prozessortakt angezeigt wird, der Wert 1 dass der Takt und die Einheiten angezeigt und der Wert 2 dass ein Prozentwert anstatt des Taktes angezeigt wird. - - - - The type of text to display (if the text is enabled). - A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency. - - - - Тип отображаемого текста (если текст разрешён). - 0 - показывать частоту ЦП, 1 - частоту и единицы, 2 - проценты вместо частоты. - - - - - diff --git a/gconf/schemas/gucharmap.schemas b/gconf/schemas/gucharmap.schemas deleted file mode 100644 index 74304af..0000000 --- a/gconf/schemas/gucharmap.schemas +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - /schemas/apps/gucharmap/chapters_mode - /apps/gucharmap/chapters_mode - gucharmap - string - - - - - - - - /schemas/apps/gucharmap/last_char - /apps/gucharmap/last_char - gucharmap - string - 0 - - - - - - - - /schemas/apps/gucharmap/font - /apps/gucharmap/font - gucharmap - string - - - - - - - - /schemas/apps/gucharmap/height - /apps/gucharmap/height - gucharmap - int - 0 - - - - - - - - /schemas/apps/gucharmap/snap_cols_pow2 - /apps/gucharmap/snap_cols_pow2 - gucharmap - bool - false - - - - - - - - /schemas/apps/gucharmap/width - /apps/gucharmap/width - gucharmap - int - 0 - - - - - - - - /schemas/apps/gucharmap/maximized - /apps/gucharmap/maximized - gucharmap - bool - false - - - - - - - - /schemas/apps/gucharmap/fullscreen - /apps/gucharmap/fullscreen - gucharmap - bool - false - - - - - - - - diff --git a/gconf/schemas/libcanberra.schemas b/gconf/schemas/libcanberra.schemas deleted file mode 100644 index 7002844..0000000 --- a/gconf/schemas/libcanberra.schemas +++ /dev/null @@ -1,16 +0,0 @@ - - - - - /schemas/apps/gnome_settings_daemon/gtk-modules/canberra-gtk-module - /apps/gnome_settings_daemon/gtk-modules/canberra-gtk-module - libcanberra - bool - true - - GTK+ module for event sounds - This key determines the GTK+ module to load for event sound support. - - - - diff --git a/gconf/schemas/virt-manager.schemas b/gconf/schemas/virt-manager.schemas index de194d1..53a7cae 100644 --- a/gconf/schemas/virt-manager.schemas +++ b/gconf/schemas/virt-manager.schemas @@ -196,8 +196,8 @@ - /schemas/apps/virt-manager/new-vm/graphics-type - /apps/virt-manager/new-vm/graphics-type + /schemas/apps/virt-manager/new-vm/graphics_type + /apps/virt-manager/new-vm/graphics_type virt-manager string vnc @@ -208,6 +208,19 @@ + + /schemas/apps/virt-manager/new-vm/storage-format + /apps/virt-manager/new-vm/storage-format + virt-manager + string + default + + + Use selected format for new VM storage + Use selected format when creating new disk images in new VM wizard + + + /schemas/apps/virt-manager/system-tray /apps/virt-manager/system-tray diff --git a/gimp/2.0/gimprc b/gimp/2.0/gimprc index 5beb899..8306571 100644 --- a/gimp/2.0/gimprc +++ b/gimp/2.0/gimprc @@ -42,13 +42,26 @@ # specified in bytes, kilobytes, megabytes or gigabytes. If no suffix is # specified the size defaults to being specified in kilobytes. # -# (tile-cache-size 1024M) +# (tile-cache-size 2038980k) + +# Specifies the language to use for the user interface. This is a string +# value. +# +# # Sets the level of interpolation used for scaling and other transformations. # Possible values are none, linear, cubic and lanczos. # # (interpolation-type cubic) +# Tools such as fuzzy-select and bucket fill find regions based on a +# seed-fill algorithm. The seed fill starts at the initially selected pixel +# and progresses in all directions until the difference of pixel intensity +# from the original is greater than a specified threshold. This value +# represents the default threshold. This is an integer value. +# +# (default-threshold 15) + # Sets the plug-in search path. This is a colon-separated list of folders to # search. # @@ -74,16 +87,25 @@ # # (brush-path "${gimp_dir}/brushes:${gimp_data_dir}/brushes") -# This is a colon-separated list of folders to search. +# This is a colon-separated list of folders to search. # # (brush-path-writable "${gimp_dir}/brushes") +# Sets the dynamics search path. This is a colon-separated list of folders +# to search. +# +# (dynamics-path "${gimp_dir}/dynamics:${gimp_data_dir}/dynamics") + +# This is a colon-separated list of folders to search. +# +# (dynamics-path-writable "${gimp_dir}/dynamics") + # Sets the pattern search path. This is a colon-separated list of folders to # search. # # (pattern-path "${gimp_dir}/patterns:${gimp_data_dir}/patterns") -# This is a colon-separated list of folders to search. +# This is a colon-separated list of folders to search. # # (pattern-path-writable "${gimp_dir}/patterns") @@ -92,7 +114,7 @@ # # (palette-path "${gimp_dir}/palettes:${gimp_data_dir}/palettes") -# This is a colon-separated list of folders to search. +# This is a colon-separated list of folders to search. # # (palette-path-writable "${gimp_dir}/palettes") @@ -101,10 +123,19 @@ # # (gradient-path "${gimp_dir}/gradients:${gimp_data_dir}/gradients") -# This is a colon-separated list of folders to search. +# This is a colon-separated list of folders to search. # # (gradient-path-writable "${gimp_dir}/gradients") +# Sets the dynamics search path. This is a colon-separated list of folders +# to search. +# +# (tool-preset-path "${gimp_dir}/tool-presets:${gimp_data_dir}/tool-presets") + +# This is a colon-separated list of folders to search. +# +# (tool-preset-path-writable "${gimp_dir}/tool-presets") + # Where to look for fonts in addition to the system-wide installed fonts. # This is a colon-separated list of folders to search. # @@ -113,7 +144,12 @@ # Specify a default brush. The brush is searched for in the specified brush # path. This is a string value. # -# (default-brush "Circle (11)") +# (default-brush "Round Fuzzy") + +# Specify a default dynamics. The dynamics is searched for in the specified +# dynamics path. This is a string value. +# +# (default-dynamics "Dynamics Off") # Specify a default pattern. This is a string value. # @@ -127,6 +163,11 @@ # # (default-gradient "FG to BG (RGB)") +# Specify a default tool preset. The tool preset is searched for in the +# specified tool prests path. This is a string value. +# +# (default-tool-preset "Current Options") + # Specify a default font. This is a string value. # # (default-font "Sans") @@ -136,6 +177,11 @@ # # (global-brush yes) +# When enabled, the selected dynamics will be used for all tools. Possible +# values are yes and no. +# +# (global-dynamics yes) + # When enabled, the selected pattern will be used for all tools. Possible # values are yes and no. # @@ -237,16 +283,6 @@ # # (thumbnail-filesize-limit 4M) -# Install a private colormap; might be useful on 8-bit (256 colors) displays. -# Possible values are yes and no. -# -# (install-colormap no) - -# Generally only a concern for 8-bit displays, this sets the minimum number -# of system colors allocated for GIMP. This is an integer value. -# -# (min-colors 144) - # Defines the color management behavior. This is a parameter list. # # (color-management @@ -268,6 +304,12 @@ # # (save-document-history yes) +# Sets the default quick mask color. The color is specified in the form +# (color-rgba red green blue alpha) with channel values as floats in the +# range of 0.0 to 1.0. +# +# (quick-mask-color (color-rgba 1.000000 0.000000 0.000000 0.500000)) + # Sets the size of the checkerboard used to display transparency. Possible # values are small-checks, medium-checks and large-checks. # @@ -314,7 +356,7 @@ # When enabled, the X server is queried for the mouse's current position on # each motion event, rather than relying on the position hint. This means # painting with large brushes should be more accurate, but it may be slower. -# Perversely, on some X servers enabling this option results in faster +# Conversely, on some X servers enabling this option results in faster # painting. Possible values are yes and no. # # (perfect-mouse yes) @@ -365,6 +407,7 @@ # %W image width in real-world units # %h image height in pixels # %H image height in real-world units +# %M the image size expressed in megapixels # %u unit symbol # %U unit abbreviation # @@ -397,6 +440,7 @@ # %W image width in real-world units # %h image height in pixels # %H image height in real-world units +# %M the image size expressed in megapixels # %u unit symbol # %U unit abbreviation # @@ -435,9 +479,9 @@ # # (default-view # (show-menubar yes) +# (show-statusbar yes) # (show-rulers yes) # (show-scrollbars yes) -# (show-statusbar yes) # (show-selection yes) # (show-layer-boundary yes) # (show-guides yes) @@ -451,9 +495,9 @@ # # (default-fullscreen-view # (show-menubar yes) +# (show-statusbar yes) # (show-rulers yes) # (show-scrollbars yes) -# (show-statusbar yes) # (show-selection yes) # (show-layer-boundary yes) # (show-guides yes) @@ -462,6 +506,26 @@ # (padding-mode default) # (padding-color (color-rgb 1.000000 1.000000 1.000000))) +# Snap to guides by default in new image windows. Possible values are yes +# and no. +# +# (default-snap-to-guides yes) + +# Snap to the grid by default in new image windows. Possible values are yes +# and no. +# +# (default-snap-to-grid no) + +# Snap to the canvas edge by default in new image windows. Possible values +# are yes and no. +# +# (default-snap-to-canvas no) + +# Snap to the active path by default in new image windows. Possible values +# are yes and no. +# +# (default-snap-to-path no) + # When enabled, an image will become the active image when its image window # receives the focus. This is useful for window managers using "click to # focus". Possible values are yes and no. @@ -473,26 +537,15 @@ # # (space-bar-action pan) -# Sets the color that is used for XOR drawing. This setting only exists as a -# workaround for buggy display drivers. If lines on the canvas are not -# correctly undrawn, try to set this to white. The color is specified in the -# form (color-rgb red green blue) with channel values as floats in the range -# of 0.0 to 1.0. -# -# (xor-color (color-rgb 0.501961 1.000000 0.501961)) - # There's a tradeoff between speed and quality of the zoomed-out display. # Possible values are low and high. # # (zoom-quality high) -# Tools such as fuzzy-select and bucket fill find regions based on a -# seed-fill algorithm. The seed fill starts at the initially selected pixel -# and progresses in all directions until the difference of pixel intensity -# from the original is greater than a specified threshold. This value -# represents the default threshold. This is an integer value. +# Bugs in event history buffer are frequent so in case of cursor offset +# problems turning it off helps. Possible values are yes and no. # -# (default-threshold 15) +# (use-event-history no) # If enabled, the move tool sets the edited layer or path as active. This # used to be the default behaviour in older versions. Possible values are @@ -500,6 +553,11 @@ # # (move-tool-changes-active no) +# How many recent settings to keep around in color correction tools This is +# an integer value. +# +# (image-map-tool-max-recent 10) + # When enabled, GIMP will not save an image if it has not been changed since # it was opened. Possible values are yes and no. # @@ -549,11 +607,6 @@ # # (restore-accels yes) -# When enabled, GIMP will show mnemonics in menus. Possible values are yes -# and no. -# -# (menu-mnemonics yes) - # How many recently opened image filenames to keep on the File menu. This is # an integer value. # @@ -619,14 +672,6 @@ # # (help-browser gimp) -# Sets the external web browser to be used. This can be an absolute path or -# the name of an executable to search for in the user's PATH. If the command -# contains '%s' it will be replaced with the URL, else the URL will be -# appended to the command with a space separating the two. This is a single -# filename. -# -# (web-browser "firefox %s") - # When enabled, the online user manual will be used by the help system. # Otherwise the locally installed copy is used. Possible values are yes and # no. @@ -636,32 +681,24 @@ # The location of the online user manual. This is used if # 'user-manual-online' is enabled. This is a string value. # -# (user-manual-online-uri "http://docs.gimp.org/2.6") - -# The window type hint that is set on the toolbox. This may affect how your -# window manager decorates and handles the toolbox window. Possible values -# are normal, utility and keep-above. -# -# (toolbox-window-hint utility) +# (user-manual-online-uri "http://docs.gimp.org/2.8") -# The window type hint that is set on dock windows. This may affect the way -# your window manager decorates and handles dock windows. Possible values -# are normal, utility and keep-above. +# The window type hint that is set on dock windows and the toolbox window. +# This may affect the way your window manager decorates and handles these +# windows. Possible values are normal, utility and keep-above. # # (dock-window-hint utility) -# When enabled, dock windows (the toolbox and palettes) are set to be -# transient to the active image window. Most window managers will keep the -# dock windows above the image window then, but it may also have other -# effects. Possible values are yes and no. -# -# (transient-docks no) - # Sets the pixel format to use for mouse pointers. Possible values are # bitmap and pixbuf. # # (cursor-format pixbuf) +# Sets the handedness for cursor positioning. Possible values are left and +# right. +# +# (cursor-handedness right) + # Where to search for fractals used by the Fractal Explorer plug-in. This is # a colon-separated list of folders to search. # diff --git a/gimp/2.0/gtkrc b/gimp/2.0/gtkrc index 5d5cf78..f4efa07 100644 --- a/gimp/2.0/gtkrc +++ b/gimp/2.0/gtkrc @@ -22,14 +22,3 @@ style "gimp-large-preview" } # class "GimpPreview" style "gimp-large-preview" - - -# -# Change the dock separator DND highlight color: -# -style "gimp-red-separator-style" -{ - bg[SELECTED] = "#aa2448" -} - -# widget "*gimp-dock-separator*" style "gimp-red-separator-style" diff --git a/gimp/2.0/menurc b/gimp/2.0/menurc index 03d6594..9f5dda0 100644 --- a/gimp/2.0/menurc +++ b/gimp/2.0/menurc @@ -1,3 +1,3 @@ ; gimp GtkAccelMap rc-file -*- scheme -*- ; -(gtk_accel_path "/plug-in/file-print-gtk" "p") +(gtk_accel_path "/plug-in/file-print-gtk" "p") diff --git a/gimp/2.0/ps-menurc b/gimp/2.0/ps-menurc deleted file mode 100644 index 458682d..0000000 --- a/gimp/2.0/ps-menurc +++ /dev/null @@ -1,124 +0,0 @@ -; This file installs keyboard shortcuts from Photoshop 6 in GIMP. -; -; Rename it to 'menurc' and place it into your personal GIMP directory: -; ~/.gimp-2.4 folder (Linux) or C:\Documents and Settings\\.gimp-2.4 -; folder (Windows). -; -; There is a web-page describing these keybindings at -; http://epierce.freeshell.org/gimp/gimp_ps.php -; -(gtk_accel_path "/view/view-show-selection" "h") -(gtk_accel_path "/layers/layers-resize-to-image" "y") -(gtk_accel_path "/image/image-merge-layers" "e") -(gtk_accel_path "/view/view-zoom-in" "equal") -(gtk_accel_path "/tools/tools-clone" "s") -(gtk_accel_path "/tools/tools-ellipse-select" "m") -(gtk_accel_path "/view/view-show-grid" "apostrophe") -(gtk_accel_path "/context/context-brush-select-last" "greater") -(gtk_accel_path "/layers/layers-alpha-selection-replace" "a") -(gtk_accel_path "/dialogs/dialogs-layers" "F7") -(gtk_accel_path "/dialogs/dialogs-brushes" "") -(gtk_accel_path "/view/view-info-window" "F8") -(gtk_accel_path "/layers/layers-duplicate" "j") -(gtk_accel_path "/dialogs/dialogs-channels" "F7") -(gtk_accel_path "/layers/layers-preserve-transparency" "slash") -(gtk_accel_path "/dialogs/dialogs-preferences" "k") -(gtk_accel_path "/plug-in/tiny_fu_refresh" "t") -(gtk_accel_path "/view/view-zoom-out" "minus") -(gtk_accel_path "/edit/edit-named-copy" "") -(gtk_accel_path "/edit/edit-named-paste" "") -(gtk_accel_path "/dialogs/dialogs-gradients" "g") -(gtk_accel_path "/context/context-brush-select-first" "less") -(gtk_accel_path "/tools/tools-vector" "p") -(gtk_accel_path "/tools/tools-scale" "t") -(gtk_accel_path "/tools/tools-paintbrush" "b") -(gtk_accel_path "/edit/edit-paste-into" "v") -(gtk_accel_path "/tools/tools-airbrush" "j") -(gtk_accel_path "/dialogs/dialogs-colors" "F6") -(gtk_accel_path "/layers/layers-new" "n") -(gtk_accel_path "/view/view-zoom-1-1" "0") -(gtk_accel_path "/image/image-rotate-180" "8") -(gtk_accel_path "/edit/edit-fill-fg" "BackSpace") -(gtk_accel_path "/context/context-brush-hardness-decrease-skip" "braceleft") -(gtk_accel_path "/tools/tools-blend" "g") -(gtk_accel_path "/tools/tools-free-select" "l") -(gtk_accel_path "/tools/tools-eraser" "e") -(gtk_accel_path "/view/view-zoom-fit-in" "") -(gtk_accel_path "/view/view-navigation-window" "") -(gtk_accel_path "/context/context-brush-hardness-increase-skip" "braceright") -(gtk_accel_path "/select/select-feather" "d") -(gtk_accel_path "/tools/tools-color-balance" "b") -(gtk_accel_path "/plug-in/plug_in_c_astretch" "l") -(gtk_accel_path "/tools/tools-by-color-select" "c") -(gtk_accel_path "/layers/layers-select-bottom" "braceleft") -(gtk_accel_path "/tools/tools-levels" "l") -(gtk_accel_path "/tools/tools-bucket-fill" "g") -(gtk_accel_path "/tools/tools-convolve" "r") -(gtk_accel_path "/image/image-duplicate" "") -(gtk_accel_path "/plug-in/plug_in_bump_map" "m") -(gtk_accel_path "/tools/tools-magnify" "z") -(gtk_accel_path "/layers/layers-mode-previous" "underscore") -(gtk_accel_path "/edit/edit-clear" "Delete") -(gtk_accel_path "/plug-in/plug_in_iwarp" "x") -(gtk_accel_path "/select/select-none" "d") -(gtk_accel_path "/file/file-save-a-copy" "s") -(gtk_accel_path "/dialogs/dialogs-tool-options" "F5") -(gtk_accel_path "/tools/tools-move" "v") -(gtk_accel_path "/view/view-show-rulers" "r") -(gtk_accel_path "/tools/tools-curves" "m") -(gtk_accel_path "/tools/tools-measure" "u") -(gtk_accel_path "/edit/edit-redo" "z") -(gtk_accel_path "/view/view-scroll-page-down" "Page_Down") -(gtk_accel_path "/tools/tools-crop" "c") -(gtk_accel_path "/edit/edit-fill-bg" "BackSpace") -(gtk_accel_path "/layers/layers-mode-next" "plus") -(gtk_accel_path "/view/view-show-menubar" "f") -(gtk_accel_path "/tools/tools-iscissors" "") -(gtk_accel_path "/image/image-flatten" "i") -(gtk_accel_path "/view/view-snap-to-guides" "semicolon") -(gtk_accel_path "/dialogs/dialogs-undo-history" "F9") -(gtk_accel_path "/view/view-show-guides" "apostrophe") -(gtk_accel_path "/edit/edit-fill-pattern" "") -(gtk_accel_path "/tools/tools-rotate" "") -(gtk_accel_path "/plug-in/plug_in_gauss" "b") -(gtk_accel_path "/layers/layers-select-previous" "bracketright") -(gtk_accel_path "/tools/tools-hue-saturation" "u") -(gtk_accel_path "/image/image-rotate-270" "7") -(gtk_accel_path "/plug-in/file_print_gimp" "p") -(gtk_accel_path "/tools/tools-dodge-burn" "o") -(gtk_accel_path "/tools/tools-rect-select" "m") -(gtk_accel_path "/file/file-open-recent-10" "") -(gtk_accel_path "/view/view-zoom-fit-to" "0") -(gtk_accel_path "/view/view-scroll-page-up" "Page_Up") -(gtk_accel_path "/tools/tools-flip" "f") -(gtk_accel_path "/plug-in/script_fu_refresh" "r") -(gtk_accel_path "/view/view-scroll-page-right" "Page_Down") -(gtk_accel_path "/image/image-convert-indexed" "backslash") -(gtk_accel_path "/layers/layers-lower-to-bottom" "braceleft") -(gtk_accel_path "/layers/layers-mask-add" "o") -(gtk_accel_path "/image/image-rotate-90" "9") -(gtk_accel_path "/dialogs/dialogs-vectors" "F9") -(gtk_accel_path "/view/view-scroll-page-left" "Page_Up") -(gtk_accel_path "/layers/layers-lower" "bracketleft") -(gtk_accel_path "/layers/layers-raise-to-top" "braceright") -(gtk_accel_path "/layers/layers-merge-down" "e") -(gtk_accel_path "/layers/layers-raise" "bracketright") -(gtk_accel_path "/layers/layers-anchor" "h") -(gtk_accel_path "/edit/edit-named-cut" "") -(gtk_accel_path "/file/file-revert" "F12") -(gtk_accel_path "/tools/tools-smudge" "") -(gtk_accel_path "/drawable/drawable-desaturate" "u") -(gtk_accel_path "/layers/layers-select-top" "braceright") -(gtk_accel_path "/dialogs/dialogs-document-history" "h") -(gtk_accel_path "/select/select-float" "") -(gtk_accel_path "/drawable/drawable-invert" "i") -(gtk_accel_path "/context/context-brush-select-previous" "comma") -(gtk_accel_path "/context/context-brush-select-next" "period") -(gtk_accel_path "/plug-in/plug_in_colortoalpha" "a") -(gtk_accel_path "/select/select-invert" "i") -(gtk_accel_path "/tools/tools-fuzzy-select" "w") -(gtk_accel_path "/dialogs/dialogs-palettes" "l") -(gtk_accel_path "/tools/tools-color-picker" "i") -(gtk_accel_path "/qmask/qmask-toggle" "q") -(gtk_accel_path "/layers/layers-select-next" "bracketleft") -(gtk_accel_path "/view/view-shrink-wrap" "") diff --git a/gimp/2.0/sessionrc b/gimp/2.0/sessionrc index 754abf7..f41c3bf 100644 --- a/gimp/2.0/sessionrc +++ b/gimp/2.0/sessionrc @@ -5,37 +5,43 @@ # of course you can do. The sessionrc will be entirely rewritten every time # you quit GIMP. If this file isn't found, defaults are used. -(session-info "toolbox" "dock" +(session-info "dock" "gimp-toolbox-window" (position 0 0) (size 170 820) (open-on-exit) - (dock + (gimp-toolbox (book - (dockable "gimp-tool-options")))) -(session-info "dock" "dock" + (dockable "gimp-tool-options" + (tab-style automatic))))) +(session-info "dock" "gimp-dock-window" (position -0 0) (size 210 820) (open-on-exit) - (aux-info - (show-image-menu "true") - (follow-active-image "true")) - (dock + (gimp-dock (book (dockable "gimp-layer-list" - (tab-style icon)) + (tab-style automatic)) (dockable "gimp-channel-list" - (tab-style icon)) + (tab-style automatic)) (dockable "gimp-vectors-list" - (tab-style icon)) + (tab-style automatic)) (dockable "gimp-undo-history" - (tab-style icon))) + (tab-style automatic))) (book (position 420) (dockable "gimp-brush-grid" - (tab-style preview)) + (tab-style automatic)) (dockable "gimp-pattern-grid" - (tab-style preview)) + (tab-style automatic)) (dockable "gimp-gradient-list" - (tab-style preview))))) + (tab-style automatic))))) +(session-info "toplevel" + (factory-entry "gimp-empty-image-window") + (position 410 370) + (size 620 200)) +(session-info "toplevel" + (factory-entry "gimp-single-image-window") + (position 160 70) + (size 1140 780)) # end of sessionrc diff --git a/group b/group index 4c80fe9..dd5ed39 100644 --- a/group +++ b/group @@ -63,3 +63,4 @@ realtime:x:985: qemu:x:984: kvm:x:983:qemu colord:x:982: +polkitd:x:981: diff --git a/group- b/group- index 9ec788f..4c80fe9 100644 --- a/group- +++ b/group- @@ -61,5 +61,5 @@ postdrop:x:208: wireshark:x:986: realtime:x:985: qemu:x:984: -kvm:x:983: +kvm:x:983:qemu colord:x:982: diff --git a/gshadow b/gshadow index 9567348..399136e 100644 --- a/gshadow +++ b/gshadow @@ -63,3 +63,4 @@ realtime:!:: qemu:!:: kvm:!::qemu colord:!:: +polkitd:!:: diff --git a/gshadow- b/gshadow- index e4c2bfe..9567348 100644 --- a/gshadow- +++ b/gshadow- @@ -61,5 +61,5 @@ postdrop:!:: wireshark:!:: realtime:!:: qemu:!:: -kvm:!:: +kvm:!::qemu colord:!:: diff --git a/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules b/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules index f529976..0dc1cb2 100644 --- a/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules +++ b/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules @@ -1,39 +1,39 @@ # GTK+ Input Method Modules file # Automatically generated file, do not edit -# Created by gtk-query-immodules-2.0 from gtk+-2.24.10 +# Created by gtk-query-immodules-2.0 from gtk+-2.24.12 # # ModulesPath = /root/.gtk-2.0/2.10.0/x86_64-pc-linux-gnu/immodules:/root/.gtk-2.0/2.10.0/immodules:/root/.gtk-2.0/x86_64-pc-linux-gnu/immodules:/root/.gtk-2.0/immodules:/usr/lib64/gtk-2.0/2.10.0/x86_64-pc-linux-gnu/immodules:/usr/lib64/gtk-2.0/2.10.0/immodules:/usr/lib64/gtk-2.0/x86_64-pc-linux-gnu/immodules:/usr/lib64/gtk-2.0/immodules # +"/usr/lib64/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so" +"cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "/usr/share/locale" "" + "/usr/lib64/gtk-2.0/2.10.0/immodules/im-ipa.so" "ipa" "IPA" "gtk20" "/usr/share/locale" "" -"/usr/lib64/gtk-2.0/2.10.0/immodules/im-ti-er.so" -"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "/usr/share/locale" "ti" +"/usr/lib64/gtk-2.0/2.10.0/immodules/im-ti-et.so" +"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "/usr/share/locale" "ti" + +"/usr/lib64/gtk-2.0/2.10.0/immodules/im-inuktitut.so" +"inuktitut" "Inuktitut (Transliterated)" "gtk20" "/usr/share/locale" "iu" "/usr/lib64/gtk-2.0/2.10.0/immodules/im-viqr.so" "viqr" "Vietnamese (VIQR)" "gtk20" "/usr/share/locale" "vi" -"/usr/lib64/gtk-2.0/2.10.0/immodules/im-am-et.so" -"am_et" "Amharic (EZ+)" "gtk20" "/usr/share/locale" "am" - -"/usr/lib64/gtk-2.0/2.10.0/immodules/im-xim.so" -"xim" "X Input Method" "gtk20" "/usr/share/locale" "ko:ja:th:zh" - -"/usr/lib64/gtk-2.0/2.10.0/immodules/im-thai.so" -"thai" "Thai-Lao" "gtk20" "/usr/share/locale" "lo:th" +"/usr/lib64/gtk-2.0/2.10.0/immodules/im-cedilla.so" +"cedilla" "Cedilla" "gtk20" "/usr/share/locale" "az:ca:co:fr:gv:oc:pt:sq:tr:wa" "/usr/lib64/gtk-2.0/2.10.0/immodules/im-multipress.so" "multipress" "Multipress" "gtk20" "" "" -"/usr/lib64/gtk-2.0/2.10.0/immodules/im-inuktitut.so" -"inuktitut" "Inuktitut (Transliterated)" "gtk20" "/usr/share/locale" "iu" +"/usr/lib64/gtk-2.0/2.10.0/immodules/im-thai.so" +"thai" "Thai-Lao" "gtk20" "/usr/share/locale" "lo:th" -"/usr/lib64/gtk-2.0/2.10.0/immodules/im-ti-et.so" -"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "/usr/share/locale" "ti" +"/usr/lib64/gtk-2.0/2.10.0/immodules/im-xim.so" +"xim" "X Input Method" "gtk20" "/usr/share/locale" "ko:ja:th:zh" -"/usr/lib64/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so" -"cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "/usr/share/locale" "" +"/usr/lib64/gtk-2.0/2.10.0/immodules/im-ti-er.so" +"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "/usr/share/locale" "ti" -"/usr/lib64/gtk-2.0/2.10.0/immodules/im-cedilla.so" -"cedilla" "Cedilla" "gtk20" "/usr/share/locale" "az:ca:co:fr:gv:oc:pt:sq:tr:wa" +"/usr/lib64/gtk-2.0/2.10.0/immodules/im-am-et.so" +"am_et" "Amharic (EZ+)" "gtk20" "/usr/share/locale" "am" diff --git a/host.conf b/host.conf index 4c58e52..887ab37 100644 --- a/host.conf +++ b/host.conf @@ -21,4 +21,4 @@ order hosts, bind # default, as it may cause a substantial performance loss at sites # with large hosts files. # -multi off +multi on diff --git a/hp/hplip.conf b/hp/hplip.conf index e416799..cb67ee8 100644 --- a/hp/hplip.conf +++ b/hp/hplip.conf @@ -1,15 +1,15 @@ # hplip.conf. Generated from hplip.conf.in by configure. [hplip] -version=3.12.4 +version=3.12.9 [dirs] home=/usr/share/hplip run=/var/run ppd=/usr/share/ppd/HP ppdbase=/usr/share/ppd -doc=/usr/share/doc/hplip-3.12.4 -html=/usr/share/doc/hplip-3.12.4/html +doc=/usr/share/doc/hplip-3.12.9-r1 +html=/usr/share/doc/hplip-3.12.9-r1/html icon=/usr/share/applications cupsbackend=/usr/libexec/cups/backend cupsfilter=/usr/libexec/cups/filter @@ -18,6 +18,7 @@ drv=/usr/share/cups/drv/hp # Following values are determined at configure time and cannot be changed. [configure] network-build=no +libusb01-build=no pp-build=yes gui-build=yes scanner-build=yes @@ -33,7 +34,7 @@ foomatic-rip-hplip-install=no hpcups-install=yes cups-drv-install=yes cups-ppd-install=no -internal-tag=3.12.4 +internal-tag=3.12.9 restricted-build=no ui-toolkit=qt4 qt3=no @@ -41,6 +42,7 @@ qt4=yes policy-kit=yes hpijs-only-build=no lite-build=no -udev-acl-rules=yes +udev-acl-rules=no +udev_sysfs_rules=no hpcups-only-build=no hpijs-only-build=no diff --git a/init.d/fuse b/init.d/fuse new file mode 100755 index 0000000..30b512e --- /dev/null +++ b/init.d/fuse @@ -0,0 +1,35 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +MOUNTPOINT=/sys/fs/fuse/connections + +depend() { + need localmount +} + +start() { + + ebegin "Starting fuse" + if ! grep -qw fuse /proc/filesystems; then + modprobe fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module" + fi + if grep -qw fusectl /proc/filesystems && \ + ! grep -qw $MOUNTPOINT /proc/mounts; then + mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \ + eerror $? "Error mounting control filesystem" + fi + eend ${?} + +} + +stop() { + + ebegin "Stopping fuse" + if grep -qw $MOUNTPOINT /proc/mounts; then + umount $MOUNTPOINT >/dev/null 2>&1 || \ + eerror $? "Error unmounting control filesystem" + fi + eend ${?} + +} diff --git a/init.d/nscd b/init.d/nscd index 339d03d..ebff59c 100755 --- a/init.d/nscd +++ b/init.d/nscd @@ -51,7 +51,7 @@ start() { start-stop-daemon --start --quiet --background \ --exec /usr/sbin/nscd --pidfile ${pidfile} \ - -- --foreground $secure + -- $secure eend $? } diff --git a/init.d/udev-mount b/init.d/udev-mount index 62742bd..f870039 100755 --- a/init.d/udev-mount +++ b/init.d/udev-mount @@ -6,6 +6,7 @@ description="mount devtmpfs or tmpfs on /dev" depend() { + provide dev-mount keyword -vserver -lxc } diff --git a/init.d/vde b/init.d/vde new file mode 100755 index 0000000..6400f9b --- /dev/null +++ b/init.d/vde @@ -0,0 +1,26 @@ +#!/sbin/runscript +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/files/vde.init,v 1.4 2010/01/12 12:58:36 dang Exp $ + +depend() { + after net.${VDE_TAP} +} + + +start() { + ebegin "Starting vde" + [ "${VDE_MODPROBE_TUN}" == "yes" ] && modprobe tun + start-stop-daemon --start --quiet \ + --exec /usr/bin/vde_switch -- ${VDE_OPTS} + eend $? "Failed to start vde" + chmod -R ${VDE_SOCK_CHMOD} /var/run/vde.ctl + chown -R ${VDE_SOCK_CHOWN} /var/run/vde.ctl +} + +stop() { + ebegin "Stopping vde" + [ "${VDE_MODPROBE_TUN}" == "yes" ] && modprobe -r tun + start-stop-daemon --stop --quiet --exec /usr/bin/vde_switch + eend $? "Failed to stop vde" +} diff --git a/make.conf b/make.conf index 9dfae39..4905e7f 100644 --- a/make.conf +++ b/make.conf @@ -58,7 +58,7 @@ USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa \ calendar caps cdda cddb cdparanoia cdr cgi cpudetection cscope css ctype cups curl \ curlwrappers cvs dbase dbus dga djvu doc dts dv dvb dvd dvdr dvdread eds examples \ encode exif expat fam fastcgi ffmpeg fftw fits flac flatfile fltk fontconfig \ - foomaticdb ftp gconf gd gd-external ggi \ + foomaticdb ftp fuse gconf gd gd-external ggi \ gif gimp git glade glib gmp gnome gnome-keyring \ gnustep gphoto2 graphviz gsl gsm gstreamer gtk gtk3 gtkhtml \ idn ieee1394 imagemagick imap imlib inifile ithreads java javascript \ @@ -68,12 +68,12 @@ USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa \ libnotify libsamplerate libwww live lm_sensors log4j logrotate lua lzma lzo mad meanwhile \ mercurial midi mhash mmx mmxext mng modperl modplug motif mp3 mp4 mpeg mplayer msn mtp \ musepack musicbrainz mysql mysqli nas nautilus ncurses next networkmanager nfs nis \ - nptl nsplugin numpy odbc ogg openal openexr opengl pango par pch pcntl pcre pdf \ + nptl nsplugin ntlm numpy odbc ogg openal openexr opengl pango par pch pcntl pcre pdf \ perl plasma plotutils png policykit posix postgres postscript ppds projectm pulseaudio python quicktime real \ rdesktop rle sasl sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp \ sndfile soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh \ subversion svg sysvipc tetex theora threads thumbnail tidy timidity tiff \ - tools truetype twolame udev unicode usb v4l v4l2 vcd vidix video vim-syntax vorbis wav wavpack \ + tools truetype twolame udev unicode usb v4l v4l2 vala vcd vidix video vim-syntax vorbis wav wavpack \ wddx webdav webkit win32codecs wma wmf x264 xattr xcomposite xface xft xine xinetd \ xml xmlrpc xmp xosd xpm xprint xscreensaver xsl xulrunner xvid yahoo \ yaz yv12 zeroconf zlib" diff --git a/passwd b/passwd index 5fe7b8f..9eb78f0 100644 --- a/passwd +++ b/passwd @@ -42,3 +42,4 @@ ppd:x:999:100:added by portage for ppd:/var/lib/py-provisioning-daemon/home:/bin colord:x:113:982:added by portage for colord:/var/lib/colord:/sbin/nologin qemu:x:77:984:added by portage for libvirt:/dev/null:/sbin/nologin memcached:x:114:2:added by portage for memcached:/dev/null:/sbin/nologin +polkitd:x:115:981:added by portage for polkit:/var/lib/polkit-1:/sbin/nologin diff --git a/polkit-1/localauthority.conf.d/50-localauthority.conf b/polkit-1/localauthority.conf.d/50-localauthority.conf deleted file mode 100644 index 5e44bde..0000000 --- a/polkit-1/localauthority.conf.d/50-localauthority.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration file for the PolicyKit Local Authority. -# -# DO NOT EDIT THIS FILE, it will be overwritten on update. -# -# See the pklocalauthority(8) man page for more information -# about configuring the Local Authority. -# - -[Configuration] -AdminIdentities=unix-group:wheel diff --git a/polkit-1/localauthority.conf.d/60-gentoo.conf b/polkit-1/localauthority.conf.d/60-gentoo.conf deleted file mode 100644 index e3323b7..0000000 --- a/polkit-1/localauthority.conf.d/60-gentoo.conf +++ /dev/null @@ -1,4 +0,0 @@ -# This file will override 50-localauthority.conf, see: -# man 8 pklocalauthority -[Configuration] -AdminIdentities=unix-group:0 diff --git a/polkit-1/nullbackend.conf.d/50-nullbackend.conf b/polkit-1/nullbackend.conf.d/50-nullbackend.conf deleted file mode 100644 index 3497677..0000000 --- a/polkit-1/nullbackend.conf.d/50-nullbackend.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Configuration file for the PolicyKit null backend. -# -# DO NOT EDIT THIS FILE, it will be overwritten on update. -# -# To change configuration, create another file in this directory with -# a filename that is sorted after the 50-nullback.conf and make -# sure it has the .conf extension. -# -# Only a single configuration item, Priority, is supported. -# -# See the PolicyKit documentation for more information about PolicyKit. -# - -[Configuration] -Priority=-10 diff --git a/polkit-1/rules.d/50-default.rules b/polkit-1/rules.d/50-default.rules new file mode 100644 index 0000000..1c476ea --- /dev/null +++ b/polkit-1/rules.d/50-default.rules @@ -0,0 +1,12 @@ +/* -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- */ + +// DO NOT EDIT THIS FILE, it will be overwritten on update +// +// Default rules for polkit +// +// See the polkit(8) man page for more information +// about configuring polkit. + +polkit.addAdminRule(function(action, subject) { + return ["unix-user:0"]; +}); diff --git a/portage/package.keywords b/portage/package.keywords index 0c3d1fc..a3cb43a 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -49,8 +49,12 @@ dev-python/fbrehm-libs mail-client/thunderbird -~media-video/lxdvdrip-1.76 +~media-gfx/gimp-2.8.2 + +~media-libs/babl-0.1.10 +~media-libs/gegl-0.2.0 +~media-video/lxdvdrip-1.76 ~media-video/streamdvd-0.4 ~net-im/skype-2.2.0.35 diff --git a/portage/package.use b/portage/package.use index 6a3525b..c6abf37 100644 --- a/portage/package.use +++ b/portage/package.use @@ -8,14 +8,14 @@ app-cdr/cdrdao gcdmaster app-cdr/k3b css emovix app-crypt/johntheripper custom-cflags -#app-crypt/mit-krb5 -doc +# app-crypt/mit-krb5 -doc app-crypt/seahorse-plugins applet app-doc/doxygen dot # app-doc/xorg-docs -doc -#app-editors/vim vim-pager vim-with-x -#app-editors/gvim netbeans +# app-editors/vim vim-pager vim-with-x +# app-editors/gvim netbeans app-emulation/qemu kvm vde app-emulation/virtualbox extensions vnc @@ -69,7 +69,7 @@ dev-perl/Catalyst-Model-DBIC-Schema caching catalyst_helper dev-perl/Catalyst-Runtime par dev-perl/File-ChangeNotify inotify dev-perl/GD animgif -#dev-perl/HTML-Mason modperl +# dev-perl/HTML-Mason modperl dev-perl/PDL badval dev-perl/POE -gtk libwww -tk dev-perl/Sysadm-Install hammer @@ -79,7 +79,7 @@ dev-perl/Template-Toolkit latex dev-python/ipython gnuplot smp wxwidgets dev-python/jinja -doc i18n dev-python/pyopenssl -doc -#dev-python/PyQt4 assistant declarative multimedia phonon qt3support sql webkit xmlpatterns +# dev-python/PyQt4 assistant declarative multimedia phonon qt3support sql webkit xmlpatterns dev-python/PyQt4 assistant declarative multimedia qt3support sql webkit xmlpatterns dev-ruby/hoe -doc @@ -108,6 +108,7 @@ gnome-base/nautilus -tracker gnome-extra/gnome-games artworkextra gnome-extra/gnome-media gnomecd +=gnome-extra/gucharmap-3.4.1.1 -doc gnome-extra/libgda mdb xbase gnustep-base/gnustep-make -doc native-exceptions @@ -115,7 +116,7 @@ gnustep-base/gnustep-make -doc native-exceptions kde-base/gwenview kipi kde-base/juk tunepimp kde-base/kaddressbook gnokii -#kde-base/kdelibs -avahi utempter +# kde-base/kdelibs -avahi utempter kde-base/kdelibs -doc utempter kde-base/kopete addbookmarks alias autoreplace connectionstatus contactnotes gadu groupwise highlight history irc latex netmeeting nowlistening oscar sametime sms statistics testbed texteffect translator webpresence winpopup wlm kde-base/krdc rdp vnc @@ -140,7 +141,7 @@ media-gfx/exiv2 contrib xmp media-gfx/gimp gimpprint smp media-gfx/graphicsmagick fpx media-gfx/graphviz pango -#media-gfx/imagemagick autotrace corefonts fpx gs hdri lqr raw webp +# media-gfx/imagemagick autotrace corefonts fpx gs hdri lqr raw webp media-gfx/imagemagick autotrace corefonts fpx gs fpx hdri lqr raw webp media-gfx/inkscape dia gs inkjar postscript media-gfx/pstoedit emf @@ -152,8 +153,8 @@ media-libs/faad2 digitalradio media-libs/fontconfig -doc media-libs/freetype utils # media-libs/gd fontconfig -media-libs/gegl -ffmpeg graphviz raw -#graphviz% -raw -umfpack +media-libs/gegl -ffmpeg graphviz lensfun raw +# graphviz% -raw -umfpack media-libs/giflib rle media-libs/libgphoto2 -zeroconf media-libs/libmp4v2 utils @@ -183,7 +184,7 @@ media-sound/jack-audio-connection-kit jack-tmpfs netjack media-sound/pulseaudio asyncns equalizer media-sound/sox amrnb amrwb -#media-video/ffmpeg dirac faac faad frei0r gsm hardcoded-tables network opencore-amr rtmp schroedinger vaapi vhook vpx +# media-video/ffmpeg dirac faac faad frei0r gsm hardcoded-tables network opencore-amr rtmp schroedinger vaapi vhook vpx media-video/ffmpeg aac aacplus amr ass dirac faac faad gsm hardcoded-tables network opencore-amr openssl rtmp schroedinger speex vaapi vhook vpx media-video/kino gpac media-video/mjpegtools yv12 @@ -207,7 +208,7 @@ net-dialup/freeradius edirectory frascend frxp net-firewall/iptables extensions # =net-fs/nfs-utils-1.0.10 -kerberos -#=net-fs/nfs-utils-1.0.12 -kerberos +# =net-fs/nfs-utils-1.0.12 -kerberos net-fs/samba async automount quotas smbsharemodes swat syslog winbind net-fs/samba-libs smbsharemodes @@ -215,13 +216,14 @@ net-ftp/proftpd authfile ifsession opensslcrypt rewrite =net-im/gaim-2.0.0_beta6 bonjour console -gadu groupwise meanwhile qq -silc net-im/gaim bonjour console gadu groupwise meanwhile qq -silc -#net-im/pidgin gadu +# net-im/pidgin gadu net-im/pidgin groupwise meanwhile prediction silc zephyr -#net-im/psi audacious extras +# net-im/psi audacious extras net-im/psi extras jingle -#net-libs/libgadu ssl +# net-libs/libgadu ssl net-libs/libpcap canusb +net-libs/libproxy spidermonkey net-libs/libssh2 gcrypt net-libs/libvncserver gcrypt gnutls net-libs/xulrunner system-sqlite wifi @@ -297,7 +299,7 @@ x11-base/xorg-x11 -doc x11-libs/cairo glitz x11-libs/qt glib pch qt3support x11-libs/qt-core optimized-qmake -#x11-libs/qt-qt3support phonon +# x11-libs/qt-qt3support phonon x11-misc/google-gadgets soup x11-misc/xscreensaver insecure-savers offensive diff --git a/portage/savedconfig/sys-apps/busybox-1.20.2 b/portage/savedconfig/sys-apps/busybox-1.20.2 index 7a445c4..1a403f7 100644 --- a/portage/savedconfig/sys-apps/busybox-1.20.2 +++ b/portage/savedconfig/sys-apps/busybox-1.20.2 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.20.2 -# Wed Sep 19 21:34:16 2012 +# Sat Oct 20 11:32:44 2012 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/postfix/main.cf b/postfix/main.cf index 60def99..a7c3834 100644 --- a/postfix/main.cf +++ b/postfix/main.cf @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.9.3/html +html_directory = /usr/share/doc/postfix-2.9.4/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,6 +653,5 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.9.3/readme -inet_protocols = ipv4 +readme_directory = /usr/share/doc/postfix-2.9.4/readme home_mailbox = .maildir/ diff --git a/revdep-rebuild/61-sun-jdk-1.6 b/revdep-rebuild/61-sun-jdk-1.6 index e1c712a..b221cbb 100644 --- a/revdep-rebuild/61-sun-jdk-1.6 +++ b/revdep-rebuild/61-sun-jdk-1.6 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/sun-jdk-1.6.0.35" +SEARCH_DIRS_MASK="/opt/sun-jdk-1.6.0.37" diff --git a/revdep-rebuild/61-sun-jre-bin-1.6 b/revdep-rebuild/61-sun-jre-bin-1.6 index 56a0c7f..57e4dba 100644 --- a/revdep-rebuild/61-sun-jre-bin-1.6 +++ b/revdep-rebuild/61-sun-jre-bin-1.6 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/sun-jre-bin-1.6.0.35" +SEARCH_DIRS_MASK="/opt/sun-jre-bin-1.6.0.37" diff --git a/shadow b/shadow index b4ca7ae..208d5ff 100644 --- a/shadow +++ b/shadow @@ -41,3 +41,4 @@ ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15623:::::: colord:!:15426:::::: qemu:!:15538:::::: memcached:!:15566:::::: +polkitd:!:15633:::::: diff --git a/shadow- b/shadow- index 24dba9d..b4ca7ae 100644 --- a/shadow- +++ b/shadow- @@ -37,7 +37,7 @@ gpsd:!:15390:::::: kdm:!:15390:::::: apache:!:15391:::::: postfix:!:15391:::::: -ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15622:::::: +ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15623:::::: colord:!:15426:::::: qemu:!:15538:::::: memcached:!:15566:::::: diff --git a/vde2/libvdemgmt/asyncrecv.rc b/vde2/libvdemgmt/asyncrecv.rc new file mode 100644 index 0000000..8ad6d21 --- /dev/null +++ b/vde2/libvdemgmt/asyncrecv.rc @@ -0,0 +1,12 @@ +TIMEOUT 1000 +1 IN '\n' 100 +2 IF '30' 10 +3 GOTO 100 + +10 COPY +11 SKIP 2 +12 RVATOI 8 +13 EXITRV + +100 EXIT -1 + diff --git a/vde2/libvdemgmt/closemachine.rc b/vde2/libvdemgmt/closemachine.rc new file mode 100644 index 0000000..3cffc73 --- /dev/null +++ b/vde2/libvdemgmt/closemachine.rc @@ -0,0 +1,2 @@ +1 SEND 'logout\n' +2 EXIT 0 diff --git a/vde2/libvdemgmt/openmachine.rc b/vde2/libvdemgmt/openmachine.rc new file mode 100644 index 0000000..084605e --- /dev/null +++ b/vde2/libvdemgmt/openmachine.rc @@ -0,0 +1,6 @@ +TIMEOUT 1000 +1 IN '$ ' 100 +2 COPY +3 EXIT 0 + +100 EXIT -1 diff --git a/vde2/libvdemgmt/sendcmd.rc b/vde2/libvdemgmt/sendcmd.rc new file mode 100644 index 0000000..7b037b5 --- /dev/null +++ b/vde2/libvdemgmt/sendcmd.rc @@ -0,0 +1,40 @@ +TIMEOUT 1000 +1 SEND '$*\n' +2 THROW +3 IN '\n' 100 +4 IF '30' 10 +5 IF '10' 20 +6 IF '0000 DATA END WITH \'.\'' 30 +7 GOTO 2 + +10 SKIP 5 +11 COPY +13 OUTTAG 3 +14 OUTSHIFT +15 GOTO 2 + +20 SKIP 2 +21 RVATOI +22 THROW +23 IN '$ ' 100 +24 IF '30' 40 +25 EXITRV + +30 THROW +31 IN '\n' 100 +32 IF '.\n' 35 +33 COPY +34 GOTO 30 +35 OUTTAG 1 +36 OUTSHIFT +37 GOTO 2 + +40 SKIP 5 +41 COPY +42 OUTTAG 3 +43 OUTSHIFT +44 SKIP '\n' +45 GOTO 24 + +100 EXIT -1 + diff --git a/vde2/vdecmd b/vde2/vdecmd new file mode 100644 index 0000000..c588f30 --- /dev/null +++ b/vde2/vdecmd @@ -0,0 +1,17 @@ +TIMEOUT 1000 +1 IN '$ ' 100 +3 SEND '$*\n' +5 THROW +6 IN '\n' 100 +7 IF '0000 DATA END WITH \'.\'' 10 +8 IF '10' 20 +9 GOTO 100 +10 THROW +11 IN '\n' 100 +12 IF '.\n' 5 +13 COPY +14 GOTO 10 +20 SKIP 2 +21 SEND 'logout\n' +22 EXITATOI +100 EXIT -1 diff --git a/wgetrc b/wgetrc index d42a3e7..70cf052 100644 --- a/wgetrc +++ b/wgetrc @@ -123,6 +123,3 @@ # Force the default remote server encoding #remoteencoding = UTF-8 - -# To try ipv6 addresses first: -#prefer-family = IPv6 diff --git a/xdg/autostart/Gentoo-print-applet.desktop b/xdg/autostart/Gentoo-print-applet.desktop index 3f39397..3572a9c 100644 --- a/xdg/autostart/Gentoo-print-applet.desktop +++ b/xdg/autostart/Gentoo-print-applet.desktop @@ -1,4 +1,3 @@ - [Desktop Entry] Encoding=UTF-8 Name=Print Queue Applet diff --git a/xml/.keep b/xml/.keep new file mode 100644 index 0000000..e69de29 diff --git a/xml/.keep_app-text_build-docbook-catalog-0 b/xml/.keep_app-text_build-docbook-catalog-0 deleted file mode 100644 index e69de29..0000000 diff --git a/xml/catalog b/xml/catalog index d200e38..fb9a35e 100644 --- a/xml/catalog +++ b/xml/catalog @@ -9,8 +9,9 @@ - - + + + diff --git a/xml/docbook b/xml/docbook index 7bcfadf..ac2f64e 100644 --- a/xml/docbook +++ b/xml/docbook @@ -9,7 +9,7 @@ - + @@ -68,4 +68,10 @@ + + + + + +