Hello community, here is the log from the commit of package xfce4-branding-openSUSE checked in at Mon Oct 6 18:29:17 CEST 2008. -------- --- xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes 2008-08-01 15:57:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes 2008-10-06 16:48:44.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Oct 6 16:48:35 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.WQ7075/_old 2008-10-06 18:28:53.000000000 +0200 +++ /var/tmp/diff_new_pack.WQ7075/_new 2008-10-06 18:28:53.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package xfce4-branding-openSUSE (Version 4.4.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -14,7 +21,7 @@ Name: xfce4-branding-openSUSE Summary: Xfce desktop environment openSUSE branding Version: 4.4.2 -Release: 5 +Release: 6 License: GPL v2 or later Url: http://www.xfce.org/ Source: xfce4-desktop.tar.bz2 @@ -33,6 +40,7 @@ Group: System/GUI/XFCE Requires: desktop-data-SuSE Provides: xfce4-desktop-branding = %{version} +Conflicts: otherproviders(xfce4-desktop-branding) Supplements: packageand(xfce4-desktop:branding-openSUSE) Requires: gtk2-theme-openSUSE @@ -61,6 +69,8 @@ %{_sysconfdir}/xdg/xfce4 %changelog +* Mon Oct 06 2008 sbrabec@suse.cz +- Conflict with other branding providers (FATE#304881). * Mon Jul 28 2008 prusnak@suse.cz - added custom menus - /etc/xdg/xfce4/desktop/menu.xml.* (added contain YaST icon to Settings) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org