Hello community, here is the log from the commit of package kdebase3-SuSE checked in at Wed Apr 23 01:30:44 CEST 2008. -------- --- KDE/kdebase3-SuSE/kdebase3-SuSE.changes 2008-04-18 21:39:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase3-SuSE/kdebase3-SuSE.changes 2008-04-22 16:56:35.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 22 16:56:24 CEST 2008 - stbinner@suse.de + +- conflict with kdebase3-SuSE-branding-upstream + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3-SuSE.spec ++++++ --- /var/tmp/diff_new_pack.GW5379/_old 2008-04-23 01:27:55.000000000 +0200 +++ /var/tmp/diff_new_pack.GW5379/_new 2008-04-23 01:27:55.000000000 +0200 @@ -33,7 +33,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 11.0 -Release: 90 +Release: 91 Source0: kdebase-SuSE-%{version}.tar.bz2 Source2: kdebase3-SuSE-displaymanager.fillup Source3: kdebase3-SuSE-windowmanager.fillup @@ -91,6 +91,7 @@ Summary: SUSE KDE Extension Provides: %{name}-branding = 11.0 Supplements: packageand(kdebase3-SuSE:branding-openSUSE) +Conflicts: %{name}-branding-upstream #BRAND: FIXME %description branding-openSUSE @@ -265,6 +266,8 @@ /opt/kde3/share/services/sysinfo.protocol %changelog +* Tue Apr 22 2008 stbinner@suse.de +- conflict with kdebase3-SuSE-branding-upstream * Fri Apr 18 2008 llunak@suse.cz - 11.0 splashscreen (bnc:#375581) * 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