Hello community, here is the log from the commit of package kdebase4-workspace checked in at Tue Jul 1 00:00:27 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-06-25 19:46:28.000000000 +0200 +++ kdebase4-workspace/kdebase4-wallpapers.changes 2008-06-30 23:59:06.227962000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 30 20:49:14 CEST 2008 - dmueller@suse.de + +- branch diff update + +------------------------------------------------------------------- kdebase4-workspace.changes: same change Old: ---- kdebase-workspace-4.0.83.tar.bz2 New: ---- kdebase-workspace-4.0.84.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.hC4237/_old 2008-06-30 23:59:49.000000000 +0200 +++ /var/tmp/diff_new_pack.hC4237/_new 2008-06-30 23:59:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 4.0.83) +# spec file for package kdebase4-wallpapers (Version 4.0.84) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,7 +21,7 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.0.83 +Version: 4.0.84 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,6 +59,8 @@ /usr/share/wallpapers %changelog +* Mon Jun 30 2008 dmueller@suse.de +- branch diff update * Tue Jun 24 2008 dmueller@suse.de - update to 4.0.83 * Tue Jun 24 2008 stbinner@suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.hC4237/_old 2008-06-30 23:59:49.000000000 +0200 +++ /var/tmp/diff_new_pack.hC4237/_new 2008-06-30 23:59:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 4.0.83) +# spec file for package kdebase4-workspace (Version 4.0.84) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -26,7 +26,7 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.0.83 +Version: 4.0.84 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 Source2: titlebar_decor.png @@ -60,7 +60,7 @@ %kde4_runtime_requires Conflicts: yast2-theme-NLD %if %suse_version > 1030 -Requires: %name-branding = 11.0 +Requires: %name-branding = 11.0.42 %endif Recommends: kdebase4-SuSE Recommends: kde4-kwin @@ -156,7 +156,7 @@ %suse_update_desktop_file ksysguard System Monitor %suse_update_desktop_file kmenuedit Core-Configuration %suse_update_desktop_file -r klipper System TrayIcon - %suse_update_desktop_file -r krandrtray Applet X-KDE-settings-desktop + %suse_update_desktop_file -r krandrtray System TrayIcon %if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT %endif @@ -179,8 +179,8 @@ Group: System/GUI/KDE %if %suse_version > 1030 #BRAND: FIXME -Provides: %{name}-branding = 11.0 -Supplements: branding-upstream = 11.0 +Provides: %{name}-branding = 11.0.42 +Supplements: branding-upstream = 11.0.42 %endif %description branding-upstream @@ -205,8 +205,8 @@ Group: System/GUI/KDE %if %suse_version > 1030 #BRAND: FIXME -Provides: %{name}-branding = 11.0 -Supplements: branding-upstream = 11.0 +Provides: %{name}-branding = 11.0.42 +Supplements: branding-upstream = 11.0.42 %endif %description -n kde4-kdm-branding-upstream @@ -261,7 +261,7 @@ Summary: KDE Window Manager %kde4_runtime_requires %if %suse_version >1030 -Requires: %{name}-branding = 11.0 +Requires: %{name}-branding = 11.0.42 %endif %description -n kde4-kwin @@ -701,8 +701,21 @@ %_kde_share_dir/servicetypes/plasma-packagestructure.desktop %exclude /usr/share/wallpapers/default_blue.jpg %exclude /usr/share/wallpapers/default_blue.jpg.desktop +# todo - move to own package? +/usr/share/icons/Oxygen_Black +/usr/share/icons/Oxygen_Black_Big +/usr/share/icons/Oxygen_Blue +/usr/share/icons/Oxygen_Blue_Big +/usr/share/icons/Oxygen_White +/usr/share/icons/Oxygen_White_Big +/usr/share/icons/Oxygen_Yellow +/usr/share/icons/Oxygen_Yellow_Big +/usr/share/icons/Oxygen_Zion +/usr/share/icons/Oxygen_Zion_Big %changelog +* Mon Jun 30 2008 dmueller@suse.de +- branch diff update * Tue Jun 24 2008 dmueller@suse.de - update to 4.0.83 * Tue Jun 24 2008 stbinner@suse.de ++++++ 4_1_BRANCH.diff ++++++ ++++ 35162 lines (skipped) ++++ between KDE/kdebase4-workspace/4_1_BRANCH.diff ++++ and kdebase4-workspace/4_1_BRANCH.diff ++++++ kdebase-workspace-4.0.83.tar.bz2 -> kdebase-workspace-4.0.84.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.0.83.tar.bz2 kdebase4-workspace/kdebase-workspace-4.0.84.tar.bz2 differ: byte 11, line 1 ++++++ kdm-sysconfig-values.diff ++++++ --- /var/tmp/diff_new_pack.hC4237/_old 2008-06-30 23:59:50.000000000 +0200 +++ /var/tmp/diff_new_pack.hC4237/_new 2008-06-30 23:59:50.000000000 +0200 @@ -746,7 +746,7 @@ -Default: "" +Default: KDMDATA "/themes/SUSE" User: greeter --Instance: */KDMDATA "/themes/circles" +-Instance: */KDMDATA "/themes/oxygen" +Instance: */"" +Update: reset_sec_0_1 Comment: & ++++++ plasma.diff ++++++ --- /var/tmp/diff_new_pack.hC4237/_old 2008-06-30 23:59:50.000000000 +0200 +++ /var/tmp/diff_new_pack.hC4237/_new 2008-06-30 23:59:50.000000000 +0200 @@ -1,46 +1,5 @@ -Index: plasma/containments/desktop/backgrounddialog.cpp -=================================================================== ---- plasma/containments/desktop/backgrounddialog.cpp (revision 823825) -+++ plasma/containments/desktop/backgrounddialog.cpp (working copy) -@@ -635,12 +635,17 @@ - } - m_selected = config.readEntry("selected", QStringList()); - m_model->reload(m_selected); -- QString currentPath = config.readEntry("wallpaper", -- KStandardDirs::locate("wallpaper", "EOS/contents/images/1920x1200.jpg")); - -+ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasmarc"); -+ KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); -+ QString defaultPath = group.readEntry("wallpaper", "EOS/contents/images/1920x1200.jpg"); -+ -+ QString currentPath = config.readEntry("wallpaper", defaultPath); -+ - kDebug() << "Default would be" << KStandardDirs::locate("wallpaper", "EOS/contents/images/1920x1200.jpg"); - kDebug() << "but we're loading" << currentPath << "instead"; - -+ m_model->addBackground(currentPath); - int index = m_model->indexOf(currentPath); - if (index != -1) { - m_view->setCurrentIndex(index); -Index: plasma/containments/desktop/desktop.cpp -=================================================================== ---- plasma/containments/desktop/desktop.cpp (revision 823825) -+++ plasma/containments/desktop/desktop.cpp (working copy) -@@ -243,7 +247,9 @@ - void DefaultDesktop::updateBackground() - { - if (m_wallpaperPath.isEmpty() && m_backgroundMode != BackgroundDialog::kNoBackground) { -- QString defaultPath = QString("EOS/contents/images/%1x%2.jpg"); -+ KSharedConfigPtr config = KSharedConfig::openConfig("plasmarc"); -+ KConfigGroup group = KConfigGroup(config, "Defaults"); -+ QString defaultPath = group.readEntry("wallpaper", "EOS/contents/images/%1x%2.jpg"); - - QString testPath = defaultPath.arg(geometry().width()).arg(geometry().height()); - m_wallpaperPath = KStandardDirs::locate("wallpaper", testPath); -Index: plasma/applets/kickoff/simpleapplet/simpleapplet.cpp -=================================================================== ---- plasma/applets/kickoff/simpleapplet/simpleapplet.cpp (revision 823825) -+++ plasma/applets/kickoff/simpleapplet/simpleapplet.cpp (working copy) +--- plasma/applets/kickoff/simpleapplet/simpleapplet.cpp ++++ plasma/applets/kickoff/simpleapplet/simpleapplet.cpp @@ -30,6 +30,7 @@ #include <QMetaEnum> #include <QPointer> @@ -61,10 +20,8 @@ case Favorites: return "bookmarks"; case Applications: -Index: plasma/applets/kickoff/applet/applet.cpp -=================================================================== ---- plasma/applets/kickoff/applet/applet.cpp (revision 823825) -+++ plasma/applets/kickoff/applet/applet.cpp (working copy) +--- plasma/applets/kickoff/applet/applet.cpp ++++ plasma/applets/kickoff/applet/applet.cpp @@ -29,6 +29,7 @@ #include <QVBoxLayout> #include <QLabel> @@ -85,10 +42,8 @@ d->icon->setFlag(ItemIsMovable, false); connect(d->icon, SIGNAL(pressed(bool)), this, SLOT(toggleMenu(bool))); connect(this, SIGNAL(activate()), this, SLOT(toggleMenu())); -Index: plasma/applets/kickoff/core/systemmodel.cpp -=================================================================== ---- plasma/applets/kickoff/core/systemmodel.cpp (revision 823825) -+++ plasma/applets/kickoff/core/systemmodel.cpp (working copy) +--- plasma/applets/kickoff/core/systemmodel.cpp ++++ plasma/applets/kickoff/core/systemmodel.cpp @@ -87,7 +87,7 @@ connect(placesModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), q, SLOT(sourceRowsRemoved(QModelIndex,int,int))); @@ -98,10 +53,8 @@ << i18n("Places") << i18n("Removable Storage") << i18n("Storage"); -Index: plasma/applets/kickoff/core/models.cpp -=================================================================== ---- plasma/applets/kickoff/core/models.cpp (revision 823825) -+++ plasma/applets/kickoff/core/models.cpp (working copy) +--- plasma/applets/kickoff/core/models.cpp ++++ plasma/applets/kickoff/core/models.cpp @@ -155,7 +155,19 @@ { KConfigGroup appsGroup = componentData().config()->group("SystemApplications"); @@ -123,10 +76,8 @@ apps = appsGroup.readEntry("DesktopFiles", apps); return apps; } -Index: plasma/applets/kickoff/core/favoritesmodel.cpp -=================================================================== ---- plasma/applets/kickoff/core/favoritesmodel.cpp (revision 823825) -+++ plasma/applets/kickoff/core/favoritesmodel.cpp (working copy) +--- plasma/applets/kickoff/core/favoritesmodel.cpp ++++ plasma/applets/kickoff/core/favoritesmodel.cpp @@ -85,12 +85,14 @@ static QList<QString> defaultFavorites() { @@ -144,10 +95,8 @@ if (service) { desktopFiles << service->entryPath(); } -Index: plasma/applets/kickoff/ui/launcher.cpp -=================================================================== ---- plasma/applets/kickoff/ui/launcher.cpp (revision 823825) -+++ plasma/applets/kickoff/ui/launcher.cpp (working copy) +--- plasma/applets/kickoff/ui/launcher.cpp ++++ plasma/applets/kickoff/ui/launcher.cpp @@ -866,7 +866,7 @@ void Launcher::openHomepage() { @@ -157,11 +106,26 @@ } void Launcher::resultsAvailable() -Index: plasma/plasma/desktopcorona.cpp -=================================================================== ---- plasma/plasma/desktopcorona.cpp (revision 823825) -+++ plasma/plasma/desktopcorona.cpp (working copy) -@@ -132,11 +134,30 @@ +--- plasma/plasma/desktopcorona.cpp ++++ plasma/plasma/desktopcorona.cpp +@@ -23,6 +23,7 @@ + #include <QDesktopWidget> + #include <QDir> + #include <QGraphicsLayout> ++#include <QFile> + + #include <KDebug> + #include <KDialog> +@@ -117,6 +118,8 @@ + folderView->init(); + folderView->flushPendingConstraintsEvents(); + } ++ ++// c->addApplet("trash"); + } + } + +@@ -132,11 +135,30 @@ // some default applets to get a usable UI Plasma::Applet *launcher = panel->addApplet("launcher"); launcher->setGlobalShortcut(KShortcut("Alt+F1")); @@ -193,15 +157,3 @@ } void DesktopCorona::screenResized(int screen) -Index: plasma/plasma/desktopcorona.cpp -=================================================================== ---- plasma/plasma/desktopcorona.cpp (revision 823825) -+++ plasma/plasma/desktopcorona.cpp (working copy) -@@ -23,6 +23,7 @@ - #include <QDesktopWidget> - #include <QDir> - #include <QGraphicsLayout> -+#include <QFile> - - #include <KDebug> - #include <KDialog> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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