[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-7+squeeze1-89-g786ea31

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Sun Mar 6 17:46:47 UTC 2011 

The following commit has been merged in the master branch:
commit 786ea317cea41fe34ce93b0266973226c1e69883
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sun Mar 6 18:46:36 2011 +0100

    Refresh 30_plasma_netbook_fix_autostart.diff
---
 debian/changelog                                   |    3 +-
 .../patches/30_plasma_netbook_fix_autostart.diff   |   54 ++++------
 debian/patches/series                              |    1 +
 debian/plasma-netbook.desktop                      |  112 ++++++++++++++++++++
 debian/plasma-netbook.install                      |    1 +
 5 files changed, 139 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2ad96f..9783e47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -82,8 +82,9 @@ kdebase-workspace (4:4.6.1-0r1) UNRELEASED; urgency=low
     - 28_backport_bug156475_dualhead_support.diff - applied upstream
     - 29_backport_fix_krandr_support_in_startkde.diff - applied upstream
     - 99_solid_network_use_ntrack.diff - applied upstream
+  * Refreshed patches:
+    - 30_plasma_netbook_fix_autostart.diff
   * TODO:
-    - 30_plasma_netbook_fix_autostart.diff - check if the issue still exists
     - 31_kdm_vt_switching_on_kfreebsd.diff - should be refreshed/reworked
   * Rename libweather-ion4a as libweather-ion6 due to soname bump.
   * Rename libkwineffects1a as libkwineffects1b due to binary incompatible
diff --git a/debian/patches/30_plasma_netbook_fix_autostart.diff b/debian/patches/30_plasma_netbook_fix_autostart.diff
index 9dcc73e..e4b0143 100644
--- a/debian/patches/30_plasma_netbook_fix_autostart.diff
+++ b/debian/patches/30_plasma_netbook_fix_autostart.diff
@@ -1,24 +1,15 @@
 From: Modestas Vainius <modax at debian.org>
 Subject: Fix various problems with autostart of plasma-netbook
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=584905
-Last-Update: 2010-10-17
+Last-Update: 2011-03-06
 
 This patch should fully fix problems with startup of plasma-netbook when
 plasma-desktop is NOT installed. We aim to support "plasma-desktop"-less
 installation via kde-plasma-netbook metapackage hence this bug was a
 showstopper for this goal.
---- a/plasma/netbook/shell/CMakeLists.txt
-+++ b/plasma/netbook/shell/CMakeLists.txt
-@@ -22,5 +22,5 @@ endif(X11_Xrender_FOUND)
- 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})
- 
 --- a/kcontrol/workspaceoptions/workspaceoptions.cpp
 +++ b/kcontrol/workspaceoptions/workspaceoptions.cpp
-@@ -89,7 +89,7 @@ void WorkspaceOptionsModule::save()
+@@ -91,7 +91,7 @@
  
      m_plasmaNetbookAutostart.setAutostarts(!isDesktop);
      m_plasmaNetbookAutostart.setStartPhase(KAutostart::BaseDesktop);
@@ -26,10 +17,10 @@ showstopper for this goal.
 +    m_plasmaNetbookAutostart.setCommand("plasma-netbook --desktop");
      m_plasmaNetbookAutostart.setAllowedEnvironments(QStringList()<<"KDE");
  
-     KConfigGroup winCg(m_kwinConfig, "Windows");
+     m_krunnerAutostart.setAutostarts(isDesktop);
 --- a/plasma/netbook/shell/main.cpp
 +++ b/plasma/netbook/shell/main.cpp
-@@ -41,10 +41,16 @@ KDE_EXPORT int kdemain(int argc, char **
+@@ -40,10 +40,16 @@
  
  
      bool customGraphicsSystem = false;
@@ -47,9 +38,9 @@ showstopper for this goal.
          }
      }
  
-@@ -58,9 +64,16 @@ KDE_EXPORT int kdemain(int argc, char **
-     KCmdLineOptions options;
+@@ -58,9 +64,16 @@
      options.add("nodesktop", ki18n("Starts as a normal application instead of as the primary user interface"));
+     options.add("opengl", ki18n("Use OpenGL to draw the main screen"));
      options.add("screen <geometry>", ki18n("The geometry of the screen"), "800x480");
 +    if (argExplicitDesktop)
 +        options.add("noautostart", ki18n("Explicit --desktop enables autostart handling which may be disabled with this option"));
@@ -66,24 +57,25 @@ showstopper for this goal.
      int rc = app->exec();
 --- a/plasma/netbook/shell/plasmaapp.cpp
 +++ b/plasma/netbook/shell/plasmaapp.cpp
-@@ -34,6 +34,7 @@
- #include <KCmdLineArgs>
+@@ -33,6 +33,7 @@
  #include <KStandardAction>
  #include <KWindowSystem>
+ #include <KAction>
 +#include <KAutostart>
  
  #include <ksmserver_interface.h>
  
-@@ -216,13 +217,21 @@ PlasmaApp::PlasmaApp()
-       m_isDesktop(false),
+@@ -320,7 +321,8 @@
        m_autoHideControlBar(true),
-       m_raiseTimer(new QTimer(this)),
--      m_unHideTimer(0)
-+      m_unHideTimer(0),
+       m_unHideTimer(0),
+       m_shadowWindow(0),
+-      m_startupSuspendWaitCount(0)
++      m_startupSuspendWaitCount(0),
 +      m_shallBeStarted(true)
  {
+     PlasmaApp::suspendStartup(true);
      KGlobal::locale()->insertCatalog("libplasma");
-     KGlobal::locale()->insertCatalog("plasmagenericshell");
+@@ -328,6 +330,13 @@
  
  
      KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -96,8 +88,8 @@ showstopper for this goal.
 +
      bool isDesktop = args->isSet("desktop");
      if (isDesktop) {
-         notifyStartup(false);
-@@ -296,6 +305,38 @@ PlasmaApp::~PlasmaApp()
+         KCrash::setFlags(KCrash::AutoRestart);
+@@ -397,6 +406,38 @@
  {
  }
  
@@ -138,7 +130,7 @@ showstopper for this goal.
      if (m_corona) {
 --- a/plasma/netbook/shell/plasmaapp.h
 +++ b/plasma/netbook/shell/plasmaapp.h
-@@ -84,6 +84,12 @@ public:
+@@ -87,6 +87,12 @@
       */
      bool isDesktop() const;
  
@@ -151,7 +143,7 @@ showstopper for this goal.
      void showWidgetExplorer(Plasma::Containment *containment);
  
  public Q_SLOTS:
-@@ -99,6 +105,7 @@ private:
+@@ -105,6 +111,7 @@
      void reserveStruts();
      void createUnhideTrigger();
      void destroyUnHideTrigger();
@@ -159,17 +151,17 @@ showstopper for this goal.
  
  private Q_SLOTS:
      void cleanup();
-@@ -140,6 +147,7 @@ private:
-     bool m_autoHideControlBar;
+@@ -152,6 +159,7 @@
      QTimer *m_unHideTimer;
-     QTimer *m_raiseTimer;
+     ShadowWindow *m_shadowWindow;
+     int m_startupSuspendWaitCount;
 +    bool m_shallBeStarted;
  };
  
  #endif // multiple inclusion guard
 --- a/startkde.cmake
 +++ b/startkde.cmake
-@@ -356,6 +356,24 @@ else
+@@ -301,6 +301,24 @@
      exit 1
  fi
  
diff --git a/debian/patches/series b/debian/patches/series
index faf18ca..3b09d68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,7 @@
 21_place_global_config_in_etc.diff
 22_kdm_xreset_hook_framework.diff
 26_run_kaboom_when_starting_kde.diff
+30_plasma_netbook_fix_autostart.diff
 32_ksmserver_fadeeffect_use_sse2_free.diff
 33_qguiplatformplugin_kde_NULL_check.diff
 97_fix_target_link_libraries.diff
diff --git a/debian/plasma-netbook.desktop b/debian/plasma-netbook.desktop
new file mode 100644
index 0000000..5341c03
--- /dev/null
+++ b/debian/plasma-netbook.desktop
@@ -0,0 +1,112 @@
+[Desktop Entry]
+Exec=plasma-netbook --desktop
+X-DBUS-StartupType=wait
+Name=Plasma Netbook
+Name[ca]=Plasma Netbook
+Name[ca at valencia]=Plasma Netbook
+Name[cs]=Plasma Netbook
+Name[da]=Plasma Netbook
+Name[de]=Plasma Netbook
+Name[el]=Plasma Netbook
+Name[en_GB]=Plasma Netbook
+Name[eo]=Plasma Netbook
+Name[es]=Netbook de Plasma
+Name[et]=Plasma väikesülearvuti
+Name[eu]=Plasma Netbook
+Name[fi]=Plasma Netbook
+Name[fr]=Netbook Plasma
+Name[fy]=Plasma netbook
+Name[ga]=Netbook Plasma
+Name[gl]=Plasma Netbook
+Name[gu]=પ્લાઝમા નેટબુક
+Name[he]=‏Plasma לנטבוקים
+Name[hr]=Plasma Netbook
+Name[hu]=Plasma Netbook
+Name[id]=Plasma Komputer Mini
+Name[is]=Plasma netbók (netbook)
+Name[it]=Ultraportatile Plasma
+Name[ja]=Plasma Netbook
+Name[kk]=Нетбукке арналған Plasma
+Name[km]=ប្លាស្មា Netbook
+Name[kn]=ಪ್ಲಾಸ್ಮಾ ನೆಟ್ ಬುಕ್
+Name[ko]=Plasma 넷북
+Name[lt]=Plasma netbukams
+Name[lv]=Plasma mazdatoru
+Name[ml]=പ്ലാസ്മ നെറ്റ്ബുക്ക്
+Name[nb]=Plasma nettbok
+Name[nds]=Plasma-Nettbook
+Name[nl]=Plasma netbook
+Name[nn]=Plasma-mini-PC
+Name[pa]=ਪਲਾਜ਼ਮਾ ਨੈੱਟਬੁੱਕ
+Name[pl]=Netbook Plazmy
+Name[pt]=Plasma para Netbooks
+Name[pt_BR]=Plasma para Netbooks
+Name[ro]=Netbook Plasma
+Name[si]=ප්ලාස්මා නෙට්බුක්
+Name[sk]=Plasma pre Netbooky
+Name[sl]=Plasma Netbook
+Name[sr]=Плазма нетбук
+Name[sr at ijekavian]=Плазма нетбук
+Name[sr at ijekavianlatin]=Plasma netbuk
+Name[sr at latin]=Plasma netbuk
+Name[sv]=Plasma för bärbara nätdatorer
+Name[th]=พลาสมาสำหรับเครื่องเน็ตบุ้ค
+Name[tr]=Plasma Netbook
+Name[uk]=Плазма для субноутбуків
+Name[x-test]=xxPlasma Netbookxx
+Name[zh_CN]=笔记本 Plasma
+Name[zh_TW]=Plasma Netbook
+Comment=Workspace shell for netbook devices.
+Comment[ca]=Espai de treball per als dispositius «netbook».
+Comment[ca at valencia]=Espai de treball per als dispositius «netbook».
+Comment[da]=Arbejdsområde-skal til netbook-enheder.
+Comment[de]=Arbeitsfläche für Netbook-Geräte
+Comment[el]=Χώρος εργασίας κελύφους για συσκευές netbook
+Comment[en_GB]=Workspace shell for netbook devices.
+Comment[es]=Entorno de espacio de trabajo para netbooks.
+Comment[et]=Töötsooni kest väikesülearvutitele.
+Comment[eu]=Langune maskorra netbook gailuentzako.
+Comment[fi]=Työtilakomentoikkuna netbook-laitteille.
+Comment[fr]=Shell de l'espace de travail pour les périphériques netbook
+Comment[fy]=Wurkromte flues foar netbook apparaten.
+Comment[gl]=Shell de traballo para ordenadores ultraportátiles.
+Comment[he]=סביבת עבודה עבור נטבוקים.
+Comment[hr]=Ljuska radne okoline za netbook uređaje.
+Comment[hu]=Munkaterület sheel a netbook eszközök számára.
+Comment[id]=Shell ruang kerja untuk divais komputer mini.
+Comment[is]=Vinnuskel fyrir 
+Comment[it]=Shell dello spazio di lavoro per dispositivi ultraportatili.
+Comment[kk]=Нетбуктерге арналған жұмыс орын ортасы.
+Comment[km]=សែល​តំបន់​ការងារ​សម្រាប់​ឧបករណ៍ netbook
+Comment[ko]=넷북을 위한 데스크톱 셸.
+Comment[lt]=Darbalaukio erdvė netbukams.
+Comment[lv]=Darbvirsmas čaula mazdatoriem.
+Comment[ml]=നെറ്റ്ബുക് ഉപകരണങ്ങള്‍ക്ക് വേണ്ടിയുള്ള പണിയിടം.
+Comment[nb]=Arbeidsplass-skall for nettbok-enheter
+Comment[nds]=Arbeitrebeet-Konsool för Nettbook-Reedschappen
+Comment[nl]=Werkruimte-shell voor netbook-apparaten.
+Comment[nn]=Arbeidsflate for mini-PC-ar.
+Comment[pa]=ਨੈੱਟਬੁੱਕ ਜੰਤਰਾਂ ਲਈ ਵਰਕਸਪੇਸ ਸ਼ੈੱਲ।
+Comment[pl]=Powłoka przestrzeni roboczej dla netbooków
+Comment[pt]=Área de trabalho para dispositivos 'netbook'.
+Comment[pt_BR]=Ambiente de trabalho para dispositivos Netbook.
+Comment[ro]=Înveliș de birou pentru dispozitive netbook.
+Comment[si]=නෙට්බුක් උපකරණ සඳහා වැඩබිම් ශෙලය
+Comment[sk]=Shell pracovnej plochy pre netbooky.
+Comment[sl]=Delovno okolje za male prenosnike.
+Comment[sr]=Шкољка радног простора за нетбук уређаје.
+Comment[sr at ijekavian]=Шкољка радног простора за нетбук уређаје.
+Comment[sr at ijekavianlatin]=Školjka radnog prostora za netbuk uređaje.
+Comment[sr at latin]=Školjka radnog prostora za netbuk uređaje.
+Comment[sv]=Arbetsyta för bärbara nätdatorenheter.
+Comment[th]=เชลล์พื้นที่ทำงานสำหรับอุปกรณ์แบบเน็ตบุ้ค
+Comment[tr]=Netbook aygıtları için çalışma alanı kabuğu.
+Comment[uk]=Оболонка робочого простору для субноутбуків.
+Comment[x-test]=xxWorkspace shell for netbook devices.xx
+Comment[zh_CN]=适合笔记本电脑的工作空间。
+Comment[zh_TW]=Netbook 裝置的工作空間 shell。
+Type=Service
+X-KDE-StartupNotify=false
+OnlyShowIn=KDE;
+X-KDE-autostart-phase=0
+
diff --git a/debian/plasma-netbook.install b/debian/plasma-netbook.install
index 629c5e6..47a6dda 100644
--- a/debian/plasma-netbook.install
+++ b/debian/plasma-netbook.install
@@ -1,4 +1,5 @@
 usr/bin/plasma-netbook
+debian/plasma-netbook.desktop usr/share/autostart
 usr/lib/kde4/plasma_applet_currentappcontrol.so
 usr/lib/kde4/plasma_applet_searchbox.so
 usr/lib/kde4/plasma_containment_netpanel.so

-- 
KDE Base Workspace module packaging

More information about the pkg-kde-commits mailing list