Hello community, here is the log from the commit of package kdebase4-runtime checked in at Wed Aug 13 15:08:24 CEST 2008. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2008-07-28 23:24:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2008-08-13 11:49:32.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 13 11:46:57 CEST 2008 - coolo@suse.de + +- exclude digikam icons to avoid file conflicts + +------------------------------------------------------------------- +Thu Jul 31 22:38:12 CEST 2008 - dmueller@suse.de + +- branch diff update + +------------------------------------------------------------------- oxygen-icon-theme.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.kN4446/_old 2008-08-13 15:07:45.000000000 +0200 +++ /var/tmp/diff_new_pack.kN4446/_new 2008-08-13 15:07:45.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package kdebase4-runtime (Version 4.1.0) # # 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/ # @@ -23,7 +30,7 @@ Summary: The KDE Runtime Components Url: http://www.kde.org/ Version: 4.1.0 -Release: 1 +Release: 12 Source0: kdebase-runtime-%version.tar.bz2 Source1: kde4-essential.menu Source2: kde-settings.menu @@ -37,10 +44,9 @@ Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) Requires: kdelibs4 >= %version Requires: phonon -# don't make it a requirement -#Requires: xine-lib >= 1.1.9 Provides: suse_help_viewer Recommends: ispell, enscript +%define debug_package_requires %name = %version kdelibs3-debuginfo %description This package contains all run-time dependencies of KDE applications. @@ -359,6 +365,10 @@ %_kde4_modules/kcm_phononxine.so %changelog +* Wed Aug 13 2008 coolo@suse.de +- exclude digikam icons to avoid file conflicts +* Fri Aug 01 2008 dmueller@suse.de +- branch diff update * Fri Jul 25 2008 dmueller@suse.de - update to 4.1.0 - fix phonon-backend version ++++++ oxygen-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.kN4446/_old 2008-08-13 15:07:45.000000000 +0200 +++ /var/tmp/diff_new_pack.kN4446/_new 2008-08-13 15:07:45.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package oxygen-icon-theme (Version 4.1.0) # # 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/ # @@ -20,7 +27,7 @@ Summary: Oxygen Icon Theme Url: http://www.kde.org Version: 4.1.0 -Release: 1 +Release: 12 Requires: hicolor-icon-theme Recommends: oxygen-icon-theme-scalable Source0: kdebase-runtime-%version.tar.bz2 @@ -103,10 +110,12 @@ %files scalable %defattr(-,root,root) /usr/share/icons/oxygen/scalable +%exclude /usr/share/icons/oxygen/scalable/apps/digikam.* %files %defattr(-,root,root) %exclude /usr/share/icons/oxygen/scalable/*/* +%exclude /usr/share/icons/oxygen/*/apps/digikam.png %dir /usr/share/icons/oxygen/scalable/actions %dir /usr/share/icons/oxygen/scalable/apps %dir /usr/share/icons/oxygen/scalable/devices @@ -117,6 +126,10 @@ /usr/share/icons/oxygen %changelog +* Wed Aug 13 2008 coolo@suse.de +- exclude digikam icons to avoid file conflicts +* Fri Aug 01 2008 dmueller@suse.de +- branch diff update * Fri Jul 25 2008 dmueller@suse.de - update to 4.1.0 - fix phonon-backend version ++++++ 4_1_BRANCH.diff ++++++ ++++ 1214 lines (skipped) ++++ between KDE/kdebase4-runtime/4_1_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-runtime/4_1_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de