Author: locilka Date: Thu Oct 30 13:52:18 2008 New Revision: 52732 URL: http://svn.opensuse.org/viewcvs/yast?rev=52732&view=rev Log: - Fixed 'Conflicts with yast2-wagon' (bnc #439934). - 2.17.10 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/yast2-online-update.spec.in Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=52732&r1=52731&r2=52732&view=diff ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Thu Oct 30 13:52:18 2008 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-online-update.changes?rev=52732&r1=52731&r2=52732&view=diff ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Thu Oct 30 13:52:18 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 30 13:50:48 CET 2008 - locilka@suse.cz + +- Fixed 'Conflicts with yast2-wagon' (bnc #439934). +- 2.17.10 + +------------------------------------------------------------------- Wed Oct 22 15:26:51 CEST 2008 - locilka@suse.cz - PatchCD control file moved to yast2-wagon. Modified: trunk/online-update/yast2-online-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/yast2-online-update.spec.in?rev=52732&r1=52731&r2=52732&view=diff ============================================================================== --- trunk/online-update/yast2-online-update.spec.in (original) +++ trunk/online-update/yast2-online-update.spec.in Thu Oct 30 13:52:18 2008 @@ -16,9 +16,6 @@ Obsoletes: yast2-trans-online-update y2t_online_update BuildArchitectures: noarch -# PatchCD desktop file moved to yast2-wagon -Conflicts: yast2-wagon >= 2.17.3 - Summary: YaST2 online update %description @@ -48,6 +45,9 @@ Requires: yast2-online-update Group: System/YaST +# PatchCD desktop file moved to yast2-wagon +Conflicts: yast2-wagon <= 2.17.3 + %description frontend - -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org