Hello community,
here is the log from the commit of package xfce4-branding-openSUSE for openSUSE:Factory checked in at 2013-02-01 09:50:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-branding-openSUSE", Maintainer is "xfce-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes 2013-01-22 18:18:55.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new/xfce4-branding-openSUSE.changes 2013-02-01 09:50:45.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Jan 31 17:20:27 UTC 2013 - gber@opensuse.org
+
+- 12.3 specific xfce4-panel branding
+- adapt to Terminal rename
+- adapt to new name of the mixer plugin
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.xW58vb/_old 2013-02-01 09:50:46.000000000 +0100
+++ /var/tmp/diff_new_pack.xW58vb/_new 2013-02-01 09:50:46.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xfce4-branding-openSUSE
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -48,7 +48,7 @@
BuildRequires: midori-branding-upstream
BuildRequires: wallpaper-branding
%if 0%{?suse_version} >= 1220
-# owns %{_datadir}/xfce/applications/defaults.list symlink target
+# owns %%{_datadir}/xfce/applications/defaults.list symlink target
Requires: libgio-2_0-0
%endif
%if 0%{?suse_version} > 1220
@@ -97,7 +97,7 @@
License: CC-BY-SA-3.0 and GPL-2.0+
Group: System/GUI/XFCE
%if 0%{?suse_version} >= 1220
-# owns %{_datadir}/xfce/applications/defaults.list symlink target
+# owns %%{_datadir}/xfce/applications/defaults.list symlink target
Requires: libgio-2_0-0
%endif
%if 0%{?suse_version} > 1220
@@ -231,8 +231,8 @@
%setup -q -a1
%build
-cp %{_sysconfdir}/xdg/midori/search etc/xdg/midori/search
-cat >>etc/xdg/midori/search <<'EOF'
+cp %{_sysconfdir}/xdg/midori/search base/etc/xdg/midori/search
+cat >base/etc/xdg/midori/search <<'EOF'
[openSUSE Software]
name=openSUSE Software
@@ -242,19 +242,18 @@
EOF
%install
-find etc usr -depth -print | cpio -pvd %{buildroot}
+for dir in base %{?suse_version}; do
+ if [ -d "${dir}" ]; then
+ (
+ cd $dir
+ find . -depth -print | cpio -puvd %{buildroot}
+ )
+ fi
+done
(
cd openSUSE-xfce-icon-theme
- find openSUSE-Xfce -depth -print | cpio -pvd %{buildroot}%{_datadir}/icons
+ find openSUSE-Xfce -depth -print | cpio -puvd %{buildroot}%{_datadir}/icons
)
-# xfce_defaults.conf needs support from glib2 only available in >= 12.2
-%if 0%{?suse_version} >= 1220
-install -d -m 755 %{buildroot}%{_datadir}/xfce/applications/
-ln -s %{_localstatedir}/cache/gio-2.0/xfce-defaults.list \
- %{buildroot}%{_datadir}/xfce/applications/defaults.list
-%else
-rm -f %{buildroot}%{_sysconfdir}/xfce_defaults.conf
-%endif
%fdupes %{buildroot}%{_datadir}/icons/openSUSE-Xfce
++++++ xfce4-branding-openSUSE-4.10.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1220/etc/xfce_defaults.conf new/xfce4-branding-openSUSE-4.10.0/1220/etc/xfce_defaults.conf
--- old/xfce4-branding-openSUSE-4.10.0/1220/etc/xfce_defaults.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/1220/etc/xfce_defaults.conf 2012-10-04 15:06:48.000000000 +0200
@@ -0,0 +1,73 @@
+# Xfce Default Applications Source
+# /etc/xfcer_defaults.conf
+#
+# After any change of this file run
+# suse-update-mime-defaults
+#
+# This list is a source for defaults.list.
+#
+# If application in this list is installed, it is used as default in GNOME.
+# It works in following way:
+# 1. Read this file.
+# 2. Collect all available desktop files.
+# 3. Go through all declared MIME types and search for default application
+# for defaults.list in following order:
+# 3.1 Installed application listed here for certain MIME type.
+# 3.2 Installed application listed here as preferred default.
+# 3.3 Installed application listed here as default.
+# 3.4 Installed application with GNOME in Categories.
+# 3.5 Installed application with GTK in Categories.
+# 3.6 Installed application.
+# If there are more applications in the same order, it uses pseudo-randomly
+# one of them (last in aplhabetical order).
+#
+# Syntax:
+# Use xxx as default for all MIME types it declares (see 3.3):
+# xxx.desktop
+# Use xxx as preferred default for all MIME types it declares (see 3.2):
+# !xxx.desktop
+# Use xxx as default for mime/type (see 3.1):
+# mime/type=xxx.desktop
+
+# URI schemes
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+x-scheme-handler/ftp=firefox.desktop
+x-scheme-handler/mailto=thunderbird.desktop
+# All URI schemes declared by yelp
+yelp.desktop
+
+# Prefer totem for multimedia where possible
+!totem.desktop
+
+# Prefer Install Software over file-roller
+application/x-rpm=package-manager.desktop
+!gpk-install-file.desktop
+
+# Xfce default applications
+ristretto.desktop
+evince.desktop
+leafpad.desktop
+file-roller.desktop
+# file-roller supports iso, but most people will prefer brasero:
+application/x-cd-image=brasero.desktop
+Thunar-folder-handler.desktop
+# evince supports multi-page tiff, but most people will prefer ristretto:
+image/tiff=ristretto.desktop
+# evince supports odp, but we really want OOo
+application/vnd.sun.xml.impress=impress.desktop
+application/vnd.oasis.opendocument.presentation=impress.desktop
+
+# Firefox
+firefox.desktop
+
+# OpenOffice
+base.desktop
+calc.desktop
+draw.desktop
+impress.desktop
+math.desktop
+web.desktop
+writer.desktop
+# Do not prefer writer for text/plain:
+text/plain=leafpad.desktop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1220/usr/share/xfce/applications/defaults.list new/xfce4-branding-openSUSE-4.10.0/1220/usr/share/xfce/applications/defaults.list
--- old/xfce4-branding-openSUSE-4.10.0/1220/usr/share/xfce/applications/defaults.list 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/1220/usr/share/xfce/applications/defaults.list 2013-02-01 09:50:46.000000000 +0100
@@ -0,0 +1 @@
+symbolic link to /var/cache/gio-2.0/xfce-defaults.list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1230/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new/xfce4-branding-openSUSE-4.10.0/1230/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
--- old/xfce4-branding-openSUSE-4.10.0/1230/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/1230/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 2013-01-31 21:28:59.000000000 +0100
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-panel" version="1.0">
+ <property name="configver" type="int" value="2"/>
+ <property name="panels" type="array">
+ <value type="int" value="1"/>
+ <property name="panel-1" type="empty">
+ <property name="position" type="string" value="p=10;x=0;y=0"/>
+ <property name="length" type="uint" value="100"/>
+ <property name="position-locked" type="bool" value="true"/>
+ <property name="size" type="uint" value="24"/>
+ <property name="length-adjust" type="bool" value="false"/>
+ <property name="plugin-ids" type="array">
+ <value type="int" value="1"/>
+ <value type="int" value="2"/>
+ <value type="int" value="3"/>
+ <value type="int" value="4"/>
+ <value type="int" value="5"/>
+ <value type="int" value="6"/>
+ <value type="int" value="7"/>
+ <value type="int" value="8"/>
+ <value type="int" value="9"/>
+ <value type="int" value="10"/>
+ <value type="int" value="11"/>
+ <value type="int" value="12"/>
+ </property>
+ </property>
+ </property>
+ <property name="plugins" type="empty">
+ <property name="plugin-1" type="string" value="applicationsmenu">
+ <property name="button-icon" type="string" value="xfce4-opensuse-dark"/>
+ <property name="button-title" type="string" value="openSUSE"/>
+ <property name="show-tooltips" type="bool" value="true"/>
+ </property>
+ <property name="plugin-2" type="string" value="separator"/>
+ <property name="plugin-3" type="string" value="showdesktop"/>
+ <property name="plugin-4" type="string" value="tasklist"/>
+ <property name="plugin-5" type="string" value="separator">
+ <property name="expand" type="bool" value="true"/>
+ <property name="style" type="uint" value="0"/>
+ </property>
+ <property name="plugin-6" type="string" value="mixer"/>
+ <property name="plugin-7" type="string" value="systray">
+ <property name="show-frame" type="bool" value="false"/>
+ </property>
+ <property name="plugin-8" type="string" value="pager"/>
+ <property name="plugin-9" type="string" value="separator">
+ <property name="style" type="uint" value="0"/>
+ </property>
+ <property name="plugin-10" type="string" value="clock">
+ <property name="show-frame" type="bool" value="false"/>
+ </property>
+ <property name="plugin-11" type="string" value="separator">
+ <property name="style" type="uint" value="0"/>
+ </property>
+ <property name="plugin-12" type="string" value="actions">
+ <property name="items" type="array">
+ <value type="string" value="+lock-screen"/>
+ <value type="string" value="+switch-user"/>
+ <value type="string" value="+logout-dialog"/>
+ <value type="string" value="+separator"/>
+ <value type="string" value="+suspend"/>
+ <value type="string" value="+hibernate"/>
+ <value type="string" value="+separator"/>
+ <value type="string" value="+restart"/>
+ <value type="string" value="+shutdown"/>
+ <value type="string" value="-separator"/>
+ <value type="string" value="-logout"/>
+ </property>
+ <property name="appearance" type="uint" value="1"/>
+ </property>
+ </property>
+</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1230/etc/xfce_defaults.conf new/xfce4-branding-openSUSE-4.10.0/1230/etc/xfce_defaults.conf
--- old/xfce4-branding-openSUSE-4.10.0/1230/etc/xfce_defaults.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/1230/etc/xfce_defaults.conf 2012-10-04 15:06:48.000000000 +0200
@@ -0,0 +1,73 @@
+# Xfce Default Applications Source
+# /etc/xfcer_defaults.conf
+#
+# After any change of this file run
+# suse-update-mime-defaults
+#
+# This list is a source for defaults.list.
+#
+# If application in this list is installed, it is used as default in GNOME.
+# It works in following way:
+# 1. Read this file.
+# 2. Collect all available desktop files.
+# 3. Go through all declared MIME types and search for default application
+# for defaults.list in following order:
+# 3.1 Installed application listed here for certain MIME type.
+# 3.2 Installed application listed here as preferred default.
+# 3.3 Installed application listed here as default.
+# 3.4 Installed application with GNOME in Categories.
+# 3.5 Installed application with GTK in Categories.
+# 3.6 Installed application.
+# If there are more applications in the same order, it uses pseudo-randomly
+# one of them (last in aplhabetical order).
+#
+# Syntax:
+# Use xxx as default for all MIME types it declares (see 3.3):
+# xxx.desktop
+# Use xxx as preferred default for all MIME types it declares (see 3.2):
+# !xxx.desktop
+# Use xxx as default for mime/type (see 3.1):
+# mime/type=xxx.desktop
+
+# URI schemes
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+x-scheme-handler/ftp=firefox.desktop
+x-scheme-handler/mailto=thunderbird.desktop
+# All URI schemes declared by yelp
+yelp.desktop
+
+# Prefer totem for multimedia where possible
+!totem.desktop
+
+# Prefer Install Software over file-roller
+application/x-rpm=package-manager.desktop
+!gpk-install-file.desktop
+
+# Xfce default applications
+ristretto.desktop
+evince.desktop
+leafpad.desktop
+file-roller.desktop
+# file-roller supports iso, but most people will prefer brasero:
+application/x-cd-image=brasero.desktop
+Thunar-folder-handler.desktop
+# evince supports multi-page tiff, but most people will prefer ristretto:
+image/tiff=ristretto.desktop
+# evince supports odp, but we really want OOo
+application/vnd.sun.xml.impress=impress.desktop
+application/vnd.oasis.opendocument.presentation=impress.desktop
+
+# Firefox
+firefox.desktop
+
+# OpenOffice
+base.desktop
+calc.desktop
+draw.desktop
+impress.desktop
+math.desktop
+web.desktop
+writer.desktop
+# Do not prefer writer for text/plain:
+text/plain=leafpad.desktop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1230/usr/share/xfce/applications/defaults.list new/xfce4-branding-openSUSE-4.10.0/1230/usr/share/xfce/applications/defaults.list
--- old/xfce4-branding-openSUSE-4.10.0/1230/usr/share/xfce/applications/defaults.list 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/1230/usr/share/xfce/applications/defaults.list 2013-02-01 09:50:46.000000000 +0100
@@ -0,0 +1 @@
+symbolic link to /var/cache/gio-2.0/xfce-defaults.list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-applications.menu new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-applications.menu
--- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-applications.menu 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-applications.menu 2012-07-01 11:14:39.000000000 +0200
@@ -0,0 +1,173 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+ <Name>Xfce</Name>
+
+ <DefaultAppDirs/>
+ <DefaultDirectoryDirs/>
+ <DefaultMergeDirs/>
+
+ <Menu>
+ <Name>Accessories</Name>
+ <Directory>xfce-accessories.directory</Directory>
+ <Include>
+ <And>
+ <Or>
+ <Category>Accessibility</Category>
+ <Category>Core</Category>
+ <Category>Legacy</Category>
+ <Category>Utility</Category>
+ </Or>
+ <Not>
+ <Or>
+ <Category>DiscBurning</Category>
+ <Category>System</Category>
+ </Or>
+ </Not>
+ </And>
+ </Include>
+ <Exclude>
+ <Category>X-Xfce-Toplevel</Category>
+ <Category>Settings</Category>
+ </Exclude>
+ </Menu>
+
+ <Menu>
+ <Name>Development</Name>
+ <Directory>xfce-development.directory</Directory>
+ <Include>
+ <Category>Development</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Education</Name>
+ <Directory>xfce-education.directory</Directory>
+ <Include>
+ <Category>Education</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Games</Name>
+ <Directory>xfce-games.directory</Directory>
+ <Include>
+ <Category>Game</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Graphics</Name>
+ <Directory>xfce-graphics.directory</Directory>
+ <Include>
+ <Category>Graphics</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Multimedia</Name>
+ <Directory>xfce-multimedia.directory</Directory>
+ <Include>
+ <Or>
+ <Category>Audio</Category>
+ <Category>Video</Category>
+ <Category>AudioVideo</Category>
+ <Category>DiscBurning</Category>
+ </Or>
+ </Include>
+ <Exclude>
+ <Category>Settings</Category>
+ </Exclude>
+ </Menu>
+
+ <Menu>
+ <Name>Network</Name>
+ <Directory>xfce-network.directory</Directory>
+ <Include>
+ <Category>Network</Category>
+ </Include>
+ <Exclude>
+ <Category>X-Xfce-Toplevel</Category>
+ </Exclude>
+ </Menu>
+
+ <Menu>
+ <Name>Office</Name>
+ <Directory>xfce-office.directory</Directory>
+ <Include>
+ <Category>Office</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Science</Name>
+ <Directory>xfce-science.directory</Directory>
+ <Include>
+ <Category>Science</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>System</Name>
+ <Directory>xfce-system.directory</Directory>
+ <Include>
+ <Or>
+ <Category>Emulator</Category>
+ <Category>System</Category>
+ </Or>
+ </Include>
+ <Exclude>
+ <Category>X-Xfce-Toplevel</Category>
+ <Category>Settings</Category>
+ <Category>PackageManager</Category>
+ </Exclude>
+ </Menu>
+
+ <Menu>
+ <Name>Settings</Name>
+ <Directory>xfce-settings.directory</Directory>
+ <Include>
+ <Filename>xfce-settings-manager.desktop</Filename>
+ <Filename>YaST.desktop</Filename>
+ <Filename>package-manager.desktop</Filename>
+ </Include>
+ <Layout>
+ <Filename>xfce-settings-manager.desktop</Filename>
+ <Filename>YaST.desktop</Filename>
+ <Filename>package-manager.desktop</Filename>
+ </Layout>
+ </Menu>
+
+ <Menu>
+ <Name>Other</Name>
+ <Directory>xfce-other.directory</Directory>
+ <OnlyUnallocated/>
+ <Include>
+ <All/>
+ </Include>
+ <Exclude>
+ <Category>Settings</Category>
+ <Category>PackageManager</Category>
+ <Category>X-Xfce-Toplevel</Category>
+ </Exclude>
+ </Menu>
+
+ <Include>
+ <Filename>xfce4-run.desktop</Filename>
+ <Filename>xfce4-about.desktop</Filename>
+ <Filename>xfce4-session-logout.desktop</Filename>
+ </Include>
+
+ <Layout>
+ <Merge type="menus"/>
+ <Menuname>Other</Menuname>
+ <Separator/>
+ <Menuname>Settings</Menuname>
+ <Separator/>
+ <Merge type="files"/>
+ <Filename>xfce4-run.desktop</Filename>
+ <Filename>xfce4-about.desktop</Filename>
+ <Filename>xfce4-session-logout.desktop</Filename>
+ </Layout>
+</Menu>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-settings-manager.menu new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-settings-manager.menu
--- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-settings-manager.menu 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-settings-manager.menu 2012-07-01 11:14:44.000000000 +0200
@@ -0,0 +1,106 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+ <Name>Settings</Name>
+
+ <DefaultAppDirs/>
+ <DefaultDirectoryDirs/>
+ <DefaultMergeDirs/>
+
+ <Menu>
+ <Name>Personal</Name>
+ <Directory>xfce-personal.directory</Directory>
+ <Include>
+ <Or>
+ <And>
+ <Category>Settings</Category>
+ <Category>X-XFCE-SettingsDialog</Category>
+ <Category>X-XFCE-PersonalSettings</Category>
+ </And>
+ <And>
+ <Category>Settings</Category>
+ <Category>DesktopSettings</Category>
+ <Not>
+ <Category>X-XFCE-HardwareSettings</Category>
+ <Category>X-XFCE-SystemSettings</Category>
+ </Not>
+ </And>
+ </Or>
+ </Include>
+ <Exclude>
+ <Filename>xfce-settings-manager.desktop</Filename>
+ </Exclude>
+ </Menu>
+
+ <Menu>
+ <Name>Hardware</Name>
+ <Directory>xfce-hardware.directory</Directory>
+ <Include>
+ <Or>
+ <And>
+ <Category>Settings</Category>
+ <Category>X-XFCE-SettingsDialog</Category>
+ <Category>X-XFCE-HardwareSettings</Category>
+ </And>
+ <And>
+ <Category>Settings</Category>
+ <Category>HardwareSettings</Category>
+ <Not>
+ <Category>X-XFCE-PersonalSettings</Category>
+ <Category>X-XFCE-SystemSettings</Category>
+ </Not>
+ </And>
+ </Or>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>System</Name>
+ <Directory>xfce-system.directory</Directory>
+ <Include>
+ <Or>
+ <And>
+ <Category>Settings</Category>
+ <Category>X-XFCE-SettingsDialog</Category>
+ <Category>X-XFCE-SystemSettings</Category>
+ </And>
+ <And>
+ <Category>Settings</Category>
+ <Category>System</Category>
+ <Not>
+ <Or>
+ <Category>X-XFCE-PersonalSettings</Category>
+ <Category>X-XFCE-HardwareSettings</Category>
+ <Category>HardwareSettings</Category>
+ <Category>DesktopSettings</Category>
+ <Category>X-SuSE-YaST</Category>
+ </Or>
+ </Not>
+ </And>
+ <Category>PackageManager</Category>
+ </Or>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Other</Name>
+ <Directory>xfce-other.directory</Directory>
+ <OnlyUnallocated/>
+ <Include>
+ <Category>Settings</Category>
+ </Include>
+ <Exclude>
+ <Filename>xfce-settings-manager.desktop</Filename>
+ <Category>X-SuSE-YaST</Category>
+ </Exclude>
+ </Menu>
+
+ <Layout>
+ <Menuname>Personal</Menuname>
+ <Menuname>Hardware</Menuname>
+ <Menuname>System</Menuname>
+ <Menuname>Other</Menuname>
+ <Merge type="menus"/>
+ </Layout>
+</Menu>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/midori/config new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/midori/config
--- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/midori/config 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/midori/config 2012-06-05 09:48:42.000000000 +0200
@@ -0,0 +1,2 @@
+[settings]
+homepage=http://www.opensuse.org/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/helpers.rc new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/helpers.rc
--- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/helpers.rc 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/helpers.rc 2013-01-31 18:20:16.000000000 +0100
@@ -0,0 +1,10 @@
+#
+# openSUSE helpers.rc for Xfce's Preferred Applications
+#
+# Copyright (c) 2005-2006 Benedikt Meurer
+#
+
+WebBrowser=firefox
+MailReader=thunderbird
+TerminalEmulator=xfce4-terminal
+FileManager=Thunar
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml
--- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml 2012-06-05 09:48:42.000000000 +0200
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="thunar-volman" version="1.0">
+ <property name="automount-drives" type="empty">
+ <property name="enabled" type="bool" value="true"/>
+ </property>
+ <property name="automount-media" type="empty">
+ <property name="enabled" type="bool" value="true"/>
+ </property>
+ <property name="autobrowse" type="empty">
+ <property name="enabled" type="bool" value="true"/>
+ </property>
+ <property name="autoburn" type="empty">
+ <property name="enabled" type="bool" value="true"/>
+ <property name="data-cd-command" type="string" value="/usr/bin/brasero"/>
+ <property name="audio-cd-command" type="string" value="/usr/bin/brasero"/>
+ </property>
+ <property name="autoplay-audio-cds" type="empty">
+ <property name="enabled" type="bool" value="false"/>
+ <property name="command" type="string" value="/usr/bin/totem cdda://%d"/>
+ </property>
+ <property name="autoplay-video-cds" type="empty">
+ <property name="command" type="string" value="/usr/bin/totem dvd://%d"/>
+ <property name="enabled" type="bool" value="false"/>
+ </property>
+ <property name="autoipod" type="empty">
+ <property name="command" type="string" value="/usr/bin/rhythmbox"/>
+ <property name="enabled" type="bool" value="false"/>
+ </property>
+ <property name="autophoto" type="empty">
+ <property name="command" type="string" value="/usr/bin/shotwell"/>
+ <property name="enabled" type="bool" value="false"/>
+ </property>
+</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
--- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2012-06-05 09:48:42.000000000 +0200
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-keyboard-shortcuts" version="1.0">
+ <property name="commands" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>F1" type="string" value="xfce4-popup-applicationsmenu"/>
+ <property name="<Alt>F2" type="string" value="xfce4-appfinder --collapsed">
+ <property name="startup-notify" type="bool" value="true"/>
+ </property>
+ <property name="<Alt>F3" type="string" value="xfce4-appfinder">
+ <property name="startup-notify" type="bool" value="true"/>
+ </property>
+ <property name="<Control><Alt>Delete" type="string" value="xflock4"/>
+ <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
+ <property name="<Super>p" type="string" value="xfce4-display-settings --minimal"/>
+ <property name="<Control>Escape" type="string" value="xfdesktop --menu"/>
+ <property name="<Alt>Print" type="string" value="xfce4-screenshooter -w"/>
+ <property name="Print" type="string" value="xfce4-screenshooter -f"/>
+ <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
+ <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
+ </property>
+ </property>
+ <property name="xfwm4" type="empty">
+ <property name="default" type="empty">
+ <property name="<Alt>Insert" type="string" value="add_workspace_key"/>
+ <property name="Escape" type="string" value="cancel_key"/>
+ <property name="Left" type="string" value="left_key"/>
+ <property name="Right" type="string" value="right_key"/>
+ <property name="Up" type="string" value="up_key"/>
+ <property name="Down" type="string" value="down_key"/>
+ <property name="<Alt>Tab" type="string" value="cycle_windows_key"/>
+ <property name="<Alt><Shift>Tab" type="string" value="cycle_reverse_windows_key"/>
+ <property name="<Alt>Delete" type="string" value="del_workspace_key"/>
+ <property name="<Control><Alt>Down" type="string" value="down_workspace_key"/>
+ <property name="<Control><Alt>Left" type="string" value="left_workspace_key"/>
+ <property name="<Shift><Alt>Page_Down" type="string" value="lower_window_key"/>
+ <property name="<Alt>F4" type="string" value="close_window_key"/>
+ <property name="<Alt>F6" type="string" value="stick_window_key"/>
+ <property name="<Alt>F7" type="string" value="move_window_key"/>
+ <property name="<Alt>F8" type="string" value="resize_window_key"/>
+ <property name="<Alt>F9" type="string" value="hide_window_key"/>
+ <property name="<Alt>F10" type="string" value="maximize_window_key"/>
+ <property name="<Alt>F11" type="string" value="fullscreen_key"/>
+ <property name="<Alt>F12" type="string" value="above_key"/>
+ <property name="<Control><Shift><Alt>Left" type="string" value="move_window_left_key"/>
+ <property name="<Alt><Control>End" type="string" value="move_window_next_workspace_key"/>
+ <property name="<Alt><Control>Home" type="string" value="move_window_prev_workspace_key"/>
+ <property name="<Control><Shift><Alt>Right" type="string" value="move_window_right_key"/>
+ <property name="<Control><Shift><Alt>Up" type="string" value="move_window_up_key"/>
+ <property name="<Alt><Control>KP_1" type="string" value="move_window_workspace_1_key"/>
+ <property name="<Alt><Control>KP_2" type="string" value="move_window_workspace_2_key"/>
+ <property name="<Alt><Control>KP_3" type="string" value="move_window_workspace_3_key"/>
+ <property name="<Alt><Control>KP_4" type="string" value="move_window_workspace_4_key"/>
+ <property name="<Alt><Control>KP_5" type="string" value="move_window_workspace_5_key"/>
+ <property name="<Alt><Control>KP_6" type="string" value="move_window_workspace_6_key"/>
+ <property name="<Alt><Control>KP_7" type="string" value="move_window_workspace_7_key"/>
+ <property name="<Alt><Control>KP_8" type="string" value="move_window_workspace_8_key"/>
+ <property name="<Alt><Control>KP_9" type="string" value="move_window_workspace_9_key"/>
+ <property name="<Alt>space" type="string" value="popup_menu_key"/>
+ <property name="<Shift><Alt>Page_Up" type="string" value="raise_window_key"/>
+ <property name="<Control><Alt>Right" type="string" value="right_workspace_key"/>
+ <property name="<Control><Alt>d" type="string" value="show_desktop_key"/>
+ <property name="<Control><Alt>Up" type="string" value="up_workspace_key"/>
+ <property name="<Super>Tab" type="string" value="switch_window_key"/>
+ <property name="<Control>F1" type="string" value="workspace_1_key"/>
+ <property name="<Control>F2" type="string" value="workspace_2_key"/>
+ <property name="<Control>F3" type="string" value="workspace_3_key"/>
+ <property name="<Control>F4" type="string" value="workspace_4_key"/>
+ <property name="<Control>F5" type="string" value="workspace_5_key"/>
+ <property name="<Control>F6" type="string" value="workspace_6_key"/>
+ <property name="<Control>F7" type="string" value="workspace_7_key"/>
+ <property name="<Control>F8" type="string" value="workspace_8_key"/>
+ <property name="<Control>F9" type="string" value="workspace_9_key"/>
+ <property name="<Control>F10" type="string" value="workspace_10_key"/>
+ <property name="<Control>F11" type="string" value="workspace_11_key"/>
+ <property name="<Control>F12" type="string" value="workspace_12_key"/>
+ </property>
+ </property>
+</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
--- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 2012-06-05 09:48:42.000000000 +0200
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-notifyd" version="1.0">
+ <property name="notify-location" type="uint" value="3"/>
+</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
--- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 2013-01-31 19:32:57.000000000 +0100
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-panel" version="1.0">
+ <property name="configver" type="int" value="2"/>
+ <property name="panels" type="array">
+ <value type="int" value="1"/>
+ <property name="panel-1" type="empty">
+ <property name="position" type="string" value="p=10;x=0;y=0"/>
+ <property name="length" type="uint" value="100"/>
+ <property name="position-locked" type="bool" value="true"/>
+ <property name="size" type="uint" value="24"/>
+ <property name="length-adjust" type="bool" value="false"/>
+ <property name="plugin-ids" type="array">
+ <value type="int" value="1"/>
+ <value type="int" value="2"/>
+ <value type="int" value="3"/>
+ <value type="int" value="4"/>
+ <value type="int" value="5"/>
+ <value type="int" value="6"/>
+ <value type="int" value="7"/>
+ <value type="int" value="8"/>
+ <value type="int" value="9"/>
+ <value type="int" value="10"/>
+ <value type="int" value="11"/>
+ <value type="int" value="12"/>
+ </property>
+ </property>
+ </property>
+ <property name="plugins" type="empty">
+ <property name="plugin-1" type="string" value="applicationsmenu">
+ <property name="button-icon" type="string" value="xfce4-opensuse-dark"/>
+ <property name="button-title" type="string" value="openSUSE"/>
+ <property name="show-tooltips" type="bool" value="true"/>
+ </property>
+ <property name="plugin-2" type="string" value="separator"/>
+ <property name="plugin-3" type="string" value="showdesktop"/>
+ <property name="plugin-4" type="string" value="tasklist"/>
+ <property name="plugin-5" type="string" value="separator">
+ <property name="expand" type="bool" value="true"/>
+ <property name="style" type="uint" value="0"/>
+ </property>
+ <property name="plugin-6" type="string" value="mixer"/>
+ <property name="plugin-7" type="string" value="systray">
+ <property name="show-frame" type="bool" value="false"/>
+ </property>
+ <property name="plugin-8" type="string" value="pager"/>
+ <property name="plugin-9" type="string" value="separator"/>
+ <property name="plugin-10" type="string" value="clock">
+ <property name="show-frame" type="bool" value="false"/>
+ </property>
+ <property name="plugin-11" type="string" value="separator"/>
+ <property name="plugin-12" type="string" value="actions">
+ <property name="items" type="array">
+ <value type="string" value="+lock-screen"/>
+ <value type="string" value="+switch-user"/>
+ <value type="string" value="+logout-dialog"/>
+ <value type="string" value="+separator"/>
+ <value type="string" value="+suspend"/>
+ <value type="string" value="+hibernate"/>
+ <value type="string" value="+separator"/>
+ <value type="string" value="+restart"/>
+ <value type="string" value="+shutdown"/>
+ <value type="string" value="-separator"/>
+ <value type="string" value="-logout"/>
+ </property>
+ <property name="appearance" type="uint" value="1"/>
+ </property>
+ </property>
+</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
--- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 2012-10-22 17:04:20.000000000 +0200
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-session" version="1.0">
+ <property name="general" type="empty">
+ <property name="FailsafeSessionName" type="string" value="Failsafe"/>
+ <property name="SaveOnExit" type="bool" value="false"/>
+ <property name="AutoSave" type="bool" value="false"/>
+ </property>
+ <property name="sessions" type="empty">
+ <property name="Failsafe" type="empty">
+ <property name="IsFailsafe" type="bool" value="true"/>
+ <property name="Count" type="int" value="5"/>
+ <property name="Client0_Command" type="array">
+ <value type="string" value="xfwm4"/>
+ </property>
+ <property name="Client0_PerScreen" type="bool" value="false"/>
+ <property name="Client1_Command" type="array">
+ <value type="string" value="xfsettingsd"/>
+ </property>
+ <property name="Client1_PerScreen" type="bool" value="false"/>
+ <property name="Client2_Command" type="array">
+ <value type="string" value="xfce4-panel"/>
+ </property>
+ <property name="Client2_PerScreen" type="bool" value="false"/>
+ <property name="Client3_Command" type="array">
+ <value type="string" value="Thunar"/>
+ <value type="string" value="--daemon"/>
+ </property>
+ <property name="Client3_PerScreen" type="bool" value="false"/>
+ <property name="Client4_Command" type="array">
+ <value type="string" value="xfdesktop"/>
+ </property>
+ <property name="Client4_PerScreen" type="bool" value="false"/>
+ </property>
+ </property>
+ <property name="splash" type="empty">
+ <property name="Engine" type="string" value="simple"/>
+ <property name="engines" type="empty">
+ <property name="simple" type="empty">
+ <property name="Font" type="string" value="Sans 10"/>
+ <property name="BgColor" type="string" value="#D5DAD5"/>
+ <property name="FgColor" type="string" value="#000000"/>
+ <property name="Image" type="string" value="/usr/share/pixmaps/xfce4-splash-openSUSE.png"/>
+ </property>
+ </property>
+ </property>
+ <property name="compat" type="empty">
+ <property name="LaunchGNOME" type="bool" value="true"/>
+ </property>
+</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
--- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 2012-06-05 09:48:42.000000000 +0200
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfwm4" version="1.0">
+ <property name="general" type="empty">
+ <property name="theme" type="string" value="Kelabu"/>
+ <property name="title_font" type="string" value="Sans Bold 10"/>
+ <property name="double_click_time" type="int" value="400"/>
+ <property name="use_compositing" type="bool" value="true"/>
+ <property name="show_dock_shadow" type="bool" value="false"/>
+ <property name="show_frame_shadow" type="bool" value="true"/>
+ <property name="show_popup_shadow" type="bool" value="true"/>
+ <property name="workspace_count" type="int" value="2"/>
+ <property name="wrap_windows" type="bool" value="false"/>
+ <property name="tile_on_move" type="bool" value="true"/>
+ </property>
+</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
--- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 2012-06-05 09:48:42.000000000 +0200
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xsettings" version="1.0">
+ <property name="Net" type="empty">
+ <property name="ThemeName" type="string" value="Adwaita"/>
+ <property name="IconThemeName" type="string" value="openSUSE-Xfce"/>
+ </property>
+ <property name="Xft" type="empty">
+ <property name="DPI" type="int" value="-1"/>
+ <property name="Antialias" type="int" value="1"/>
+ <property name="Hinting" type="int" value="-1"/>
+ <property name="HintStyle" type="string" value="hintfull"/>
+ <property name="RGBA" type="string" value="none"/>
+ </property>
+ <property name="Gtk" type="empty">
+ <property name="CursorThemeName" type="string" value="Adwaita"/>
+ </property>
+</channel>
Files old/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-opensuse-dark.png and new/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-opensuse-dark.png differ
Files old/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-opensuse-light.png and new/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-opensuse-light.png differ
Files old/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-suse.png and new/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-suse.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/usr/share/wallpapers/xfce/default.wallpaper new/xfce4-branding-openSUSE-4.10.0/base/usr/share/wallpapers/xfce/default.wallpaper
--- old/xfce4-branding-openSUSE-4.10.0/base/usr/share/wallpapers/xfce/default.wallpaper 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/base/usr/share/wallpapers/xfce/default.wallpaper 2013-02-01 09:50:46.000000000 +0100
@@ -0,0 +1 @@
+symbolic link to /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu 2012-07-01 11:14:39.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu 1970-01-01 01:00:00.000000000 +0100
@@ -1,173 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-
-<Menu>
- <Name>Xfce</Name>
-
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
- <DefaultMergeDirs/>
-
- <Menu>
- <Name>Accessories</Name>
- <Directory>xfce-accessories.directory</Directory>
- <Include>
- <And>
- <Or>
- <Category>Accessibility</Category>
- <Category>Core</Category>
- <Category>Legacy</Category>
- <Category>Utility</Category>
- </Or>
- <Not>
- <Or>
- <Category>DiscBurning</Category>
- <Category>System</Category>
- </Or>
- </Not>
- </And>
- </Include>
- <Exclude>
- <Category>X-Xfce-Toplevel</Category>
- <Category>Settings</Category>
- </Exclude>
- </Menu>
-
- <Menu>
- <Name>Development</Name>
- <Directory>xfce-development.directory</Directory>
- <Include>
- <Category>Development</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Education</Name>
- <Directory>xfce-education.directory</Directory>
- <Include>
- <Category>Education</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Games</Name>
- <Directory>xfce-games.directory</Directory>
- <Include>
- <Category>Game</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Graphics</Name>
- <Directory>xfce-graphics.directory</Directory>
- <Include>
- <Category>Graphics</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Multimedia</Name>
- <Directory>xfce-multimedia.directory</Directory>
- <Include>
- <Or>
- <Category>Audio</Category>
- <Category>Video</Category>
- <Category>AudioVideo</Category>
- <Category>DiscBurning</Category>
- </Or>
- </Include>
- <Exclude>
- <Category>Settings</Category>
- </Exclude>
- </Menu>
-
- <Menu>
- <Name>Network</Name>
- <Directory>xfce-network.directory</Directory>
- <Include>
- <Category>Network</Category>
- </Include>
- <Exclude>
- <Category>X-Xfce-Toplevel</Category>
- </Exclude>
- </Menu>
-
- <Menu>
- <Name>Office</Name>
- <Directory>xfce-office.directory</Directory>
- <Include>
- <Category>Office</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Science</Name>
- <Directory>xfce-science.directory</Directory>
- <Include>
- <Category>Science</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>System</Name>
- <Directory>xfce-system.directory</Directory>
- <Include>
- <Or>
- <Category>Emulator</Category>
- <Category>System</Category>
- </Or>
- </Include>
- <Exclude>
- <Category>X-Xfce-Toplevel</Category>
- <Category>Settings</Category>
- <Category>PackageManager</Category>
- </Exclude>
- </Menu>
-
- <Menu>
- <Name>Settings</Name>
- <Directory>xfce-settings.directory</Directory>
- <Include>
- <Filename>xfce-settings-manager.desktop</Filename>
- <Filename>YaST.desktop</Filename>
- <Filename>package-manager.desktop</Filename>
- </Include>
- <Layout>
- <Filename>xfce-settings-manager.desktop</Filename>
- <Filename>YaST.desktop</Filename>
- <Filename>package-manager.desktop</Filename>
- </Layout>
- </Menu>
-
- <Menu>
- <Name>Other</Name>
- <Directory>xfce-other.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <All/>
- </Include>
- <Exclude>
- <Category>Settings</Category>
- <Category>PackageManager</Category>
- <Category>X-Xfce-Toplevel</Category>
- </Exclude>
- </Menu>
-
- <Include>
- <Filename>xfce4-run.desktop</Filename>
- <Filename>xfce4-about.desktop</Filename>
- <Filename>xfce4-session-logout.desktop</Filename>
- </Include>
-
- <Layout>
- <Merge type="menus"/>
- <Menuname>Other</Menuname>
- <Separator/>
- <Menuname>Settings</Menuname>
- <Separator/>
- <Merge type="files"/>
- <Filename>xfce4-run.desktop</Filename>
- <Filename>xfce4-about.desktop</Filename>
- <Filename>xfce4-session-logout.desktop</Filename>
- </Layout>
-</Menu>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu 2012-07-01 11:14:44.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu 1970-01-01 01:00:00.000000000 +0100
@@ -1,106 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-
-<Menu>
- <Name>Settings</Name>
-
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
- <DefaultMergeDirs/>
-
- <Menu>
- <Name>Personal</Name>
- <Directory>xfce-personal.directory</Directory>
- <Include>
- <Or>
- <And>
- <Category>Settings</Category>
- <Category>X-XFCE-SettingsDialog</Category>
- <Category>X-XFCE-PersonalSettings</Category>
- </And>
- <And>
- <Category>Settings</Category>
- <Category>DesktopSettings</Category>
- <Not>
- <Category>X-XFCE-HardwareSettings</Category>
- <Category>X-XFCE-SystemSettings</Category>
- </Not>
- </And>
- </Or>
- </Include>
- <Exclude>
- <Filename>xfce-settings-manager.desktop</Filename>
- </Exclude>
- </Menu>
-
- <Menu>
- <Name>Hardware</Name>
- <Directory>xfce-hardware.directory</Directory>
- <Include>
- <Or>
- <And>
- <Category>Settings</Category>
- <Category>X-XFCE-SettingsDialog</Category>
- <Category>X-XFCE-HardwareSettings</Category>
- </And>
- <And>
- <Category>Settings</Category>
- <Category>HardwareSettings</Category>
- <Not>
- <Category>X-XFCE-PersonalSettings</Category>
- <Category>X-XFCE-SystemSettings</Category>
- </Not>
- </And>
- </Or>
- </Include>
- </Menu>
-
- <Menu>
- <Name>System</Name>
- <Directory>xfce-system.directory</Directory>
- <Include>
- <Or>
- <And>
- <Category>Settings</Category>
- <Category>X-XFCE-SettingsDialog</Category>
- <Category>X-XFCE-SystemSettings</Category>
- </And>
- <And>
- <Category>Settings</Category>
- <Category>System</Category>
- <Not>
- <Or>
- <Category>X-XFCE-PersonalSettings</Category>
- <Category>X-XFCE-HardwareSettings</Category>
- <Category>HardwareSettings</Category>
- <Category>DesktopSettings</Category>
- <Category>X-SuSE-YaST</Category>
- </Or>
- </Not>
- </And>
- <Category>PackageManager</Category>
- </Or>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Other</Name>
- <Directory>xfce-other.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <Category>Settings</Category>
- </Include>
- <Exclude>
- <Filename>xfce-settings-manager.desktop</Filename>
- <Category>X-SuSE-YaST</Category>
- </Exclude>
- </Menu>
-
- <Layout>
- <Menuname>Personal</Menuname>
- <Menuname>Hardware</Menuname>
- <Menuname>System</Menuname>
- <Menuname>Other</Menuname>
- <Merge type="menus"/>
- </Layout>
-</Menu>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/midori/config new/xfce4-branding-openSUSE-4.10.0/etc/xdg/midori/config
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/midori/config 2012-06-05 09:48:42.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/midori/config 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-[settings]
-homepage=http://www.opensuse.org/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/helpers.rc new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/helpers.rc
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/helpers.rc 2012-06-05 09:48:42.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/helpers.rc 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-#
-# openSUSE helpers.rc for Xfce's Preferred Applications
-#
-# Copyright (c) 2005-2006 Benedikt Meurer
-#
-
-WebBrowser=firefox
-MailReader=thunderbird
-TerminalEmulator=Terminal
-FileManager=Thunar
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml 2012-06-05 09:48:42.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="thunar-volman" version="1.0">
- <property name="automount-drives" type="empty">
- <property name="enabled" type="bool" value="true"/>
- </property>
- <property name="automount-media" type="empty">
- <property name="enabled" type="bool" value="true"/>
- </property>
- <property name="autobrowse" type="empty">
- <property name="enabled" type="bool" value="true"/>
- </property>
- <property name="autoburn" type="empty">
- <property name="enabled" type="bool" value="true"/>
- <property name="data-cd-command" type="string" value="/usr/bin/brasero"/>
- <property name="audio-cd-command" type="string" value="/usr/bin/brasero"/>
- </property>
- <property name="autoplay-audio-cds" type="empty">
- <property name="enabled" type="bool" value="false"/>
- <property name="command" type="string" value="/usr/bin/totem cdda://%d"/>
- </property>
- <property name="autoplay-video-cds" type="empty">
- <property name="command" type="string" value="/usr/bin/totem dvd://%d"/>
- <property name="enabled" type="bool" value="false"/>
- </property>
- <property name="autoipod" type="empty">
- <property name="command" type="string" value="/usr/bin/rhythmbox"/>
- <property name="enabled" type="bool" value="false"/>
- </property>
- <property name="autophoto" type="empty">
- <property name="command" type="string" value="/usr/bin/shotwell"/>
- <property name="enabled" type="bool" value="false"/>
- </property>
-</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2012-06-05 09:48:42.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-keyboard-shortcuts" version="1.0">
- <property name="commands" type="empty">
- <property name="default" type="empty">
- <property name="<Alt>F1" type="string" value="xfce4-popup-applicationsmenu"/>
- <property name="<Alt>F2" type="string" value="xfce4-appfinder --collapsed">
- <property name="startup-notify" type="bool" value="true"/>
- </property>
- <property name="<Alt>F3" type="string" value="xfce4-appfinder">
- <property name="startup-notify" type="bool" value="true"/>
- </property>
- <property name="<Control><Alt>Delete" type="string" value="xflock4"/>
- <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
- <property name="<Super>p" type="string" value="xfce4-display-settings --minimal"/>
- <property name="<Control>Escape" type="string" value="xfdesktop --menu"/>
- <property name="<Alt>Print" type="string" value="xfce4-screenshooter -w"/>
- <property name="Print" type="string" value="xfce4-screenshooter -f"/>
- <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
- <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
- </property>
- </property>
- <property name="xfwm4" type="empty">
- <property name="default" type="empty">
- <property name="<Alt>Insert" type="string" value="add_workspace_key"/>
- <property name="Escape" type="string" value="cancel_key"/>
- <property name="Left" type="string" value="left_key"/>
- <property name="Right" type="string" value="right_key"/>
- <property name="Up" type="string" value="up_key"/>
- <property name="Down" type="string" value="down_key"/>
- <property name="<Alt>Tab" type="string" value="cycle_windows_key"/>
- <property name="<Alt><Shift>Tab" type="string" value="cycle_reverse_windows_key"/>
- <property name="<Alt>Delete" type="string" value="del_workspace_key"/>
- <property name="<Control><Alt>Down" type="string" value="down_workspace_key"/>
- <property name="<Control><Alt>Left" type="string" value="left_workspace_key"/>
- <property name="<Shift><Alt>Page_Down" type="string" value="lower_window_key"/>
- <property name="<Alt>F4" type="string" value="close_window_key"/>
- <property name="<Alt>F6" type="string" value="stick_window_key"/>
- <property name="<Alt>F7" type="string" value="move_window_key"/>
- <property name="<Alt>F8" type="string" value="resize_window_key"/>
- <property name="<Alt>F9" type="string" value="hide_window_key"/>
- <property name="<Alt>F10" type="string" value="maximize_window_key"/>
- <property name="<Alt>F11" type="string" value="fullscreen_key"/>
- <property name="<Alt>F12" type="string" value="above_key"/>
- <property name="<Control><Shift><Alt>Left" type="string" value="move_window_left_key"/>
- <property name="<Alt><Control>End" type="string" value="move_window_next_workspace_key"/>
- <property name="<Alt><Control>Home" type="string" value="move_window_prev_workspace_key"/>
- <property name="<Control><Shift><Alt>Right" type="string" value="move_window_right_key"/>
- <property name="<Control><Shift><Alt>Up" type="string" value="move_window_up_key"/>
- <property name="<Alt><Control>KP_1" type="string" value="move_window_workspace_1_key"/>
- <property name="<Alt><Control>KP_2" type="string" value="move_window_workspace_2_key"/>
- <property name="<Alt><Control>KP_3" type="string" value="move_window_workspace_3_key"/>
- <property name="<Alt><Control>KP_4" type="string" value="move_window_workspace_4_key"/>
- <property name="<Alt><Control>KP_5" type="string" value="move_window_workspace_5_key"/>
- <property name="<Alt><Control>KP_6" type="string" value="move_window_workspace_6_key"/>
- <property name="<Alt><Control>KP_7" type="string" value="move_window_workspace_7_key"/>
- <property name="<Alt><Control>KP_8" type="string" value="move_window_workspace_8_key"/>
- <property name="<Alt><Control>KP_9" type="string" value="move_window_workspace_9_key"/>
- <property name="<Alt>space" type="string" value="popup_menu_key"/>
- <property name="<Shift><Alt>Page_Up" type="string" value="raise_window_key"/>
- <property name="<Control><Alt>Right" type="string" value="right_workspace_key"/>
- <property name="<Control><Alt>d" type="string" value="show_desktop_key"/>
- <property name="<Control><Alt>Up" type="string" value="up_workspace_key"/>
- <property name="<Super>Tab" type="string" value="switch_window_key"/>
- <property name="<Control>F1" type="string" value="workspace_1_key"/>
- <property name="<Control>F2" type="string" value="workspace_2_key"/>
- <property name="<Control>F3" type="string" value="workspace_3_key"/>
- <property name="<Control>F4" type="string" value="workspace_4_key"/>
- <property name="<Control>F5" type="string" value="workspace_5_key"/>
- <property name="<Control>F6" type="string" value="workspace_6_key"/>
- <property name="<Control>F7" type="string" value="workspace_7_key"/>
- <property name="<Control>F8" type="string" value="workspace_8_key"/>
- <property name="<Control>F9" type="string" value="workspace_9_key"/>
- <property name="<Control>F10" type="string" value="workspace_10_key"/>
- <property name="<Control>F11" type="string" value="workspace_11_key"/>
- <property name="<Control>F12" type="string" value="workspace_12_key"/>
- </property>
- </property>
-</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 2012-06-05 09:48:42.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-notifyd" version="1.0">
- <property name="notify-location" type="uint" value="3"/>
-</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 2012-06-23 16:01:55.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-panel" version="1.0">
- <property name="configver" type="int" value="2"/>
- <property name="panels" type="array">
- <value type="int" value="1"/>
- <property name="panel-1" type="empty">
- <property name="position" type="string" value="p=10;x=0;y=0"/>
- <property name="length" type="uint" value="100"/>
- <property name="position-locked" type="bool" value="true"/>
- <property name="size" type="uint" value="24"/>
- <property name="length-adjust" type="bool" value="false"/>
- <property name="plugin-ids" type="array">
- <value type="int" value="1"/>
- <value type="int" value="2"/>
- <value type="int" value="3"/>
- <value type="int" value="4"/>
- <value type="int" value="5"/>
- <value type="int" value="6"/>
- <value type="int" value="7"/>
- <value type="int" value="8"/>
- <value type="int" value="9"/>
- <value type="int" value="10"/>
- <value type="int" value="11"/>
- <value type="int" value="12"/>
- </property>
- </property>
- </property>
- <property name="plugins" type="empty">
- <property name="plugin-1" type="string" value="applicationsmenu">
- <property name="button-icon" type="string" value="xfce4-opensuse-dark"/>
- <property name="button-title" type="string" value="openSUSE"/>
- <property name="show-tooltips" type="bool" value="true"/>
- </property>
- <property name="plugin-2" type="string" value="separator"/>
- <property name="plugin-3" type="string" value="showdesktop"/>
- <property name="plugin-4" type="string" value="tasklist"/>
- <property name="plugin-5" type="string" value="separator">
- <property name="expand" type="bool" value="true"/>
- <property name="style" type="uint" value="0"/>
- </property>
- <property name="plugin-6" type="string" value="xfce4-mixer-plugin"/>
- <property name="plugin-7" type="string" value="systray">
- <property name="show-frame" type="bool" value="false"/>
- </property>
- <property name="plugin-8" type="string" value="pager"/>
- <property name="plugin-9" type="string" value="separator"/>
- <property name="plugin-10" type="string" value="clock">
- <property name="show-frame" type="bool" value="false"/>
- </property>
- <property name="plugin-11" type="string" value="separator"/>
- <property name="plugin-12" type="string" value="actions">
- <property name="items" type="array">
- <value type="string" value="+lock-screen"/>
- <value type="string" value="+switch-user"/>
- <value type="string" value="+logout-dialog"/>
- <value type="string" value="+separator"/>
- <value type="string" value="+suspend"/>
- <value type="string" value="+hibernate"/>
- <value type="string" value="+separator"/>
- <value type="string" value="+restart"/>
- <value type="string" value="+shutdown"/>
- <value type="string" value="-separator"/>
- <value type="string" value="-logout"/>
- </property>
- <property name="appearance" type="uint" value="1"/>
- </property>
- </property>
-</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 2012-10-22 17:04:20.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-session" version="1.0">
- <property name="general" type="empty">
- <property name="FailsafeSessionName" type="string" value="Failsafe"/>
- <property name="SaveOnExit" type="bool" value="false"/>
- <property name="AutoSave" type="bool" value="false"/>
- </property>
- <property name="sessions" type="empty">
- <property name="Failsafe" type="empty">
- <property name="IsFailsafe" type="bool" value="true"/>
- <property name="Count" type="int" value="5"/>
- <property name="Client0_Command" type="array">
- <value type="string" value="xfwm4"/>
- </property>
- <property name="Client0_PerScreen" type="bool" value="false"/>
- <property name="Client1_Command" type="array">
- <value type="string" value="xfsettingsd"/>
- </property>
- <property name="Client1_PerScreen" type="bool" value="false"/>
- <property name="Client2_Command" type="array">
- <value type="string" value="xfce4-panel"/>
- </property>
- <property name="Client2_PerScreen" type="bool" value="false"/>
- <property name="Client3_Command" type="array">
- <value type="string" value="Thunar"/>
- <value type="string" value="--daemon"/>
- </property>
- <property name="Client3_PerScreen" type="bool" value="false"/>
- <property name="Client4_Command" type="array">
- <value type="string" value="xfdesktop"/>
- </property>
- <property name="Client4_PerScreen" type="bool" value="false"/>
- </property>
- </property>
- <property name="splash" type="empty">
- <property name="Engine" type="string" value="simple"/>
- <property name="engines" type="empty">
- <property name="simple" type="empty">
- <property name="Font" type="string" value="Sans 10"/>
- <property name="BgColor" type="string" value="#D5DAD5"/>
- <property name="FgColor" type="string" value="#000000"/>
- <property name="Image" type="string" value="/usr/share/pixmaps/xfce4-splash-openSUSE.png"/>
- </property>
- </property>
- </property>
- <property name="compat" type="empty">
- <property name="LaunchGNOME" type="bool" value="true"/>
- </property>
-</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 2012-06-05 09:48:42.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfwm4" version="1.0">
- <property name="general" type="empty">
- <property name="theme" type="string" value="Kelabu"/>
- <property name="title_font" type="string" value="Sans Bold 10"/>
- <property name="double_click_time" type="int" value="400"/>
- <property name="use_compositing" type="bool" value="true"/>
- <property name="show_dock_shadow" type="bool" value="false"/>
- <property name="show_frame_shadow" type="bool" value="true"/>
- <property name="show_popup_shadow" type="bool" value="true"/>
- <property name="workspace_count" type="int" value="2"/>
- <property name="wrap_windows" type="bool" value="false"/>
- <property name="tile_on_move" type="bool" value="true"/>
- </property>
-</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 2012-06-05 09:48:42.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
- <property name="Net" type="empty">
- <property name="ThemeName" type="string" value="Adwaita"/>
- <property name="IconThemeName" type="string" value="openSUSE-Xfce"/>
- </property>
- <property name="Xft" type="empty">
- <property name="DPI" type="int" value="-1"/>
- <property name="Antialias" type="int" value="1"/>
- <property name="Hinting" type="int" value="-1"/>
- <property name="HintStyle" type="string" value="hintfull"/>
- <property name="RGBA" type="string" value="none"/>
- </property>
- <property name="Gtk" type="empty">
- <property name="CursorThemeName" type="string" value="Adwaita"/>
- </property>
-</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xfce_defaults.conf new/xfce4-branding-openSUSE-4.10.0/etc/xfce_defaults.conf
--- old/xfce4-branding-openSUSE-4.10.0/etc/xfce_defaults.conf 2012-10-04 15:06:48.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xfce_defaults.conf 1970-01-01 01:00:00.000000000 +0100
@@ -1,73 +0,0 @@
-# Xfce Default Applications Source
-# /etc/xfcer_defaults.conf
-#
-# After any change of this file run
-# suse-update-mime-defaults
-#
-# This list is a source for defaults.list.
-#
-# If application in this list is installed, it is used as default in GNOME.
-# It works in following way:
-# 1. Read this file.
-# 2. Collect all available desktop files.
-# 3. Go through all declared MIME types and search for default application
-# for defaults.list in following order:
-# 3.1 Installed application listed here for certain MIME type.
-# 3.2 Installed application listed here as preferred default.
-# 3.3 Installed application listed here as default.
-# 3.4 Installed application with GNOME in Categories.
-# 3.5 Installed application with GTK in Categories.
-# 3.6 Installed application.
-# If there are more applications in the same order, it uses pseudo-randomly
-# one of them (last in aplhabetical order).
-#
-# Syntax:
-# Use xxx as default for all MIME types it declares (see 3.3):
-# xxx.desktop
-# Use xxx as preferred default for all MIME types it declares (see 3.2):
-# !xxx.desktop
-# Use xxx as default for mime/type (see 3.1):
-# mime/type=xxx.desktop
-
-# URI schemes
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-x-scheme-handler/ftp=firefox.desktop
-x-scheme-handler/mailto=thunderbird.desktop
-# All URI schemes declared by yelp
-yelp.desktop
-
-# Prefer totem for multimedia where possible
-!totem.desktop
-
-# Prefer Install Software over file-roller
-application/x-rpm=package-manager.desktop
-!gpk-install-file.desktop
-
-# Xfce default applications
-ristretto.desktop
-evince.desktop
-leafpad.desktop
-file-roller.desktop
-# file-roller supports iso, but most people will prefer brasero:
-application/x-cd-image=brasero.desktop
-Thunar-folder-handler.desktop
-# evince supports multi-page tiff, but most people will prefer ristretto:
-image/tiff=ristretto.desktop
-# evince supports odp, but we really want OOo
-application/vnd.sun.xml.impress=impress.desktop
-application/vnd.oasis.opendocument.presentation=impress.desktop
-
-# Firefox
-firefox.desktop
-
-# OpenOffice
-base.desktop
-calc.desktop
-draw.desktop
-impress.desktop
-math.desktop
-web.desktop
-writer.desktop
-# Do not prefer writer for text/plain:
-text/plain=leafpad.desktop
Files old/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-opensuse-dark.png and new/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-opensuse-dark.png differ
Files old/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-opensuse-light.png and new/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-opensuse-light.png differ
Files old/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-suse.png and new/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-suse.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/usr/share/wallpapers/xfce/default.wallpaper new/xfce4-branding-openSUSE-4.10.0/usr/share/wallpapers/xfce/default.wallpaper
--- old/xfce4-branding-openSUSE-4.10.0/usr/share/wallpapers/xfce/default.wallpaper 2013-02-01 09:50:46.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/usr/share/wallpapers/xfce/default.wallpaper 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-symbolic link to /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org