rev 18302 - in trunk/packages/kdebase-workspace/debian: . patches

[George Kiagiadakis]

Author: gkiagia-guest
Date: 2010-06-09 11:18:37 +0000 (Wed, 09 Jun 2010)
New Revision: 18302

Added:
   trunk/packages/kdebase-workspace/debian/patches/01_plasma_netbook_no_autostart.diff
Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/patches/series
   trunk/packages/kdebase-workspace/debian/plasma-netbook.install
Log:
Add patch 01_plasma_netbook_no_autostart.diff from kubuntu
to fix plasma-netbook autostart when only plasma-netbook
is installed. (Closes: #584905)


Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2010-06-09 09:38:11 UTC (rev 18301)
+++ trunk/packages/kdebase-workspace/debian/changelog	2010-06-09 11:18:37 UTC (rev 18302)
@@ -1,11 +1,17 @@
 kdebase-workspace (4:4.4.4-2) UNRELEASED; urgency=low
 
+  [ Modestas Vainius ]
   * Make kdebase-workspace-data replace & conflict with ksplash
     (Closes: #584861).
   * Do not hardcode python version in plasma-scriptengine-python.install.
 
- -- Modestas Vainius <modax at debian.org>  Mon, 07 Jun 2010 12:11:05 +0300
+  [ George Kiagiadakis ]
+  * Add patch 01_plasma_netbook_no_autostart.diff from kubuntu
+    to fix plasma-netbook autostart when only plasma-netbook
+    is installed. (Closes: #584905)
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 09 Jun 2010 14:16:37 +0300
+
 kdebase-workspace (4:4.4.4-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/packages/kdebase-workspace/debian/patches/01_plasma_netbook_no_autostart.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/01_plasma_netbook_no_autostart.diff	                        (rev 0)
+++ trunk/packages/kdebase-workspace/debian/patches/01_plasma_netbook_no_autostart.diff	2010-06-09 11:18:37 UTC (rev 18302)
@@ -0,0 +1,17 @@
+--- a/plasma/netbook/shell/plasma-netbook.desktop
++++ b/plasma/netbook/shell/plasma-netbook.desktop
+@@ -109,4 +109,4 @@
+ X-KDE-StartupNotify=false
+ OnlyShowIn=KDE;
+ X-KDE-autostart-phase=0
+-
++Hidden=true
+--- a/plasma/netbook/shell/CMakeLists.txt
++++ b/plasma/netbook/shell/CMakeLists.txt
+@@ -22,5 +22,5 @@
+ install(TARGETS kdeinit_plasma-netbook DESTINATION ${LIB_INSTALL_DIR})
+ install(TARGETS plasma-netbook ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES plasma-default-layoutrc DESTINATION ${DATA_INSTALL_DIR}/plasma-netbook/)
+-#install(FILES plasma-netbook.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
++install(FILES plasma-netbook.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
+ 

Modified: trunk/packages/kdebase-workspace/debian/patches/series
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/series	2010-06-09 09:38:11 UTC (rev 18301)
+++ trunk/packages/kdebase-workspace/debian/patches/series	2010-06-09 11:18:37 UTC (rev 18302)
@@ -1,3 +1,4 @@
+01_plasma_netbook_no_autostart.diff
 06_kdm_does_not_wreak_havoc.diff
 07_kdmrc_defaults.diff
 08_genkdmconf.diff

Modified: trunk/packages/kdebase-workspace/debian/plasma-netbook.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/plasma-netbook.install	2010-06-09 09:38:11 UTC (rev 18301)
+++ trunk/packages/kdebase-workspace/debian/plasma-netbook.install	2010-06-09 11:18:37 UTC (rev 18302)
@@ -6,6 +6,7 @@
 usr/lib/kde4/plasma_containment_sal.so
 usr/lib/kde4/plasma_engine_searchlaunch.so
 usr/lib/libkdeinit4_plasma-netbook.so
+usr/share/autostart/plasma-netbook.desktop
 usr/share/kde4/apps/desktoptheme/air-netbook/colors
 usr/share/kde4/apps/desktoptheme/air-netbook/metadata.desktop
 usr/share/kde4/apps/desktoptheme/air-netbook/widgets/background.svgz