Hello community, here is the log from the commit of package kdebase4-openSUSE checked in at Wed Apr 23 01:33:28 CEST 2008. -------- --- KDE/kdebase4-openSUSE/kdebase4-openSUSE.changes 2008-04-16 16:41:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-openSUSE/kdebase4-openSUSE.changes 2008-04-22 16:58:15.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 22 16:58:11 CEST 2008 - stbinner@suse.de + +- conflict with kdebase4-workspace-branding-upstream + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.b12242/_old 2008-04-23 01:31:24.000000000 +0200 +++ /var/tmp/diff_new_pack.b12242/_new 2008-04-23 01:31:24.000000000 +0200 @@ -19,7 +19,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 11.0 -Release: 41 +Release: 44 Source0: kdebase4-openSUSE-%{version}.tar.bz2 Requires: kdebase4-workspace Provides: kdebase4-SuSE = 11.0 @@ -75,6 +75,7 @@ Supplements: packageand(kdebase4-workspace:branding-openSUSE) PreReq: %fillup_prereq Provides: kdebase4-workspace-branding = 11.0 +Conflicts: kdebase4-workspace-branding-upstream %description -n kdebase4-workspace-branding-openSUSE This package contains the standard openSUSE desktop and extensions. @@ -214,6 +215,8 @@ /usr/share/kde4/apps/sysinfo/about %changelog +* Tue Apr 22 2008 stbinner@suse.de +- conflict with kdebase4-workspace-branding-upstream * Wed Apr 16 2008 stbinner@suse.de - adapt live-installer detection for 11.0 * Wed Apr 16 2008 stbinner@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org