Hello community,
here is the log from the commit of package xfce4-branding-openSUSE for openSUSE:Factory checked in at 2012-05-08 11:49:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2012-04-24 11:22:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new/xfce4-branding-openSUSE.changes 2012-05-08 11:49:26.000000000 +0200
@@ -1,0 +2,107 @@
+Tue May 1 10:35:32 UTC 2012 - gber@opensuse.org
+
+- fix xfcemail and xfce-nomail icons
+- rename %{_datadir}/wallpapers/xfce/default.jpg to
+ %{_datadir}/wallpapers/xfce/default.wallpaper, the default
+ wallpaper formats may differ and xfdesktop doesn't care about
+ the filetype extension
+
+-------------------------------------------------------------------
+Mon Apr 30 20:30:14 UTC 2012 - gber@opensuse.org
+
+- remove ristretto icons and use the new icons provided by
+ ristretto 0.6.0
+
+-------------------------------------------------------------------
+Sun Apr 29 08:30:50 UTC 2012 - gber@opensuse.org
+
+- added depenency of libgarcon-branding-openSUSE on
+ libxfce4ui-tools snce the menu references xfce4-about.desktop
+
+-------------------------------------------------------------------
+Fri Apr 27 10:53:35 UTC 2012 - gber@opensuse.org
+
+- remove dependency of libgarcon-branding-openSUSE on
+ libgarcon-data
+- remove dependency of xfce4-panel-branding-openSUSE on exo-tools
+
+-------------------------------------------------------------------
+Fri Apr 27 08:05:21 UTC 2012 - gber@opensuse.org
+
+- added xfce-schedule icon
+- bump version to 4.10
+
+-------------------------------------------------------------------
+Mon Apr 23 17:40:46 UTC 2012 - gber@opensuse.org
+
+- libgarcon-branding-openSUSE should have a reverse dependency on
+ libgarcon-data rather than libgarcon-1-0
+
+-------------------------------------------------------------------
+Fri Apr 20 20:15:23 UTC 2012 - gber@opensuse.org
+
+- libxfce4ui-branding-openSUSE
+ - added keyboard shortcuts for starting browser and MUA with
+ XF86WWW and XF86Mail
+ - use startup notification for xfce4-appfinder shortcuts
+- xfce4-settings-branding-openSUSE
+ - order the menus in xfce-settings-manager.menu
+- xfwm4-branding-openSUSE
+ - enable tiling
+
+-------------------------------------------------------------------
+Sun Apr 15 15:29:41 UTC 2012 - gber@opensuse.org
+
+- only build midori-branding-openSUSE for > 11.4 since Midori does
+ not support 11.4 any more
+- only depend on wallpaper-branding-openSUSE for > 11.4
+
+-------------------------------------------------------------------
+Sat Apr 14 14:44:37 UTC 2012 - gber@opensuse.org
+
+- make libgarcon-branding-openSUSE depend on libgarcon-data
+
+-------------------------------------------------------------------
+Sat Apr 14 07:41:41 UTC 2012 - gber@opensuse.org
+
+- added openSUSE-xfce-icon-theme which provides icons missing from
+ gnome-icon-theme
+- moved licenses into the tarballs
+- xfce4-panel-branding-openSUSE
+ - use internal clock plugin again
+ - added new button images
+ %{_datadir}/pixmaps/xfce4-opensuse-light.png and
+ %{_datadir}/pixmaps/xfce4-opensuse-dark.png
+- xfce4-session-branding-openSUSE
+ - dropped xfce4-settings-helper which ash been removed
+ - dropped xscreensaver which is now started via autostart
+- xfwm4-branding-openSUSE
+ - increased doubleclick time to 400ms
+ - enabled composite by default
+ - enabled shadows
+- libgarcon-branding-openSUSE
+ - reworked application menu and incorporated a customized
+ xfce-settings-manager-menu
+- xfce4-settings-branding-openSUSE
+ - added customized
+ %{_sysconfdir}/xdg/menus/xfce-settings-manager.menu which also
+ includes non-Xfce settings
+ - switch from the GNOME icon theme to the openSUSE Xfce icon
+ theme
+- xfdesktop-branding-openSUSE
+ - deliver symlink %{_datadir}/xfce4/backdrops/default.jpg
+ pointing to the default backdrop image from
+ wallpaper-branding-openSUSE which is now the compiled-in
+ default and removed
+ %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+ so that now all screens have the same default
+- enabled thunar-volman-branding-openSUSE for 11.4
+
+-------------------------------------------------------------------
+Sun Apr 8 20:06:56 UTC 2012 - gber@opensuse.org
+
+- bump version to 4.9.0
+- remove xfce4-tips autostart file
+- add build dependencies on upstream branding to avoid ambiguities
+
+-------------------------------------------------------------------
@@ -4,0 +112,2 @@
+ - added openSUSE package search to the list of search engines
+ - use opensuse.org as the default home page
Old:
----
COPYING
COPYING.xfce4-splash-openSUSE-11.4
xfce4-branding-openSUSE-4.8.0-11.4.tar.bz2
xfce4-branding-openSUSE-4.8.0.tar.bz2
New:
----
openSUSE-xfce-icon-theme.tar.bz2
xfce4-branding-openSUSE-4.10.0.tar.bz2
xfce4-branding-openSUSE_11.4-4.10.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.L8LMdt/_old 2012-05-08 11:49:27.000000000 +0200
+++ /var/tmp/diff_new_pack.L8LMdt/_new 2012-05-08 11:49:27.000000000 +0200
@@ -16,64 +16,74 @@
#
+%define libxfce4ui_libname libxfce4ui-1-0
+
%define xfce4_panel_version %(rpm -q --queryformat '%%{VERSION}' xfce4-panel)
%define xfce4_session_version %(rpm -q --queryformat '%%{VERSION}' xfce4-session)
%define xfce4_settings_version %(rpm -q --queryformat '%%{VERSION}' xfce4-settings)
%define xfdesktop_version %(rpm -q --queryformat '%%{VERSION}' xfdesktop)
-%define libgarcon_version %(rpm -q --queryformat '%%{VERSION}' libgarcon-1-0)
-%define libxfce4ui_version %(rpm -q --queryformat '%%{VERSION}' libxfce4ui-1-0)
+%define libgarcon_version %(rpm -q --queryformat '%%{VERSION}' libgarcon-data)
+%define libxfce4ui_version %(rpm -q --queryformat '%%{VERSION}' %{libxfce4ui_libname})
%define xfce4_notifyd_version %(rpm -q --queryformat '%%{VERSION}' xfce4-notifyd)
%define exo_version %(rpm -q --queryformat '%%{VERSION}' exo-data)
%define xfwm4_version %(rpm -q --queryformat '%%{VERSION}' xfwm4)
-%define midori_version %(rpm -q --queryformat '%%{VERSION}' midori)
-%if 0%{?suse_version} >= 1210
%define thunar_volman_version %(rpm -q --queryformat '%%{VERSION}' thunar-volman)
+%if 0%{?suse_version} > 1140
+%define midori_version %(rpm -q --queryformat '%%{VERSION}' midori)
%endif
Name: xfce4-branding-openSUSE
-Version: 4.8.0
+Version: 4.10.0
Release: 0
-Summary: openSUSE Branding of the Xfce desktop environment
+Summary: openSUSE Branding of the Xfce Desktop Environment
License: CC-BY-SA-3.0 and GPL-2.0+
Group: System/GUI/XFCE
Url: http://www.opensuse.org/
-%if 0%{?suse_version} >= 1210
-Source: %{name}-%{version}.tar.bz2
+%if 0%{?suse_version} < 1210
+Source0: %{name}_11.4-%{version}.tar.bz2
%else
-Source: %{name}-%{version}-11.4.tar.bz2
+Source0: %{name}-%{version}.tar.bz2
%endif
-Source1: COPYING
-Source2: COPYING.xfce4-splash-openSUSE-11.4
-BuildRequires: exo-branding-upstream
+Source1: openSUSE-xfce-icon-theme.tar.bz2
+BuildRequires: %{libxfce4ui_libname}
BuildRequires: exo-data
-BuildRequires: libgarcon-1-0
-BuildRequires: libxfce4ui-1-0
+BuildRequires: fdupes
+BuildRequires: libgarcon-data
+%if 0%{?suse_version} < 1210
+BuildRequires: desktop-data
+%else
BuildRequires: midori
+# needed for %%{_sysconfdir}/xdg/midori/search
BuildRequires: midori-branding-upstream
+BuildRequires: wallpaper-branding
+%endif
+BuildRequires: thunar-volman
BuildRequires: xfce4-notifyd
BuildRequires: xfce4-panel
BuildRequires: xfce4-session
-BuildRequires: xfce4-session-branding-upstream
BuildRequires: xfce4-settings
BuildRequires: xfdesktop
BuildRequires: xfwm4
-%if 0%{?suse_version} >= 1210
-BuildRequires: thunar-volman
-%endif
+BuildRequires: xfwm4-branding-upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
This package provides the openSUSE look and feel for the Xfce desktop environment.
+%package -n openSUSE-xfce-icon-theme
+Summary: openSUSE Xfce Default Icon Theme
+License: CC-BY-SA-3.0 and GPL-2.0+
+Group: System/GUI/XFCE
+Requires: gnome-icon-theme
+
+%description -n openSUSE-xfce-icon-theme
+This is the openSUSE Xfce Default Icon Theme.
+
%package -n xfce4-panel-branding-openSUSE
Summary: openSUSE Branding of xfce4-panel
License: CC-BY-SA-3.0 and GPL-2.0+
Group: System/GUI/XFCE
-Requires: exo-tools
-%if 0%{?suse_version} >= 1210
-Requires: xfce4-panel-plugin-datetime
-%endif
Conflicts: otherproviders(xfce4-panel-branding)
Provides: xfce4-panel-branding = %{xfce4_panel_version}
Supplements: packageand(xfce4-panel:branding-openSUSE)
@@ -98,13 +108,14 @@
Group: System/GUI/XFCE
# should bring in either desktop-data-openSUSE or desktop-data-SLED
Requires: desktop-data
-%if 0%{?suse_version} >= 1210
+%if 0%{?suse_version} < 1210
+Requires: gtk2-metatheme-sonar
+%else
Requires: gtk2-metatheme-adwaita
Requires: gtk3-metatheme-adwaita
+Requires: openSUSE-xfce-icon-theme
# built from branding-openSUSE
Requires: xfce4-splash-branding-openSUSE
-%else
-Requires: gtk2-metatheme-sonar
%endif
Conflicts: otherproviders(xfce4-settings-branding)
Provides: xfce4-settings-branding = %{xfce4_settings_version}
@@ -114,7 +125,7 @@
This package provides the openSUSE look and feel for Xfce.
%package -n xfdesktop-branding-openSUSE
-Summary: openSUSE Branding of xfce4-settings
+Summary: openSUSE Branding of xfdesktop
License: CC-BY-SA-3.0 and GPL-2.0+
Group: System/GUI/XFCE
%if 0%{?suse_version} >= 1210
@@ -133,14 +144,18 @@
This package provides the openSUSE look and feel for the Xfce Desktop Manager.
%package -n libgarcon-branding-openSUSE
-Summary: openSUSE Branding of libgarcon-1-0
+Summary: openSUSE Branding of libgarcon
License: CC-BY-SA-3.0 and GPL-2.0
Group: System/GUI/XFCE
# should bring in either desktop-data-openSUSE or desktop-data-SLED
Requires: desktop-data
+# xfce-applications.menu requires xfce-settings-manager.menu
+Requires: xfce4-settings-branding-openSUSE = %{version}
+# the menu references xfce4-about.desktop
+Requires: libxfce4ui-tools
Conflicts: otherproviders(libgarcon-branding)
Provides: libgarcon-branding = %{libgarcon_version}
-Supplements: packageand(libgarcon-1-0:branding-openSUSE)
+Supplements: packageand(libgarcon-data:branding-openSUSE)
%description -n libgarcon-branding-openSUSE
This package provides the openSUSE look and feel for Garcon.
@@ -151,7 +166,7 @@
Group: System/GUI/XFCE
Conflicts: otherproviders(libxfce4ui-branding)
Provides: libxfce4ui-branding = %{libxfce4ui_version}
-Supplements: packageand(libxfce4ui-1-0:branding-openSUSE)
+Supplements: packageand(%{libxfce4ui_libname}:branding-openSUSE)
%description -n libxfce4ui-branding-openSUSE
This package provides the openSUSE look and feel for the libxfce4ui library.
@@ -190,7 +205,6 @@
%description -n xfwm4-branding-openSUSE
This package provides the openSUSE look and feel for the xfwm4 window manager.
-%if 0%{?suse_version} >= 1210
%package -n thunar-volman-branding-openSUSE
Summary: openSUSE Branding of thunar-volman
License: CC-BY-SA-3.0 and GPL-2.0+
@@ -202,8 +216,7 @@
%description -n thunar-volman-branding-openSUSE
This package provides the openSUSE look and feel for the Thunar Volume Manager.
-%endif
-
+%if 0%{?suse_version} > 1140
%package -n midori-branding-openSUSE
Summary: openSUSE Branding of midori
License: CC-BY-SA-3.0 and GPL-2.0+
@@ -214,18 +227,15 @@
%description -n midori-branding-openSUSE
This package provides the openSUSE look and feel for the Midori web browser.
+%endif
%prep
-%setup -q
-cp -p %{SOURCE1} .
-cp -p %{SOURCE2} COPYING.xfce4-splash-openSUSE
+%setup -q -a1
%build
-sed 's|Hidden=false|Hidden=true|' \
- %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop \
- >etc/xdg/autostart/xfce4-tips-autostart.desktop
+%if 0%{?suse_version} > 1140
cp %{_sysconfdir}/xdg/midori/search etc/xdg/midori/search
-cat >etc/xdg/midori/search <>etc/xdg/midori/search <<'EOF'
[openSUSE Software]
name=openSUSE Software
@@ -233,25 +243,41 @@
uri=http://software.opensuse.org/search?p=1&baseproject=ALL&q=%%s
token=os
EOF
+%endif
%install
find etc usr -depth -print | cpio -pvd %{buildroot}
+(
+ cd openSUSE-xfce-icon-theme
+ find openSUSE-Xfce -depth -print | cpio -pvd %{buildroot}%{_datadir}/icons
+)
+
+%fdupes %{buildroot}%{_datadir}/icons/openSUSE-Xfce
+
+%icon_theme_cache_create_ghost openSUSE-Xfce
%clean
rm -rf %{buildroot}
+%post -n openSUSE-xfce-icon-theme
+%icon_theme_cache_post openSUSE-Xfce
+
+%files -n openSUSE-xfce-icon-theme
+%defattr(-,root,root)
+%doc openSUSE-xfce-icon-theme/{COPYING,LICENSES}
+%{_datadir}/icons/openSUSE-Xfce
+%ghost %{_datadir}/icons/openSUSE-Xfce/icon-theme.cache
+
%files -n xfce4-panel-branding-openSUSE
%defattr(-,root,root)
%doc COPYING
%dir %{_sysconfdir}/xdg/xfce4
-%if 0%{?suse_version} >= 1210
-%dir %{_sysconfdir}/xdg/xfce4/panel
-%config %{_sysconfdir}/xdg/xfce4/panel/datetime-12.rc
-%endif
%dir %{_sysconfdir}/xdg/xfce4/xfconf
%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
%{_datadir}/pixmaps/xfce4-suse.png
+%{_datadir}/pixmaps/xfce4-opensuse-light.png
+%{_datadir}/pixmaps/xfce4-opensuse-dark.png
%files -n xfce4-session-branding-openSUSE
%defattr(-,root,root)
@@ -260,7 +286,6 @@
%dir %{_sysconfdir}/xdg/xfce4/xfconf
%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
-%config %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
%files -n xfce4-settings-branding-openSUSE
%defattr(-,root,root)
@@ -269,7 +294,9 @@
%dir %{_sysconfdir}/xdg/xfce4/xfconf
%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
-# do not package it for 12.1+
+%dir %{_sysconfdir}/xdg/menus
+%{_sysconfdir}/xdg/menus/xfce-settings-manager.menu
+# provided by xfce4-splash-branding-openSUSE for >= 12.1
%if 0%{?suse_version} < 1210
%doc COPYING.xfce4-splash-openSUSE
%{_datadir}/pixmaps/xfce4-splash-openSUSE.png
@@ -278,21 +305,13 @@
%files -n xfdesktop-branding-openSUSE
%defattr(-,root,root)
%doc COPYING
-%dir %{_sysconfdir}/xdg/xfce4
-%dir %{_sysconfdir}/xdg/xfce4/xfconf
-%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
-%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+%{_datadir}/wallpapers/xfce/default.wallpaper
%files -n libgarcon-branding-openSUSE
%defattr(-,root,root)
%doc COPYING
%dir %{_sysconfdir}/xdg/menus
-%config %{_sysconfdir}/xdg/menus/xfce-applications.menu
-%if 0%{?suse_version} >= 1210
-%dir %{_datadir}/desktop-directories/
-%{_datadir}/desktop-directories/xfce-preferences.directory
-%{_datadir}/desktop-directories/xfce-administration.directory
-%endif
+%{_sysconfdir}/xdg/menus/xfce-applications.menu
%files -n libxfce4ui-branding-openSUSE
%defattr(-,root,root)
@@ -324,7 +343,6 @@
%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
-%if 0%{?suse_version} >= 1210
%files -n thunar-volman-branding-openSUSE
%defattr(-,root,root)
%doc COPYING
@@ -332,13 +350,14 @@
%dir %{_sysconfdir}/xdg/xfce4/xfconf
%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml
-%endif
+%if 0%{?suse_version} > 1140
%files -n midori-branding-openSUSE
%defattr(-,root,root)
%doc COPYING
%dir %{_sysconfdir}/xdg/midori
%config(noreplace) %{_sysconfdir}/xdg/midori/search
%config(noreplace) %{_sysconfdir}/xdg/midori/config
+%endif
%changelog
++++++ xfce4-branding-openSUSE-4.8.0-11.4.tar.bz2 -> xfce4-branding-openSUSE-4.10.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.8.0/COPYING new/xfce4-branding-openSUSE-4.10.0/COPYING
--- old/xfce4-branding-openSUSE-4.8.0/COPYING 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/COPYING 2010-03-24 00:34:05.000000000 +0100
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.8.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.8.0/etc/xdg/menus/xfce-applications.menu 2011-10-04 16:48:42.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu 2012-04-14 17:58:30.000000000 +0200
@@ -2,206 +2,163 @@
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
<Menu>
- <Name>Xfce</Name>
-
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
-
- <DefaultMergeDirs/>
-
- <Include>
- <Filename>xfrun4.desktop</Filename>
- <Filename>xfhelp4.desktop</Filename>
- <Filename>xfce4-about.desktop</Filename>
- <Filename>xfce4-session-logout.desktop</Filename>
- </Include>
-
- <Layout>
- <Merge type="all"/>
- <Separator/>
- <Menuname>Settings</Menuname>
- <Separator/>
- <Filename>xfrun4.desktop</Filename>
- <Filename>xfhelp4.desktop</Filename>
- <Filename>xfce4-about.desktop</Filename>
- <Filename>xfce4-session-logout.desktop</Filename>
- </Layout>
-
- <Menu>
- <Name>Settings</Name>
- <Directory>xfce-settings.directory</Directory>
-
- <Menu>
- <Name>Preferences</Name>
- <Directory>Settings.directory</Directory>
- <Include>
- <Category>Settings</Category>
- </Include>
- <Exclude>
- <Category>System</Category>
- <Category>X-XfceSettingsDialog</Category>
- <Category>X-XFCE</Category>
- </Exclude>
- <Include>
- <Filename>xfce-settings-manager.desktop</Filename>
- </Include>
-
- <Layout>
- <Filename>xfce-settings-manager.desktop</Filename>
- <Separator/>
- <Merge type="all"/>
- </Layout>
- </Menu>
-
- <Menu>
- <Name>Administration</Name>
- <Directory>Settings-System.directory</Directory>
- <Include>
- <And>
- <Category>Settings</Category>
- <Category>System</Category>
- </And>
- <Category>PackageManager</Category>
- </Include>
- <Exclude>
- <Category>X-SuSE-YaST</Category>
- </Exclude>
-
- <Layout>
- <Merge type="all"/>
- </Layout>
- </Menu>
-
- <Layout>
- <Menuname>Preferences</Menuname>
- <Menuname>Administration</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- </Menu>
-
- <Menu>
- <Name>Accessories</Name>
- <Directory>xfce-accessories.directory</Directory>
- <Include>
- <Or>
- <Category>Accessibility</Category>
- <Category>Core</Category>
- <Category>Legacy</Category>
- <Category>Utility</Category>
- </Or>
- </Include>
- <Exclude>
- <Category>Settings</Category>
+ <Name>Xfce</Name>
+
+ <DefaultAppDirs/>
+ <DefaultDirectoryDirs/>
+ <DefaultMergeDirs/>
+
+ <Menu>
+ <Name>Settings</Name>
+ <Directory>xfce-settings.directory</Directory>
+ <MergeFile type="path">xfce-settings-manager.menu</MergeFile>
+ </Menu>
+
+ <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>
- <Category>X-Xfce-Toplevel</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>
- <Category>Audio</Category>
- <Category>Video</Category>
- <Category>AudioVideo</Category>
- <Category>DiscBurning</Category>
- </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>
- <And>
- <Or>
- <Category>Emulator</Category>
- <Category>System</Category>
- </Or>
- <Not>
- <Category>Settings</Category>
- </Not>
- </And>
- </Include>
- <Exclude>
- <Category>X-Xfce-Toplevel</Category>
- </Exclude>
- </Menu>
-
- <Menu>
- <Name>Other</Name>
- <Directory>xfce-other.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <All/>
- </Include>
- <Exclude>
- <Category>Settings</Category>
- <Category>X-Xfce-Toplevel</Category>
- </Exclude>
- </Menu>
-
+ </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>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.8.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.8.0/etc/xdg/menus/xfce-settings-manager.menu 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu 2012-04-20 22:21:02.000000000 +0200
@@ -0,0 +1,113 @@
+<!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>
+
+ <Include>
+ <Filename>xfce-settings-manager.desktop</Filename>
+ <Filename>YaST.desktop</Filename>
+ </Include>
+
+ <Layout>
+ <Merge type="files"/>
+ <Separator/>
+ <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.8.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.8.0/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/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml 2011-10-13 21:26:06.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.8.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
--- old/xfce4-branding-openSUSE-4.8.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml 2011-01-05 12:04:07.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-desktop" version="1.0">
- <property name="backdrop" type="empty">
- <property name="screen0" type="empty">
- <property name="monitor0" type="empty">
- <property name="image-path" type="string" value="/usr/share/wallpapers/default-1600x1200.jpg"/>
- </property>
- </property>
- </property>
-</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.8.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.8.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2011-01-30 10:47:54.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2012-04-20 22:13:20.000000000 +0200
@@ -3,13 +3,21 @@
<channel name="xfce4-keyboard-shortcuts" version="1.0">
<property name="commands" type="empty">
<property name="default" type="empty">
- <property name="<Alt>F2" type="string" value="xfrun4"/>
+ <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">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.8.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.8.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 2012-01-22 23:21:29.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 2012-04-14 00:34:24.000000000 +0200
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<channel name="xfce4-panel" version="1.0">
- <property name="panels" type="uint" value="1">
- <property name="panel-0" type="empty">
- <property name="size" type="uint" value="28"/>
+ <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="position-locked" type="bool" value="true"/>
+ <property name="size" type="uint" value="24"/>
<property name="length" type="uint" value="100"/>
- <property name="locked" type="bool" value="true"/>
- <property name="autohide" type="bool" value="false"/>
<property name="plugin-ids" type="array">
<value type="int" value="1"/>
<value type="int" value="2"/>
@@ -22,19 +23,15 @@
<value type="int" value="12"/>
<value type="int" value="13"/>
<value type="int" value="14"/>
+ <value type="int" value="15"/>
</property>
- <property name="horizontal" type="bool" value="true"/>
- <property name="position" type="string" value="p=10;x=0;y=0"/>
- <property name="leave-opacity" type="uint" value="100"/>
- <property name="enter-opacity" type="uint" value="100"/>
</property>
</property>
<property name="plugins" type="empty">
<property name="plugin-1" type="string" value="applicationsmenu">
- <property name="show-button-title" type="bool" value="true"/>
- <property name="button-icon" type="string" value="/usr/share/pixmaps/xfce4-suse.png"/>
<property name="button-title" type="string" value="openSUSE"/>
- <property name="custom-menu" type="bool" value="false"/>
+ <property name="button-icon" type="string" value="xfce4-opensuse-dark"/>
+ <property name="show-tooltips" type="bool" value="true"/>
</property>
<property name="plugin-2" type="string" value="separator"/>
<property name="plugin-3" type="string" value="launcher">
@@ -62,24 +59,35 @@
</property>
</property>
<property name="plugin-7" type="string" value="tasklist"/>
- <property name="plugin-8" type="string" value="systray">
+ <property name="plugin-8" type="string" value="separator">
+ <property name="expand" type="bool" value="true"/>
+ <property name="style" type="uint" value="0"/>
+ </property>
+ <property name="plugin-9" type="string" value="systray">
<property name="show-frame" type="bool" value="false"/>
</property>
- <property name="plugin-9" type="string" value="pager"/>
- <property name="plugin-10" type="string" value="showdesktop"/>
- <property name="plugin-11" type="string" value="separator"/>
- <property name="plugin-12" type="string" value="clock">
- <property name="mode" type="uint" value="2"/>
- <property name="digital-format" type="string" value="%R"/>
- <property name="tooltip-format" type="string" value="%A %d %B %Y"/>
+ <property name="plugin-10" type="string" value="pager"/>
+ <property name="plugin-11" type="string" value="showdesktop"/>
+ <property name="plugin-12" type="string" value="separator"/>
+ <property name="plugin-13" type="string" value="clock">
<property name="show-frame" type="bool" value="false"/>
- <property name="show-seconds" type="bool" value="false"/>
- <property name="show-military" type="bool" value="true"/>
- <property name="show-meridiem" type="bool" value="false"/>
- <property name="flash-separators" type="bool" value="false"/>
- <property name="true-binary" type="bool" value="false"/>
</property>
- <property name="plugin-13" type="string" value="separator"/>
- <property name="plugin-14" type="string" value="actions"/>
+ <property name="plugin-14" type="string" value="separator"/>
+ <property name="plugin-15" 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="-separator"/>
+ <value type="string" value="-suspend"/>
+ <value type="string" value="-hibernate"/>
+ <value type="string" value="-separator"/>
+ <value type="string" value="-shutdown"/>
+ <value type="string" value="-restart"/>
+ <value type="string" value="-separator"/>
+ <value type="string" value="+logout"/>
+ <value type="string" value="-logout-dialog"/>
+ </property>
+ <property name="appearance" type="uint" value="0"/>
+ </property>
</property>
</channel>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.8.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.8.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 2011-02-17 10:33:34.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 2012-04-13 17:40:54.000000000 +0200
@@ -13,27 +13,22 @@
</property>
<property name="Client0_PerScreen" type="bool" value="false"/>
<property name="Client1_Command" type="array">
- <value type="string" value="xfce4-panel"/>
+ <value type="string" value="xfsettingsd"/>
</property>
<property name="Client1_PerScreen" type="bool" value="false"/>
<property name="Client2_Command" type="array">
- <value type="string" value="Thunar"/>
- <value type="string" value="--daemon"/>
+ <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="xfdesktop"/>
+ <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="xfce4-settings-helper"/>
+ <value type="string" value="xfdesktop"/>
</property>
<property name="Client4_PerScreen" type="bool" value="false"/>
- <property name="Client5_Command" type="array">
- <value type="string" value="xscreensaver"/>
- <value type="string" value="-nosplash"/>
- </property>
- <property name="Client5_PerScreen" type="bool" value="false"/>
</property>
</property>
<property name="splash" type="empty">
@@ -47,4 +42,7 @@
</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.8.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.8.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 2011-02-02 21:20:39.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 2012-04-20 22:27:52.000000000 +0200
@@ -2,7 +2,15 @@
<channel name="xfwm4" version="1.0">
<property name="general" type="empty">
- <property name="theme" type="string" value="Sonar"/>
- <property name="title_font" type="string" value="FifthLeg Bold 12"/>
+ <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="4"/>
+ <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.8.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.8.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 2011-02-02 21:33:30.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 2012-04-13 23:29:04.000000000 +0200
@@ -2,8 +2,8 @@
<channel name="xsettings" version="1.0">
<property name="Net" type="empty">
- <property name="ThemeName" type="string" value="Sonar"/>
- <property name="IconThemeName" type="string" value="Sonar"/>
+ <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"/>
@@ -13,6 +13,6 @@
<property name="RGBA" type="string" value="none"/>
</property>
<property name="Gtk" type="empty">
- <property name="CursorThemeName" type="string" value="DMZ"/>
+ <property name="CursorThemeName" type="string" value="Adwaita"/>
</property>
</channel>
Files old/xfce4-branding-openSUSE-4.8.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.8.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.8.0/usr/share/pixmaps/xfce4-splash-openSUSE.png and new/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-splash-openSUSE.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.8.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.8.0/usr/share/wallpapers/xfce/default.wallpaper 1970-01-01 01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.10.0/usr/share/wallpapers/xfce/default.wallpaper 2012-05-08 11:49:27.000000000 +0200
@@ -0,0 +1 @@
+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