Current state

diff --git a/X11/xinit/xinitrc.d/90-xcursor-theme-gnome b/X11/xinit/xinitrc.d/90-xcursor-theme-gnome
new file mode 100755 (executable)
index 0000000..13bc453
--- /dev/null
+++ b/X11/xinit/xinitrc.d/90-xcursor-theme-gnome
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
+    XCURSOR_THEME=`dconf read /org/gnome/desktop/interface/cursor-theme` 2> /dev/null
+    if [ x"$XCURSOR_THEME" = "x" ]; then
+        export XCURSOR_THEME="Adwaita"
+    else
+        # 'dconf read' wraps string output in single quotes
+        eval export "XCURSOR_THEME=$XCURSOR_THEME"
+    fi
+fi

diff --git a/bash/bashrc b/bash/bashrc
index 63aecc2c9ffc622a0e697f89d179fdf522555a6a..fcf508b7ea0b018f641b26f9608aaa071ca80036 100644 (file)
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -158,7 +158,7 @@ if [ -f /usr/share/mc/mc.gentoo ]; then
     . /usr/share/mc/mc.gentoo
 fi
 
-if [ -e /etc/bash_completion.d/git ] ; then
+if type -t __git_ps1 >/dev/null ; then
     if [[ ${EUID} == 0 ]] ; then
         PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]'
     else

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index bf53fb3caa6894e1fb151088f70b1306e86c18a6..8491bf12eaf86b62b6620dc3bcb551bbe0e6a6bb 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,11 +1,3 @@
 # Subscription configuration file for CUPS v2.0.2
-# Written by cupsd on 2015-06-26 23:45
+# Written by cupsd on 2015-06-27 23:46
 NextSubscriptionId 219
-<Subscription 218>
-Events printer-changed
-Owner root
-LeaseDuration 86400
-Interval 60
-ExpirationTime 1435441528
-NextEventId 1
-</Subscription>

diff --git a/dconf/db/ibus.d/00-upstream-settings b/dconf/db/ibus.d/00-upstream-settings
index b54a74f1abc6c94691d39981b225db02d7bd5b2e..30a8030e0d07c9a0b385eed468dea0de0b88bbfe 100644 (file)
--- a/dconf/db/ibus.d/00-upstream-settings
+++ b/dconf/db/ibus.d/00-upstream-settings
@@ -8,32 +8,36 @@
 
 [desktop/ibus/general]
 dconf-preserve-name-prefixes=['/desktop/ibus/engine/pinyin', '/desktop/ibus/engine/bopomofo', '/desktop/ibus/engine/hangul']
+use-system-keyboard-layout=false
 embed-preedit-text=true
 enable-by-default=false
-engines-order=@as []
-preload-engines=@as []
-switcher-delay-time=400
 use-global-engine=true
-use-system-keyboard-layout=false
+use-xmodmap=true
+switcher-delay-time=400
 version=''
+engines-order=@as []
+preload-engines=@as []
+xkb-latin-layouts=['ara', 'bg', 'cz', 'dev', 'gr', 'gur', 'in', 'jp(kana)', 'mal', 'mkd', 'ru', 'ua']
 
 [desktop/ibus/general/hotkey]
+next-engine=['Alt+Shift_L']
 disable-unconditional=@as []
 enable-unconditional=@as []
-next-engine=['Alt+Shift_L']
-next-engine-in-menu=['Alt+Shift_L']
-prev-engine=@as []
-previous-engine=@as []
 trigger=['Control+space', 'Zenkaku_Hankaku', 'Alt+Kanji', 'Alt+grave', 'Hangul', 'Alt+Release+Alt_R']
+previous-engine=@as []
+prev-engine=@as []
+next-engine-in-menu=['Alt+Shift_L']
 triggers=['<Super>space']
 
 [desktop/ibus/panel]
+x=-1
+y=-1
+lookup-table-orientation=1
+show=0
+xkb-icon-rgba='#415099'
 auto-hide-timeout=10000
+show-im-name=false
+follow-input-cursor-when-always-shown=false
 custom-font='Sans 10'
-lookup-table-orientation=1
-show=1
 show-icon-on-systray=true
-show-im-name=false
 use-custom-font=false
-x=-1
-y=-1

diff --git a/env.d/44qca2 b/env.d/44qca2
deleted file mode 100644 (file)
index 429425f..0000000
--- a/env.d/44qca2
+++ /dev/null
@@ -1 +0,0 @@
-LDPATH="/usr/lib64/qca2"

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 1d2f713fd086490b00667d21baab222747a033be..504c40dee98eb524a577a8965b11ddd2e37c4d14 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -2114,35 +2114,39 @@
        <dir name="desktop">
                <dir name="ibus">
                        <dir name="panel">
-                               <entry name="auto-hide-timeout" mtime="1435047977" schema="/schemas/desktop/ibus/panel/auto-hide-timeout"/>
-                               <entry name="custom_font" mtime="1435047977" schema="/schemas/desktop/ibus/panel/custom_font"/>
-                               <entry name="use_custom_font" mtime="1435047977" schema="/schemas/desktop/ibus/panel/use_custom_font"/>
-                               <entry name="show_im_name" mtime="1435047977" schema="/schemas/desktop/ibus/panel/show_im_name"/>
-                               <entry name="show_icon_on_systray" mtime="1435047977" schema="/schemas/desktop/ibus/panel/show_icon_on_systray"/>
-                               <entry name="lookup_table_orientation" mtime="1435047977" schema="/schemas/desktop/ibus/panel/lookup_table_orientation"/>
-                               <entry name="y" mtime="1435047977" schema="/schemas/desktop/ibus/panel/y"/>
-                               <entry name="x" mtime="1435047977" schema="/schemas/desktop/ibus/panel/x"/>
-                               <entry name="show" mtime="1435047977" schema="/schemas/desktop/ibus/panel/show"/>
+                               <entry name="xkb-icon-rgba" mtime="1435361038" schema="/schemas/desktop/ibus/panel/xkb-icon-rgba"/>
+                               <entry name="follow-input-cursor-when-always-shown" mtime="1435361038" schema="/schemas/desktop/ibus/panel/follow-input-cursor-when-always-shown"/>
+                               <entry name="auto-hide-timeout" mtime="1435361038" schema="/schemas/desktop/ibus/panel/auto-hide-timeout"/>
+                               <entry name="custom_font" mtime="1435361038" schema="/schemas/desktop/ibus/panel/custom_font"/>
+                               <entry name="use_custom_font" mtime="1435361038" schema="/schemas/desktop/ibus/panel/use_custom_font"/>
+                               <entry name="show_im_name" mtime="1435361038" schema="/schemas/desktop/ibus/panel/show_im_name"/>
+                               <entry name="show_icon_on_systray" mtime="1435361038" schema="/schemas/desktop/ibus/panel/show_icon_on_systray"/>
+                               <entry name="lookup_table_orientation" mtime="1435361038" schema="/schemas/desktop/ibus/panel/lookup_table_orientation"/>
+                               <entry name="y" mtime="1435361038" schema="/schemas/desktop/ibus/panel/y"/>
+                               <entry name="x" mtime="1435361038" schema="/schemas/desktop/ibus/panel/x"/>
+                               <entry name="show" mtime="1435361038" schema="/schemas/desktop/ibus/panel/show"/>
                        </dir>
                        <dir name="general">
-                               <entry name="version" mtime="1435047977" schema="/schemas/desktop/ibus/general/version"/>
-                               <entry name="dconf_preserve_name_prefixes" mtime="1435047977" schema="/schemas/desktop/ibus/general/dconf_preserve_name_prefixes"/>
-                               <entry name="enable_by_default" mtime="1435047977" schema="/schemas/desktop/ibus/general/enable_by_default"/>
-                               <entry name="use_global_engine" mtime="1435047977" schema="/schemas/desktop/ibus/general/use_global_engine"/>
-                               <entry name="embed_preedit_text" mtime="1435047977" schema="/schemas/desktop/ibus/general/embed_preedit_text"/>
-                               <entry name="use_system_keyboard_layout" mtime="1435047977" schema="/schemas/desktop/ibus/general/use_system_keyboard_layout"/>
-                               <entry name="switcher-delay-time" mtime="1435047977" schema="/schemas/desktop/ibus/general/switcher-delay-time"/>
-                               <entry name="engines_order" mtime="1435047977" schema="/schemas/desktop/ibus/general/engines_order"/>
-                               <entry name="preload_engines" mtime="1435047977" schema="/schemas/desktop/ibus/general/preload_engines"/>
+                               <entry name="use-xmodmap" mtime="1435361038" schema="/schemas/desktop/ibus/general/use-xmodmap"/>
+                               <entry name="xkb-latin-layouts" mtime="1435361038" schema="/schemas/desktop/ibus/general/xkb-latin-layouts"/>
+                               <entry name="version" mtime="1435361038" schema="/schemas/desktop/ibus/general/version"/>
+                               <entry name="dconf_preserve_name_prefixes" mtime="1435361038" schema="/schemas/desktop/ibus/general/dconf_preserve_name_prefixes"/>
+                               <entry name="enable_by_default" mtime="1435361038" schema="/schemas/desktop/ibus/general/enable_by_default"/>
+                               <entry name="use_global_engine" mtime="1435361038" schema="/schemas/desktop/ibus/general/use_global_engine"/>
+                               <entry name="embed_preedit_text" mtime="1435361038" schema="/schemas/desktop/ibus/general/embed_preedit_text"/>
+                               <entry name="use_system_keyboard_layout" mtime="1435361038" schema="/schemas/desktop/ibus/general/use_system_keyboard_layout"/>
+                               <entry name="switcher-delay-time" mtime="1435361038" schema="/schemas/desktop/ibus/general/switcher-delay-time"/>
+                               <entry name="engines_order" mtime="1435361038" schema="/schemas/desktop/ibus/general/engines_order"/>
+                               <entry name="preload_engines" mtime="1435361038" schema="/schemas/desktop/ibus/general/preload_engines"/>
                                <dir name="hotkey">
-                                       <entry name="previous_engine" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/previous_engine"/>
-                                       <entry name="prev_engine" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/prev_engine"/>
-                                       <entry name="next_engine_in_menu" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/next_engine_in_menu"/>
-                                       <entry name="next_engine" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/next_engine"/>
-                                       <entry name="disable_unconditional" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/disable_unconditional"/>
-                                       <entry name="enable_unconditional" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/enable_unconditional"/>
-                                       <entry name="triggers" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/triggers"/>
-                                       <entry name="trigger" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/trigger"/>
+                                       <entry name="previous_engine" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/previous_engine"/>
+                                       <entry name="prev_engine" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/prev_engine"/>
+                                       <entry name="next_engine_in_menu" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/next_engine_in_menu"/>
+                                       <entry name="next_engine" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/next_engine"/>
+                                       <entry name="disable_unconditional" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/disable_unconditional"/>
+                                       <entry name="enable_unconditional" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/enable_unconditional"/>
+                                       <entry name="triggers" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/triggers"/>
+                                       <entry name="trigger" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/trigger"/>
                                </dir>
                        </dir>
                </dir>
@@ -16525,14 +16529,39 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                <dir name="desktop">
                        <dir name="ibus">
                                <dir name="panel">
-                                       <entry name="auto-hide-timeout" mtime="1435047977" type="schema" stype="int" owner="ibus">
+                                       <entry name="xkb-icon-rgba" mtime="1435361038" type="schema" stype="string" owner="ibus">
+                                               <local_schema locale="C" short_desc="RGBA value of XKB icon">
+                                                       <default type="string">
+                                                               <stringvalue>#415099</stringvalue>
+                                                       </default>
+                                                       <longdesc>XKB icon shows the layout string and the string is
+                  rendered with the RGBA value. The RGBA value can be
+                  1. a color name from X11, 2. a hex value in form &apos;#rrggbb&apos;
+                  where &apos;r&apos;, &apos;g&apos; and &apos;b&apos; are hex digits of the red, green,
+                  and blue, 3. a RGB color in form &apos;rgb(r,g,b)&apos; or
+                  4. a RGBA color in form &apos;rgba(r,g,b,a)&apos; where &apos;r&apos;,
+                  &apos;g&apos;, and &apos;b&apos; are either integers in the range 0 to 255
+                  or precentage values in the range 0% to 100%, and
+                  &apos;a&apos; is a floating point value in the range 0 to 1
+                  of the alpha.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="follow-input-cursor-when-always-shown" mtime="1435361038" type="schema" stype="bool" owner="ibus">
+                                               <local_schema locale="C" short_desc="Follow the input cursor in case the panel is always shown">
+                                                       <default type="bool" value="false"/>
+                                                       <longdesc>If true, the panel follows the input cursor in case the
+                panel is always shown. If false, the panel is shown at
+                a fixed location.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="auto-hide-timeout" mtime="1435361038" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="The milliseconds to show property panel">
                                                        <default type="int" value="10000"/>
                                                        <longdesc>The milliseconds to show property panel after focus-in or
                 properties are changed.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="custom_font" mtime="1435047977" type="schema" stype="string" owner="ibus">
+                                       <entry name="custom_font" mtime="1435361038" type="schema" stype="string" owner="ibus">
                                                <local_schema locale="C" short_desc="Custom font">
                                                        <default type="string">
                                                                <stringvalue>Sans 10</stringvalue>
@@ -16540,49 +16569,101 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Custom font name for language panel</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="use_custom_font" mtime="1435047977" type="schema" stype="bool" owner="ibus">
+                                       <entry name="use_custom_font" mtime="1435361038" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Use custom font">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Use custom font name for language panel</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="show_im_name" mtime="1435047977" type="schema" stype="bool" owner="ibus">
+                                       <entry name="show_im_name" mtime="1435361038" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Show input method name">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Show input method name on language bar</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="show_icon_on_systray" mtime="1435047977" type="schema" stype="bool" owner="ibus">
+                                       <entry name="show_icon_on_systray" mtime="1435361038" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Show icon on system tray">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Show icon on system tray</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="lookup_table_orientation" mtime="1435047977" type="schema" stype="int" owner="ibus">
+                                       <entry name="lookup_table_orientation" mtime="1435361038" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Orientation of lookup table">
                                                        <default type="int" value="1"/>
                                                        <longdesc>Orientation of lookup table. 0 = Horizontal, 1 = Vertical</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="y" mtime="1435047977" type="schema" stype="int" owner="ibus">
+                                       <entry name="y" mtime="1435361038" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Language panel position">
                                                        <default type="int" value="-1"/>
                                                </local_schema>
                                        </entry>
-                                       <entry name="x" mtime="1435047977" type="schema" stype="int" owner="ibus">
+                                       <entry name="x" mtime="1435361038" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Language panel position">
                                                        <default type="int" value="-1"/>
                                                </local_schema>
                                        </entry>
-                                       <entry name="show" mtime="1435047977" type="schema" stype="int" owner="ibus">
+                                       <entry name="show" mtime="1435361038" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Auto hide">
-                                                       <default type="int" value="1"/>
+                                                       <default type="int" value="0"/>
                                                        <longdesc>The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show</longdesc>
                                                </local_schema>
                                        </entry>
                                </dir>
                                <dir name="general">
-                                       <entry name="version" mtime="1435047977" type="schema" stype="string" owner="ibus">
+                                       <entry name="use-xmodmap" mtime="1435361038" type="schema" stype="bool" owner="ibus">
+                                               <local_schema locale="C" short_desc="Use xmodmap">
+                                                       <default type="bool" value="true"/>
+                                                       <longdesc>Run xmodmap if .xmodmap or .Xmodmap exists when
+                ibus engines are switched.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="xkb-latin-layouts" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <local_schema locale="C" short_desc="Latin layouts which have no ASCII">
+                                                       <default type="list" ltype="string">
+                                                               <li type="string">
+                                                                       <stringvalue>ara</stringvalue>
+                                                               </li>
+                                                               <li type="string">
+                                                                       <stringvalue>bg</stringvalue>
+                                                               </li>
+                                                               <li type="string">
+                                                                       <stringvalue>cz</stringvalue>
+                                                               </li>
+                                                               <li type="string">
+                                                                       <stringvalue>dev</stringvalue>
+                                                               </li>
+                                                               <li type="string">
+                                                                       <stringvalue>gr</stringvalue>
+                                                               </li>
+                                                               <li type="string">
+                                                                       <stringvalue>gur</stringvalue>
+                                                               </li>
+                                                               <li type="string">
+                                                                       <stringvalue>in</stringvalue>
+                                                               </li>
+                                                               <li type="string">
+                                                                       <stringvalue>jp(kana)</stringvalue>
+                                                               </li>
+                                                               <li type="string">
+                                                                       <stringvalue>mal</stringvalue>
+                                                               </li>
+                                                               <li type="string">
+                                                                       <stringvalue>mkd</stringvalue>
+                                                               </li>
+                                                               <li type="string">
+                                                                       <stringvalue>ru</stringvalue>
+                                                               </li>
+                                                               <li type="string">
+                                                                       <stringvalue>ua</stringvalue>
+                                                               </li>
+                                                       </default>
+                                                       <longdesc>US layout is appended to the latin layouts. variant can be
+                 omitted.
+           </longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="version" mtime="1435361038" type="schema" stype="string" owner="ibus">
                                                <local_schema locale="C" short_desc="Saved version number">
                                                        <default type="string">
                                                                <stringvalue></stringvalue>
@@ -16593,7 +16674,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
             </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="dconf_preserve_name_prefixes" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
+                                       <entry name="dconf_preserve_name_prefixes" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
                                                <local_schema locale="C" short_desc="DConf preserve name prefixes">
                                                        <default type="list" ltype="string">
                                                                <li type="string">
@@ -16609,32 +16690,32 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Prefixes of DConf keys to stop name conversion</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="enable_by_default" mtime="1435047977" type="schema" stype="bool" owner="ibus">
+                                       <entry name="enable_by_default" mtime="1435361038" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Enable input method by default">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Enable input method by default when the application gets input
             focus</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="use_global_engine" mtime="1435047977" type="schema" stype="bool" owner="ibus">
+                                       <entry name="use_global_engine" mtime="1435361038" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Use global input method">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Share the same input method among all applications</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="embed_preedit_text" mtime="1435047977" type="schema" stype="bool" owner="ibus">
+                                       <entry name="embed_preedit_text" mtime="1435361038" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Embed Preedit Text">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Embed Preedit Text in Application Window</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="use_system_keyboard_layout" mtime="1435047977" type="schema" stype="bool" owner="ibus">
+                                       <entry name="use_system_keyboard_layout" mtime="1435361038" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Use system keyboard layout">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Use system keyboard (XKB) layout</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="switcher-delay-time" mtime="1435047977" type="schema" stype="int" owner="ibus">
+                                       <entry name="switcher-delay-time" mtime="1435361038" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Popup delay milliseconds for IME switcher window">
                                                        <default type="int" value="400"/>
                                                        <longdesc>Set popup delay milliseconds to show IME switcher window.
@@ -16645,14 +16726,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
             </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="engines_order" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
+                                       <entry name="engines_order" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
                                                <local_schema locale="C" short_desc="Engines order">
                                                        <default type="list" ltype="string">
                                                        </default>
                                                        <longdesc>Saved engines order in input method list</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="preload_engines" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
+                                       <entry name="preload_engines" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
                                                <local_schema locale="C" short_desc="Preload engines">
                                                        <default type="list" ltype="string">
                                                        </default>
@@ -16660,21 +16741,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </local_schema>
                                        </entry>
                                        <dir name="hotkey">
-                                               <entry name="previous_engine" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="previous_engine" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Prev engine shortcut keys">
                                                                <default type="list" ltype="string">
                                                                </default>
                                                                <longdesc>The shortcut keys for switching to the previous input method</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="prev_engine" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="prev_engine" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Prev engine shortcut keys">
                                                                <default type="list" ltype="string">
                                                                </default>
                                                                <longdesc>The shortcut keys for switching to the previous input method</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="next_engine_in_menu" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="next_engine_in_menu" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Next engine shortcut keys">
                                                                <default type="list" ltype="string">
                                                                        <li type="string">
@@ -16684,7 +16765,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The shortcut keys for switching to the next input method in the list</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="next_engine" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="next_engine" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Next engine shortcut keys">
                                                                <default type="list" ltype="string">
                                                                        <li type="string">
@@ -16694,21 +16775,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The shortcut keys for switching to the next input method in the list</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="disable_unconditional" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="disable_unconditional" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Disable shortcut keys">
                                                                <default type="list" ltype="string">
                                                                </default>
                                                                <longdesc>The shortcut keys for turning input method off</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable_unconditional" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="enable_unconditional" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Enable shortcut keys">
                                                                <default type="list" ltype="string">
                                                                </default>
                                                                <longdesc>The shortcut keys for turning input method on</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="triggers" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="triggers" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Trigger shortcut keys for gtk_accelerator_parse">
                                                                <default type="list" ltype="string">
                                                                        <li type="string">
@@ -16718,7 +16799,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The shortcut keys for turning input method on or off</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="trigger" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="trigger" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Trigger shortcut keys">
                                                                <default type="list" ltype="string">
                                                                        <li type="string">

diff --git a/gconf/schemas/ibus.schemas b/gconf/schemas/ibus.schemas
index 06af938be66c841554a776c95f715d86812e8727..178f8877f1927dd9b94b96557ec0c99621eba2e7 100644 (file)
--- a/gconf/schemas/ibus.schemas
+++ b/gconf/schemas/ibus.schemas
@@ -9,8 +9,8 @@
       <default>[]</default>
       <list_type>string</list_type>
       <locale name="C">
-        <short>Preload engines</short>
-           <long>Preload engines during ibus starts up</long>
+        <short><!-- Translators: Here “Preload” is a verb -->Preload engines</short>
+           <long><!-- Translators: Tooltip for the button “Preload Engines” -->Preload engines during ibus starts up</long>
       </locale>
 
       <locale name="de">
@@ -105,6 +105,32 @@
             <long>Сохраненный номер версии используется для сравнения предыдущей версии ibus с текущей.</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/general/xkb-latin-layouts</key>
+      <applyto>/desktop/ibus/general/xkb-latin-layouts</applyto>
+      <owner>ibus</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+      <default>[ara,bg,cz,dev,gr,gur,in,jp(kana),mal,mkd,ru,ua]</default>
+      <locale name="C">
+        <short>Latin layouts which have no ASCII</short>
+           <long>US layout is appended to the latin layouts. variant can be
+                 omitted.
+           </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/general/use-xmodmap</key>
+      <applyto>/desktop/ibus/general/use-xmodmap</applyto>
+      <owner>ibus</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Use xmodmap</short>
+          <long>Run xmodmap if .xmodmap or .Xmodmap exists when
+                ibus engines are switched.</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/hotkey/trigger</key>
       <applyto>/desktop/ibus/general/hotkey/trigger</applyto>
@@ -361,7 +387,7 @@
       <applyto>/desktop/ibus/panel/show</applyto>
       <owner>ibus</owner>
       <type>int</type>
-      <default>1</default>
+      <default>0</default>
       <locale name="C">
         <short>Auto hide</short>
            <long>The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show</long>
@@ -472,6 +498,19 @@
       </locale>
     </schema>
     -->
+    <schema>
+      <key>/schemas/desktop/ibus/panel/follow-input-cursor-when-always-shown</key>
+      <applyto>/desktop/ibus/panel/follow-input-cursor-when-always-shown</applyto>
+      <owner>ibus</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Follow the input cursor in case the panel is always shown</short>
+          <long>If true, the panel follows the input cursor in case the
+                panel is always shown. If false, the panel is shown at
+                a fixed location.</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/panel/auto-hide-timeout</key>
       <applyto>/desktop/ibus/panel/auto-hide-timeout</applyto>
@@ -577,6 +616,26 @@
            <long>Hiển thị tên kiểu gõ trên thanh ngôn ngữ</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/xkb-icon-rgba</key>
+      <applyto>/desktop/ibus/panel/xkb-icon-rgba</applyto>
+      <owner>ibus</owner>
+      <type>string</type>
+      <default>#415099</default>
+      <locale name="C">
+        <short>RGBA value of XKB icon</short>
+           <long>XKB icon shows the layout string and the string is
+                  rendered with the RGBA value. The RGBA value can be
+                  1. a color name from X11, 2. a hex value in form '#rrggbb'
+                  where 'r', 'g' and 'b' are hex digits of the red, green,
+                  and blue, 3. a RGB color in form 'rgb(r,g,b)' or
+                  4. a RGBA color in form 'rgba(r,g,b,a)' where 'r',
+                  'g', and 'b' are either integers in the range 0 to 255
+                  or precentage values in the range 0% to 100%, and
+                  'a' is a floating point value in the range 0 to 1
+                  of the alpha.</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/use_system_keyboard_layout</key>
       <applyto>/desktop/ibus/general/use_system_keyboard_layout</applyto>

diff --git a/init.d/memcached b/init.d/memcached
index dd181ebf3f106e694388a6e94de874fbc958b8dc..929378100305a690fd0ce746ed187a8c33415b57 100755 (executable)
--- a/init.d/memcached
+++ b/init.d/memcached
@@ -4,7 +4,7 @@ CONF="${SVCNAME#*.}"
 CONFBASE="/etc/conf.d/memcached"
 
 [ -z "${PIDBASE}" ] && PIDBASE="/run/memcached/memcached"
-[ "${CONF}" == "memcached" ] && CONF=''
+[ "${CONF}" = "memcached" ] && CONF=''
 
 if [ -n "${CONF}" ]; then
     PIDFILE="${PIDBASE}.${CONF}.pid"
@@ -20,9 +20,6 @@ else
 fi
 
 depend() {
-    if [ -z "${SOCKET}" ]; then
-        need net
-    fi
     # per bug #269022, accurate time is important for memcached!
     # We include the full list of ways it might be set on boot.
     after ntp-client ntpd rdate openrdate adjtimex hwclock

diff --git a/init.d/virtlockd b/init.d/virtlockd
index 2c80af632a799a7b75f041d23d1a9635b7062282..bfa37a5aaeacf8432db42577d8ef7350e14bfdde 100755 (executable)
--- a/init.d/virtlockd
+++ b/init.d/virtlockd
@@ -1,13 +1,24 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/files/virtlockd.init,v 1.1 2013/10/25 20:06:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/files/virtlockd.init-r1,v 1.1 2015/05/24 21:05:42 tamiko Exp $
 
 description="libvirt virtual machine lock manager"
 command="/usr/sbin/virtlockd"
 command_args="-d"
 pidfile="/var/run/virtlockd.pid"
 
+extra_started_commands="reload"
+description_reload="re-exec the daemon, while maintaining locks and clients"
+
+
 depend() {
     after ntp-client ntpd nfs nfsmount corosync
 }
+
+reload() {
+    ebegin "re-exec() virtlockd"
+
+    start-stop-daemon --signal SIGUSR1 \
+      --exec "${command}" --pidfile "${pidfile}"
+}

diff --git a/ld.so.conf b/ld.so.conf
index ca657fe4d82459d5ee0bd27bf7fff759adc7ded9..6a0a880bfb28f78c115e5ec2447117666bca432e 100644 (file)
--- a/ld.so.conf
+++ b/ld.so.conf
@@ -12,7 +12,6 @@
 include ld.so.conf.d/*.conf
 /usr/lib32/opengl/xorg-x11/lib
 /usr/lib64/opengl/xorg-x11/lib
-/usr/lib64/qca2
 /usr/lib32/qt4
 /usr/lib64/qt4
 /usr/lib/postgresql

diff --git a/profile.d/vte.sh b/profile.d/vte.sh
index 3b57f8381104eab36ddb1a324e056da8afef0bc0..95d20c7dc2f7fcfe202af9fdb0b8c3845aa91034 100644 (file)
--- a/profile.d/vte.sh
+++ b/profile.d/vte.sh
@@ -50,7 +50,9 @@ __vte_osc7 () {
 }
 
 __vte_prompt_command() {
-  printf "\033]0;%s@%s:%s\007%s" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}" "$(__vte_osc7)"
+  local pwd='~'
+  [ "$PWD" != "$HOME" ] && pwd=${PWD/#$HOME\//\~\/}
+  printf "\033]0;%s@%s:%s\007%s" "${USER}" "${HOSTNAME%%.*}" "${pwd}" "$(__vte_osc7)"
 }
 
 case "$TERM" in

diff --git a/sgml/catalog b/sgml/catalog
index 0934ffc268d73606ee422a00b47165814ecbfc34..ed6e8ebf30c7ec7a6e5d52cb048baba18fba604f 100644 (file)
--- a/sgml/catalog
+++ b/sgml/catalog
@@ -15,7 +15,4 @@ CATALOG "/etc/sgml/sgml-docbook-4.0.cat"
 CATALOG "/etc/sgml/xml-simple-docbook-4.1.2.4.cat"
 CATALOG "/etc/sgml/xml-simple-docbook-1.0.cat"
 CATALOG "/etc/sgml/xhtml1.cat"
-CATALOG "/etc/sgml/sgml-data-2.0.8.cat"
-CATALOG "/etc/sgml/xml-core-0.13_p2.cat"
-CATALOG "/etc/sgml/debiandoc-sgml-1.2.27.cat"
 CATALOG "/etc/sgml/linuxdoc.cat"

diff --git a/sgml/debiandoc-sgml-1.2.27.cat b/sgml/debiandoc-sgml-1.2.27.cat
deleted file mode 100644 (file)
index 1c790d3..0000000
--- a/sgml/debiandoc-sgml-1.2.27.cat
+++ /dev/null
@@ -1,2 +0,0 @@
-CATALOG "/usr/share/sgml/debiandoc/dtd/sgml/1.0/catalog"
-CATALOG "/usr/share/sgml/debiandoc/entities/catalog"

diff --git a/sgml/sgml-data-2.0.8.cat b/sgml/sgml-data-2.0.8.cat
deleted file mode 100644 (file)
index 6c718d4..0000000
--- a/sgml/sgml-data-2.0.8.cat
+++ /dev/null
@@ -1,13 +0,0 @@
-CATALOG "/usr/share/sgml/dtd/catalog"
-CATALOG "/usr/share/sgml/entities/ArborText/catalog"
-CATALOG "/usr/share/sgml/entities/Hewlett-Packard/catalog"
-CATALOG "/usr/share/sgml/entities/sgml-iso-entities-8879.1986/catalog"
-CATALOG "/usr/share/sgml/entities/sgml-iso-entities-9573-13.1991/catalog"
-CATALOG "/usr/share/sgml/html/dtd/catalog"
-CATALOG "/usr/share/sgml/html/dtd/4.0/catalog"
-CATALOG "/usr/share/sgml/html/dtd/4.01/catalog"
-CATALOG "/usr/share/sgml/html/dtd/iso-15445/catalog"
-CATALOG "/usr/share/sgml/html/entities/catalog"
-CATALOG "/usr/share/xml/qaml/catalog"
-CATALOG "/usr/share/xml/svg/catalog"
-CATALOG "/usr/share/xml/entities/xml-iso-entities-8879.1986/catalog"

diff --git a/sgml/xml-core-0.13_p2.cat b/sgml/xml-core-0.13_p2.cat
deleted file mode 100644 (file)
index dc0d903..0000000
--- a/sgml/xml-core-0.13_p2.cat
+++ /dev/null
@@ -1 +0,0 @@
-CATALOG "/usr/share/sgml/dtd/xml-core/catalog"

diff --git a/sysctl.d/libvirtd.conf b/sysctl.d/libvirtd.conf
deleted file mode 100644 (file)
index 275482c..0000000
--- a/sysctl.d/libvirtd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# The kernel allocates aio memory on demand, and this number limits the
-# number of parallel aio requests; the only drawback of a larger limit is
-# that a malicious guest could issue parallel requests to cause the kernel
-# to set aside memory.  Set this number at least as large as
-#   128 * (number of virtual disks on the host)
-# Libvirt uses a default of 1M requests to allow 8k disks, with at most
-# 64M of kernel memory if all disks hit an aio request at the same time.
-fs.aio-max-nr = 1048576

diff --git a/xdg/autostart/tracker-extract.desktop b/xdg/autostart/tracker-extract.desktop
index 300cfab7d964183f49a35e8ec190e7d816132a10..bd5b5f3fa4dcdd43636c8b34a2a76e13d5e801a6 100644 (file)
--- a/xdg/autostart/tracker-extract.desktop
+++ b/xdg/autostart/tracker-extract.desktop
@@ -20,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=Extractor
-X-GNOME-Bugzilla-Version=1.2.5
+X-GNOME-Bugzilla-Version=1.2.6

diff --git a/xdg/autostart/tracker-miner-apps.desktop b/xdg/autostart/tracker-miner-apps.desktop
index 4e25679d8e0f546d3e5d0100afc286311263fb0e..af033b43f4b99486d649d59dbd363585e9e752ef 100644 (file)
--- a/xdg/autostart/tracker-miner-apps.desktop
+++ b/xdg/autostart/tracker-miner-apps.desktop
@@ -20,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.2.5
+X-GNOME-Bugzilla-Version=1.2.6

diff --git a/xdg/autostart/tracker-miner-fs.desktop b/xdg/autostart/tracker-miner-fs.desktop
index 2ec46bed4a6fbf6c7027e85292fd15a78958a2a4..80b4f25d995ff30560f7b68e33e46d6d724bb2b6 100644 (file)
--- a/xdg/autostart/tracker-miner-fs.desktop
+++ b/xdg/autostart/tracker-miner-fs.desktop
@@ -22,4 +22,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.2.5
+X-GNOME-Bugzilla-Version=1.2.6

diff --git a/xdg/autostart/tracker-miner-user-guides.desktop b/xdg/autostart/tracker-miner-user-guides.desktop
index 6dcea8cc0fcbb7a0815fd1c1af3a938e5de58ab7..8d967a3ae50ad851f7ea88d69e72ef1c5808c882 100644 (file)
--- a/xdg/autostart/tracker-miner-user-guides.desktop
+++ b/xdg/autostart/tracker-miner-user-guides.desktop
@@ -20,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.2.5
+X-GNOME-Bugzilla-Version=1.2.6

diff --git a/xdg/autostart/tracker-store.desktop b/xdg/autostart/tracker-store.desktop
index 3ccee345f891a93b22f30f5be09b6b3a35e8c773..f2c294d6e662dd1e22e49d6e9a7c97285dba05eb 100644 (file)
--- a/xdg/autostart/tracker-store.desktop
+++ b/xdg/autostart/tracker-store.desktop
@@ -21,4 +21,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=tracker
 X-GNOME-Bugzilla-Component=Store
-X-GNOME-Bugzilla-Version=1.2.5
+X-GNOME-Bugzilla-Version=1.2.6

diff --git a/xml/catalog b/xml/catalog
index 3890781f46443c5964ce68a950f07d3410882f0a..1cc354cba76e2a7eff5bbcda2e4058bc240db74b 100644 (file)
--- a/xml/catalog
+++ b/xml/catalog
@@ -8,19 +8,6 @@
   <public publicId="-//W3C//DTD XHTML 1.0 Frameset//EN" uri="/usr/share/sgml/xhtml1/xhtml1-frameset.dtd"/>
   <rewriteSystem systemIdStartString="http://www.w3.org/TR/xhtml1/DTD" rewritePrefix="/usr/share/sgml/xhtml1"/>
   <rewriteURI uriStartString="http://www.w3.org/TR/xhtml1/DTD" rewritePrefix="/usr/share/sgml/xhtml1"/>
-  <public publicId="+//IDN faq.org//DTD Frequently Asked Questions" uri="/etc/xml/sgml-data"/>
-  <system systemId="http://xml.ascc.net/xml/resource/qaml-xml" uri="/etc/xml/sgml-data"/>
-  <public publicId="+//ISBN 82-7640-023//DTD Frequently Asked Questions//EN" uri="/etc/xml/sgml-data"/>
-  <system systemId="/usr/share/sgml/dtd/qaml-xml.dtd" uri="/etc/xml/sgml-data"/>
-  <public publicId="-//W3C//DTD SVG" uri="/etc/xml/sgml-data"/>
-  <system systemId="http://www.w3.org/TR/2001/REC-SVG-20010904/" uri="/etc/xml/sgml-data"/>
-  <system systemId="http://www.w3.org/Graphics/SVG/1.1/" uri="/etc/xml/sgml-data"/>
-  <system systemId="/usr/share/sgml/dtd/svg" uri="/etc/xml/sgml-data"/>
-  <public publicId="ISO 8879:1986//ENTITIES" uri="/etc/xml/sgml-data"/>
-  <system systemId="http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" uri="/etc/xml/xml-core"/>
-  <public publicId="-//OASIS//DTD XML Catalogs V1.0//EN" uri="/etc/xml/xml-core"/>
-  <system systemId="http://globaltranscorp.org/oasis/catalog/xml/tr9401.dtd" uri="/etc/xml/xml-core"/>
-  <public publicId="-//GlobalTransCorp//DTD XML Catalogs V1.0-Based Extension V1.0//EN" uri="/etc/xml/xml-core"/>
   <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook" catalog="file:///etc/xml/docbook"/>
   <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook" catalog="file:///etc/xml/docbook"/>
   <delegatePublic publicIdStartString="-//OASIS//DTD DocBook" catalog="file:///etc/xml/docbook"/>

diff --git a/xml/sgml-data b/xml/sgml-data
deleted file mode 100644 (file)
index 7fbc44f..0000000
--- a/xml/sgml-data
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <public publicId="+//IDN faq.org//DTD Frequently Asked Questions" uri="/usr/share/xml/qaml/catalog.xml"/>
-  <system systemId="http://xml.ascc.net/xml/resource/qaml-xml" uri="/usr/share/xml/qaml/catalog.xml"/>
-  <public publicId="+//ISBN 82-7640-023//DTD Frequently Asked Questions//EN" uri="/usr/share/xml/qaml/catalog.xml"/>
-  <system systemId="/usr/share/sgml/dtd/qaml-xml.dtd" uri="/usr/share/xml/qaml/catalog.xml"/>
-  <public publicId="-//W3C//DTD SVG" uri="/usr/share/xml/svg/catalog.xml"/>
-  <system systemId="http://www.w3.org/TR/2001/REC-SVG-20010904/" uri="/usr/share/xml/svg/catalog.xml"/>
-  <system systemId="http://www.w3.org/Graphics/SVG/1.1/" uri="/usr/share/xml/svg/catalog.xml"/>
-  <system systemId="/usr/share/sgml/dtd/svg" uri="/usr/share/xml/svg/catalog.xml"/>
-  <public publicId="ISO 8879:1986//ENTITIES" uri="/usr/share/xml/entities/xml-iso-entities-8879.1986/catalog.xml"/>
-</catalog>

diff --git a/xml/xml-core b/xml/xml-core
deleted file mode 100644 (file)
index dd64ebf..0000000
--- a/xml/xml-core
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <system systemId="http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" uri="/usr/share/xml/schema/xml-core/catalog.xml"/>
-  <public publicId="-//OASIS//DTD XML Catalogs V1.0//EN" uri="/usr/share/xml/schema/xml-core/catalog.xml"/>
-  <system systemId="http://globaltranscorp.org/oasis/catalog/xml/tr9401.dtd" uri="/usr/share/xml/schema/xml-core/catalog.xml"/>
-  <public publicId="-//GlobalTransCorp//DTD XML Catalogs V1.0-Based Extension V1.0//EN" uri="/usr/share/xml/schema/xml-core/catalog.xml"/>
-</catalog>