Hello community, here is the log from the commit of package kdebase4-workspace checked in at Tue Jun 3 16:22:05 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-05-28 16:07:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-06-03 16:15:41.217861000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 2 12:15:38 CEST 2008 - dmueller@suse.de + +- don't deinstall KDE3 due to kdebase3-ksysguard conflict +- fix panel sizing issue + +------------------------------------------------------------------- kdebase4-workspace.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.cNA797/_old 2008-06-03 16:15:52.000000000 +0200 +++ /var/tmp/diff_new_pack.cNA797/_new 2008-06-03 16:15:52.000000000 +0200 @@ -22,7 +22,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.0.4 -Release: 19 +Release: 23 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -59,6 +59,9 @@ /usr/share/wallpapers %changelog +* Mon Jun 02 2008 dmueller@suse.de +- don't deinstall KDE3 due to kdebase3-ksysguard conflict +- fix panel sizing issue * Wed May 28 2008 dmueller@suse.de - call kde4-migrate if present (bnc#372170) * Tue May 27 2008 stbinner@suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.cNA797/_old 2008-06-03 16:15:52.000000000 +0200 +++ /var/tmp/diff_new_pack.cNA797/_new 2008-06-03 16:15:52.000000000 +0200 @@ -27,7 +27,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.0.4 -Release: 17 +Release: 20 %define rversion 4.0.4 Source0: kdebase-workspace-%rversion.tar.bz2 Source2: titlebar_decor.png @@ -79,7 +79,7 @@ Recommends: kdebase4-SuSE Recommends: kde4-kwin Recommends: extragear-plasma -%if %suse_version < 1031 +%if %suse_version < 1100 Recommends: kdebase4-workspace-ksysguardd %else Requires: kdebase4-workspace-ksysguardd @@ -247,12 +247,8 @@ License: GPL v2 or later Group: System/GUI/KDE Summary: KDE base package: ksysguard daemon -%if %suse_version < 1031 -Conflicts: kdebase3-ksysguardd -%else -Obsoletes: kdebase3-ksysguardd <= 3.5.8 -Provides: kdebase3-ksysguardd = 3.5.8 -%endif +Provides: kdebase3-ksysguardd = 3.5.90 +Obsoletes: kdebase3-ksysguardd <= 3.5.90 %description ksysguardd This package contains the ksysguard daemon. It is needed for ksysguard. @@ -699,6 +695,9 @@ /usr/%_lib/kde4/kgreet_*.so %changelog +* Mon Jun 02 2008 dmueller@suse.de +- don't deinstall KDE3 due to kdebase3-ksysguard conflict +- fix panel sizing issue * Wed May 28 2008 dmueller@suse.de - call kde4-migrate if present (bnc#372170) * Tue May 27 2008 stbinner@suse.de ++++++ krunner.diff ++++++ --- /var/tmp/diff_new_pack.cNA797/_old 2008-06-03 16:15:53.000000000 +0200 +++ /var/tmp/diff_new_pack.cNA797/_new 2008-06-03 16:15:53.000000000 +0200 @@ -1,7 +1,7 @@ Patch-rediff: rediff-plasma.sh ---- krunnerdialog.cpp -+++ krunnerdialog.cpp +--- krunnerdialog.cpp (Revision 816180) ++++ krunnerdialog.cpp (Revision 816180) @@ -23,36 +23,45 @@ #include <QResizeEvent> #include <QMouseEvent> @@ -26,15 +26,15 @@ { setButtons(0); - m_background = new Plasma::Svg("dialogs/background", this); -+ m_background = new Plasma::SvgPanel("dialogs/background", this); -+ m_background->setBorderFlags(Plasma::SvgPanel::DrawAllBorders); - +- - const int topHeight = m_background->elementSize("top").height(); - const int leftWidth = m_background->elementSize("left").width(); - const int rightWidth = m_background->elementSize("right").width(); - const int bottomHeight = m_background->elementSize("bottom").height(); - setContentsMargins(leftWidth, topHeight, rightWidth, bottomHeight); -- ++ m_background = new Plasma::SvgPanel("dialogs/background", this); ++ m_background->setBorderFlags(Plasma::SvgPanel::DrawAllBorders); + connect(m_background, SIGNAL(repaintNeeded()), this, SLOT(update())); + + connect(Plasma::Theme::self(), SIGNAL(changed()), this, SLOT(themeUpdated())); @@ -58,7 +58,7 @@ void KRunnerDialog::paintEvent(QPaintEvent *e) { QPainter p(this); -@@ -66,13 +75,14 @@ +@@ -66,13 +75,14 @@ void KRunnerDialog::paintEvent(QPaintEve p.fillRect(rect(), Qt::transparent); } @@ -76,7 +76,7 @@ } void KRunnerDialog::mousePressEvent(QMouseEvent *e) -@@ -89,99 +99,4 @@ +@@ -89,99 +99,4 @@ void KRunnerDialog::mousePressEvent(QMou e->accept(); } @@ -176,9 +176,9 @@ -} - #include "krunnerdialog.moc" ---- interface.cpp -+++ interface.cpp -@@ -350,6 +350,7 @@ +--- interface.cpp (Revision 816180) ++++ interface.cpp (Revision 816180) +@@ -350,6 +350,7 @@ Interface::Interface(QWidget* parent) m_optionsButton = new KPushButton(KStandardGuiItem::configure(), this); m_optionsButton->setText( i18n( "Show Options" ) ); m_optionsButton->setEnabled( false ); @@ -186,7 +186,7 @@ m_optionsButton->setCheckable( true ); connect( m_optionsButton, SIGNAL(toggled(bool)), SLOT(showOptions(bool)) ); bottomLayout->addWidget( m_optionsButton ); -@@ -427,6 +428,7 @@ +@@ -427,6 +428,7 @@ void Interface::display(const QString& t if (!isVisible()) { queueMatch(); @@ -194,8 +194,8 @@ } KWindowSystem::setOnDesktop(winId(), KWindowSystem::currentDesktop()); ---- krunnerdialog.h -+++ krunnerdialog.h +--- krunnerdialog.h (Revision 816180) ++++ krunnerdialog.h (Revision 816180) @@ -24,7 +24,7 @@ namespace Plasma @@ -205,7 +205,7 @@ } class KRunnerDialog : public KDialog -@@ -41,9 +41,15 @@ +@@ -41,9 +41,15 @@ class KRunnerDialog : public KDialog void resizeEvent( QResizeEvent *e ); void mousePressEvent( QMouseEvent *e ); @@ -222,9 +222,9 @@ QPixmap *m_cachedBackground; }; ---- runners/services/servicerunner.cpp -+++ runners/services/servicerunner.cpp -@@ -86,6 +86,9 @@ +--- runners/services/servicerunner.cpp (Revision 816180) ++++ runners/services/servicerunner.cpp (Revision 816180) +@@ -86,6 +86,9 @@ void ServiceRunner::exec(Plasma::SearchM void ServiceRunner::setupAction(const KService::Ptr &service, Plasma::SearchMatch *action) { ++++++ libs.diff ++++++ ++++ 1533 lines (skipped) ++++ between KDE/kdebase4-workspace/libs.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/libs.diff ++++++ plasma.diff ++++++ ++++ 6007 lines (skipped) ++++ between KDE/kdebase4-workspace/plasma.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/plasma.diff ++++++ rediff-plasma.sh ++++++ --- KDE/kdebase4-workspace/rediff-plasma.sh 2008-04-02 08:34:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/rediff-plasma.sh 2008-06-03 15:20:11.000000000 +0200 @@ -1,10 +1,10 @@ export BASE=svn://anonsvn.kde.org/home/kde echo "Patch-rediff: rediff-plasma.sh" >krunner.diff echo "" >>krunner.diff -svn diff $BASE/branches/KDE/4.0/kdebase/workspace/krunner $BASE/branches/work/plasma-4.0-openSUSE/krunner >>krunner.diff +svn diff $BASE/branches/KDE/4.0/kdebase/workspace/krunner $BASE/branches/work/plasma-4.0-openSUSE/krunner | ~dmueller/bin/clean_patch >>krunner.diff echo "Patch-rediff: rediff-plasma.sh" >libs.diff echo "" >>libs.diff -svn diff $BASE/branches/KDE/4.0/kdebase/workspace/libs $BASE/branches/work/plasma-4.0-openSUSE/libs >>libs.diff +svn diff $BASE/branches/KDE/4.0/kdebase/workspace/libs $BASE/branches/work/plasma-4.0-openSUSE/libs| ~dmueller/bin/clean_patch >>libs.diff echo "Patch-rediff: rediff-plasma.sh" >plasma.diff echo "" >>plasma.diff -svn diff $BASE/branches/KDE/4.0/kdebase/workspace/plasma $BASE/branches/work/plasma-4.0-openSUSE/plasma >>plasma.diff +svn diff $BASE/branches/KDE/4.0/kdebase/workspace/plasma $BASE/branches/work/plasma-4.0-openSUSE/plasma | ~dmueller/bin/clean_patch >>plasma.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org