rev 10919 - in branches/kde4/packages/kdebase-workspace/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Mon Jun 9 14:54:27 UTC 2008 

Author: modax-guest
Date: 2008-06-09 14:54:27 +0000 (Mon, 09 Jun 2008)
New Revision: 10919

Removed:
   branches/kde4/packages/kdebase-workspace/debian/patches/06_kdehome_kde4.diff
Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
   branches/kde4/packages/kdebase-workspace/debian/libplasma2.install
   branches/kde4/packages/kdebase-workspace/debian/patches/17_ksysguard_disable_procmon_when_unsupported.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/series
Log:
new snapshot

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-06-09 14:40:52 UTC (rev 10918)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-06-09 14:54:27 UTC (rev 10919)
@@ -1,12 +1,20 @@
-kdebase-workspace (4:4.0.81+svn816127-1) UNRELEASED; urgency=low
+kdebase-workspace (4:4.0.81+svn818741-1~pre1) UNRELEASED; urgency=low
 
-  * New upstream development snapshot.
+  * New upstream development snapshot:
+    - The latest upstream commit is r818741 by mart
+    - Date: Mon, 09 Jun 2008 14:00:13 -0000
+  * Update install files:
+    - kdebase-workspace-data.install: 1 file(s) added; 1 file(s) removed;
+    - libplasma2.install: 1 file(s) removed;
+    - kdebase-workspace-bin.install: 1 file(s) added;
 
   +++ Changes by Modestas Vainius:
 
   * Update install files.
   * Add replaces for kde-window-manager and kdebase-workspace-data
     because some files have been moved here from kdebase-runtime.
+  * Remove 06_kdehome_kde4.diff - no longer needed.
+  * Update 17_ksysguard_disable_procmon_when_unsupported.diff.
 
   +++ Changes by Fathi Boudra:
 
@@ -17,7 +25,7 @@
 
   * Update installed files.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 May 2008 15:48:45 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 09 Jun 2008 17:43:44 +0300
 
 kdebase-workspace (4:4.0.80-2) experimental; urgency=low
 

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-06-09 14:40:52 UTC (rev 10918)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-06-09 14:54:27 UTC (rev 10919)
@@ -69,6 +69,7 @@
 usr/lib/kde4/krunner_shell.so
 usr/lib/kde4/krunner_webshortcuts.so
 usr/lib/kde4/kstyle_keramik_config.so
+usr/lib/kde4/kwin_oxygen_config.so
 usr/lib/kde4/libexec/kcheckpass
 usr/lib/kde4/libexec/kcmdatetimehelper
 usr/lib/kde4/libexec/kfontprint

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-06-09 14:40:52 UTC (rev 10918)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-06-09 14:54:27 UTC (rev 10919)
@@ -1,8 +1,3 @@
-usr/share/kde4/config/background.knsrc
-usr/share/kde4/config/colorschemes.knsrc
-usr/share/kde4/config/ksplash.knsrc
-usr/share/kde4/config/plasma-themes.knsrc
-usr/share/kde4/config/wallpaper.knsrc
 usr/share/applications/kde4/kfontview.desktop
 usr/share/applications/kde4/kmenuedit.desktop
 usr/share/applications/kde4/krandrtray.desktop
@@ -144,10 +139,12 @@
 usr/share/kde4/apps/desktoptheme/default/colors
 usr/share/kde4/apps/desktoptheme/default/dialogs/background.svg
 usr/share/kde4/apps/desktoptheme/default/dialogs/krunner.svg
+usr/share/kde4/apps/desktoptheme/default/dialogs/shutdowndialog.source.svg
 usr/share/kde4/apps/desktoptheme/default/dialogs/shutdowndialog.svg
 usr/share/kde4/apps/desktoptheme/default/metadata.desktop
 usr/share/kde4/apps/desktoptheme/default/opaque/dialogs/background.svg
 usr/share/kde4/apps/desktoptheme/default/opaque/dialogs/krunner.svg
+usr/share/kde4/apps/desktoptheme/default/opaque/dialogs/shutdowndialog.svg
 usr/share/kde4/apps/desktoptheme/default/opaque/widgets/panel-background.svg
 usr/share/kde4/apps/desktoptheme/default/opaque/widgets/tooltip.svg
 usr/share/kde4/apps/desktoptheme/default/widgets/analog_meter.svg
@@ -308,6 +305,11 @@
 usr/share/kde4/apps/solidfakenetbackend/fakenetworking.xml
 usr/share/kde4/config.kcfg/klaunch.kcfg
 usr/share/kde4/config.kcfg/kscreensaversettings.kcfg
+usr/share/kde4/config/background.knsrc
+usr/share/kde4/config/colorschemes.knsrc
+usr/share/kde4/config/ksplash.knsrc
+usr/share/kde4/config/plasma-themes.knsrc
+usr/share/kde4/config/wallpaper.knsrc
 usr/share/kde4/services/ScreenSavers/kblank.desktop
 usr/share/kde4/services/ScreenSavers/krandom.desktop
 usr/share/kde4/services/ServiceMenus/installfont.desktop
@@ -341,7 +343,6 @@
 usr/share/kde4/services/plasma-applet-analogclock.desktop
 usr/share/kde4/services/plasma-applet-devicenotifier.desktop
 usr/share/kde4/services/plasma-applet-digitalclock.desktop
-usr/share/kde4/services/plasma-applet-folderview.desktop
 usr/share/kde4/services/plasma-applet-icon.desktop
 usr/share/kde4/services/plasma-applet-launcher.desktop
 usr/share/kde4/services/plasma-applet-lockout.desktop

Modified: branches/kde4/packages/kdebase-workspace/debian/libplasma2.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/libplasma2.install	2008-06-09 14:40:52 UTC (rev 10918)
+++ branches/kde4/packages/kdebase-workspace/debian/libplasma2.install	2008-06-09 14:54:27 UTC (rev 10919)
@@ -5,7 +5,6 @@
 usr/lib/kde4/plasma_applet_clock.so
 usr/lib/kde4/plasma_applet_devicenotifier.so
 usr/lib/kde4/plasma_applet_dig_clock.so
-usr/lib/kde4/plasma_applet_folderview.so
 usr/lib/kde4/plasma_applet_icon.so
 usr/lib/kde4/plasma_applet_launcher.so
 usr/lib/kde4/plasma_applet_lockout.so

Deleted: branches/kde4/packages/kdebase-workspace/debian/patches/06_kdehome_kde4.diff

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/17_ksysguard_disable_procmon_when_unsupported.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/17_ksysguard_disable_procmon_when_unsupported.diff	2008-06-09 14:40:52 UTC (rev 10918)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/17_ksysguard_disable_procmon_when_unsupported.diff	2008-06-09 14:54:27 UTC (rev 10919)
@@ -75,8 +75,17 @@
 +IncludeFile=KMonitorProcessIO.h
 --- a/libs/ksysguard/processui/ksysguardprocesslist.cpp
 +++ b/libs/ksysguard/processui/ksysguardprocesslist.cpp
-@@ -147,7 +147,11 @@
+@@ -54,7 +54,7 @@
+ #include "ReniceDlg.h"
+ #include "ui_ProcessWidgetUI.h"
  
+-#ifdef HAVE_SYS_PTRACE_H
++#ifdef WITH_MONITOR_PROCESS_IO
+ #include "DisplayProcessDlg.h"
+ #endif
+ 
+@@ -150,7 +150,11 @@
+ 
  		selectTracer = new QAction(i18n("Jump to Process Debugging This One"), q);
  		window = new QAction(i18n("Show Application Window"), q);
 +#ifdef WITH_MONITOR_PROCESS_IO
@@ -87,7 +96,7 @@
  		resume = new QAction(i18n("Resume Stopped Process"), q);
  		kill = new QAction(i18np("Kill Process", "Kill Processes", 1), q);
  		kill->setIcon(KIcon("process-stop"));
-@@ -262,8 +266,10 @@
+@@ -265,8 +269,10 @@
  	// Add all the actions to the main widget, and get all the actions to call actionTriggered when clicked
  	QSignalMapper *signalMapper = new QSignalMapper(this);
  	QList<QAction *> actions;
@@ -100,7 +109,7 @@
  	foreach(QAction *action, actions) {
  		addAction(action);
  		connect(action, SIGNAL(triggered(bool)), signalMapper, SLOT(map()));
-@@ -386,7 +392,7 @@
+@@ -389,7 +395,7 @@
  	if (numProcesses == 1 && !d->mModel.data(realIndex, ProcessModel::WindowIdRole).isNull()) {
  		d->mProcessContextMenu->addAction(d->window);
  	}
@@ -109,22 +118,16 @@
  		d->mProcessContextMenu->addAction(d->monitorio);
  	}
  
-@@ -440,6 +446,7 @@
+@@ -443,8 +449,8 @@
  				KWindowSystem::activateWindow(wid);
  			}
  		}
 +#ifdef WITH_MONITOR_PROCESS_IO
  	} else if(result == d->monitorio) {
+-#ifdef HAVE_SYS_PTRACE_H
  		QModelIndexList selectedIndexes = d->mUi->treeView->selectionModel()->selectedRows();
  		if(selectedIndexes.isEmpty()) return;  //No processes selected
-@@ -449,6 +456,7 @@
- 			DisplayProcessDlg *dialog = new DisplayProcessDlg( this,process );
- 			dialog->show();
- 		}
-+#endif
- 	} else {
- 		QList< long long > pidlist;
- 		QModelIndexList selectedIndexes = d->mUi->treeView->selectionModel()->selectedRows();
+ 		QModelIndex realIndex = d->mFilterModel.mapToSource(selectedIndexes.at(0));
 --- a/libs/ksysguard/processui/ksysguard.widgets
 +++ b/libs/ksysguard/processui/ksysguard.widgets
 @@ -15,10 +15,3 @@

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-06-09 14:40:52 UTC (rev 10918)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-06-09 14:54:27 UTC (rev 10919)
@@ -1,4 +1,3 @@
-06_kdehome_kde4.diff
 07_kdmrc_defaults.diff
 08_genkdmconf.diff
 09_genkdm_make.diff

More information about the pkg-kde-commits mailing list