rev 12859 - branches/kde4.2/packages/kdebase-workspace/debian

Modestas Vainius modax-guest at alioth.debian.org
Sat Dec 6 01:03:02 UTC 2008


Author: modax-guest
Date: 2008-12-06 01:03:02 +0000 (Sat, 06 Dec 2008)
New Revision: 12859

Added:
   branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-apple.debhelper.log
   branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-apple.install
   branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-python.install
   branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-qtscript.install
   branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-ruby.install
   branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-webkit.install
   branches/kde4.2/packages/kdebase-workspace/debian/pyversions
Modified:
   branches/kde4.2/packages/kdebase-workspace/debian/changelog
   branches/kde4.2/packages/kdebase-workspace/debian/control
   branches/kde4.2/packages/kdebase-workspace/debian/installgen
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.install
   branches/kde4.2/packages/kdebase-workspace/debian/not-installed
   branches/kde4.2/packages/kdebase-workspace/debian/rules
Log:
* Split off Plasma script engines to plasma-scriptengine-* packages:
  - plasma-scriptengines - metapackage for all engines, depends on all script
    engines below.
  - plasma-scriptengine-qtscript - QtScript engine;
  - plasma-scriptengine-ruby - Ruby engine;
  - plasma-scriptengine-python - Python engine;
  - plasma-scriptengine-webkit - Webkit (Apple Mac OS X dashboard) engine.
    TODO: improve description or rename package?
* kdebase-workspace-bin recommends plasma-scriptengines.

Modified: branches/kde4.2/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/changelog	2008-12-05 22:07:10 UTC (rev 12858)
+++ branches/kde4.2/packages/kdebase-workspace/debian/changelog	2008-12-06 01:03:02 UTC (rev 12859)
@@ -1,4 +1,4 @@
-kdebase-workspace (4:4.1.82+svn892580-0r1) UNRELEASED; urgency=low
+kdebase-workspace (4:4.1.82+svn893089-0r2) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -18,7 +18,6 @@
   * Missing Plasma scriptengines:
     - GoogleGadgets
     - QEdje
-    - Python
   * Update install files:
     - Add new files
     - Move many files around mostly from kdebase-workspace-data to their
@@ -34,12 +33,21 @@
   * Move libkhotkeysprivate to kdebase-workspace-bin and make
     kdebase-workspace-libs4+5 conflict with earlier kdebase-workspace-bin
     versions.
+  * Split off Plasma script engines to plasma-scriptengine-* packages:
+    - plasma-scriptengines - metapackage for all engines, depends on all script
+      engines below.
+    - plasma-scriptengine-qtscript - QtScript engine;
+    - plasma-scriptengine-ruby - Ruby engine;
+    - plasma-scriptengine-python - Python engine;
+    - plasma-scriptengine-webkit - Webkit (Apple Mac OS X dashboard) engine.
+      TODO: improve description or rename package?
+  * kdebase-workspace-bin recommends plasma-scriptengines.
 
   +++ Changes by George Kiagiadakis:
 
   * Allow kwrited to install with setgid utmp.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 04 Dec 2008 23:28:04 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 06 Dec 2008 02:33:54 +0200
 
 kdebase-workspace (4:4.1.3-2) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/control	2008-12-05 22:07:10 UTC (rev 12858)
+++ branches/kde4.2/packages/kdebase-workspace/debian/control	2008-12-06 01:03:02 UTC (rev 12859)
@@ -6,6 +6,7 @@
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt,
  kdelibs5-dev (>= 4:4.1.81), libplasma-dev (>= 4:4.1.81),
  kdepimlibs5-dev (>= 4:4.1.81), libboost-dev,
+ python-kde4 (>= 4:4.1.82), python-sip4-dev (>= 4.7.8), python-qt4-dev (>= 4.4.4), python-support (>= 0.6),
  libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libcaptury-dev, libck-connector-dev, libdbus-1-dev, libnm-util-dev, network-manager-dev (>= 0.7.0~),
  libpam0g-dev, libqimageblitz-dev (>= 1:0.0.4-2), libraw1394-dev, libsensors-dev,
@@ -14,7 +15,7 @@
  libxrandr-dev, libxrender-dev, libxxf86misc-dev,
  libsmbclient-dev, libxcb1-dev, libxine-dev, libstreamanalyzer-dev, libfontconfig-dev, libglu1-mesa-dev,
  libsm-dev, libxcursor-dev, libxft-dev, libxtst-dev, libqt4-opengl-dev, libxinerama-dev,
- libxss-dev
+ libxss-dev,
 Standards-Version: 3.8.0
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdebase-workspace
@@ -42,6 +43,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, plasma-applets-workspace (= ${binary:Version}),
  kdebase-workspace-data (= ${source:Version}), x11-utils, x11-xserver-utils
+Recommends: plasma-scriptengines
 Suggests: x11-xkb-utils
 Replaces: kdebase-bin (<< 4:4.0.0-1), kcontrol, kmenuedit, ktip, libplasma2,
  kde-window-manager (<< 4:4.1.80), kdebase-workspace-data (<< 4:4.1.82),
@@ -122,6 +124,64 @@
  .
  This package is part of the KDE 4 base workspace module.
 
+Package: plasma-scriptengines
+Section: kde
+Architecture: all
+Depends: plasma-scriptengine-qtscript (>= ${source:Version}),
+ plasma-scriptengine-ruby (>= ${source:Version}),
+ plasma-scriptengine-python (>= ${source:Version}),
+ plasma-scriptengine-webkit (>= ${source:Version})
+Suggests: plasma-scriptengine-kimono
+Description: a metapackage to install all Plasma script engines
+ This metapackage depends on all Plasma script engines which kdebase-workspace
+ module provides and suggests script engines from other official KDE modules.
+ .
+ This package is part of the KDE 4 base workspace module.
+
+Package: plasma-scriptengine-qtscript
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdebase-workspace-bin (<< 4:4.1.82+svn893000), kdebase-workspace-data (<< 4:4.1.82)
+Description: QtScript script engine for Plasma
+ This package provides QtScript script engine for Plasma. You have to install it
+ if you want to use Plasma applets and data engines written in QtScript.
+ .
+ This package is part of the KDE 4 base workspace module.
+
+Package: plasma-scriptengine-ruby
+Section: kde
+Architecture: all
+Depends: libplasma-ruby (>= 4:4.1.82)
+Replaces: kdebase-workspace-bin (<< 4:4.1.82+svn893000), kdebase-workspace-data (<< 4:4.1.82+svn893000)
+Description: Ruby script engine for Plasma
+ This package provides Ruby script engine for Plasma. You have to install it
+ if you want to use Plasma applets and data engines written in Ruby.
+ .
+ This package is part of the KDE 4 base workspace module.
+
+Package: plasma-scriptengine-python
+Section: kde
+Architecture: all
+Depends: ${python:Depends}, python-kde4 (>= 4:4.1.82)
+Description: Python script engine for Plasma
+ This package provides Python script engine for Plasma. You have to install it
+ if you want to use Plasma applets and data engines written in Python.
+ .
+ This package is part of the KDE 4 base workspace module.
+
+Package: plasma-scriptengine-webkit
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdebase-workspace-bin (<< 4:4.1.82+svn893000), kdebase-workspace-data (<< 4:4.1.82+svn893000)
+Description: Applet Mac OS X dashboard widget support for Plasma
+ This Plasma script engine adds support for Apple Mac OS X dashboard widgets.
+ You have to install this package if you want to be able to load these widgets
+ in your Plasma shell.
+ .
+ This package is part of the KDE 4 base workspace module.
+
 Package: kdm
 Section: x11
 Architecture: any

Modified: branches/kde4.2/packages/kdebase-workspace/debian/installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/installgen	2008-12-05 22:07:10 UTC (rev 12858)
+++ branches/kde4.2/packages/kdebase-workspace/debian/installgen	2008-12-06 01:03:02 UTC (rev 12859)
@@ -55,6 +55,19 @@
 from:/plasma/animators/
 from:/plasma/containments/
 
+[plasma-scriptengine-qtscript]
+from:/plasma/scriptengines/qtscript/
+
+[plasma-scriptengine-ruby]
+from:/plasma/scriptengines/ruby/
+
+[plasma-scriptengine-python]
+missing from:/plasma/scriptengines/python/ dst:\.pyc$
+from:/plasma/scriptengines/python/
+
+[plasma-scriptengine-webkit]
+from:/plasma/scriptengines/webkit/
+
 [kdebase-workspace-bin]
 dst:usr/bin
 mime:application/x-executable

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-12-05 22:07:10 UTC (rev 12858)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-12-06 01:03:02 UTC (rev 12859)
@@ -83,12 +83,6 @@
 usr/lib/kde4/libexec/kio_fonts_helper
 usr/lib/kde4/libexec/krunner_lock
 usr/lib/kde4/libexec/test_kcm_xinerama
-usr/lib/kde4/plasma_appletscriptengine_dashboard.so
-usr/lib/kde4/plasma_appletscriptengine_webapplet.so
-usr/lib/kde4/plasma_packagestructure_dashboard.so
-usr/lib/kde4/plasma_packagestructure_web.so
-usr/lib/kde4/plasma_runner_scriptengine_qscript.so
-usr/lib/kde4/plasma_scriptengine_qscript.so
 usr/lib/kde4/plasma_wallpaper_color.so
 usr/lib/kde4/plasma_wallpaper_image.so
 usr/lib/kde4/solid_bluez.so
@@ -145,8 +139,6 @@
 usr/share/kde4/services/khotkeys.desktop
 usr/share/kde4/services/ksplashthememgr.desktop
 usr/share/kde4/services/mouse.desktop
-usr/share/kde4/services/plasma-packagestructure-dashboard.desktop
-usr/share/kde4/services/plasma-packagestructure-web.desktop
 usr/share/kde4/services/plasma-runner-bookmarks.desktop
 usr/share/kde4/services/plasma-runner-calculator.desktop
 usr/share/kde4/services/plasma-runner-locations.desktop
@@ -158,13 +150,6 @@
 usr/share/kde4/services/plasma-runner-shell.desktop
 usr/share/kde4/services/plasma-runner-shell_config.desktop
 usr/share/kde4/services/plasma-runner-webshortcuts.desktop
-usr/share/kde4/services/plasma-scriptengine-applet-dashboard.desktop
-usr/share/kde4/services/plasma-scriptengine-applet-web.desktop
-usr/share/kde4/services/plasma-scriptengine-qscript.desktop
-usr/share/kde4/services/plasma-scriptengine-qscriptrunner.desktop
-usr/share/kde4/services/plasma-scriptengine-ruby-applet.desktop
-usr/share/kde4/services/plasma-scriptengine-ruby-dataengine.desktop
-usr/share/kde4/services/plasma-scriptengine-ruby-package.desktop
 usr/share/kde4/services/plasma-wallpaper-color.desktop
 usr/share/kde4/services/plasma-wallpaper-image.desktop
 usr/share/kde4/services/powerdevilconfig.desktop

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-12-05 22:07:10 UTC (rev 12858)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-12-06 01:03:02 UTC (rev 12859)
@@ -281,16 +281,6 @@
 usr/share/kde4/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
 usr/share/kde4/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
 usr/share/kde4/apps/kwrited/kwrited.notifyrc
-usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
-usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleButton.js
-usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleInfoButton.js
-usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleScrollArea.js
-usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleScrollbar.js
-usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleSlider.js
-usr/share/kde4/apps/plasma/dashboard/button/genericButton.js
-usr/share/kde4/apps/plasma_scriptengine_ruby/applet.rb
-usr/share/kde4/apps/plasma_scriptengine_ruby/data_engine.rb
-usr/share/kde4/apps/plasma_scriptengine_ruby/package_ruboid.rb
 usr/share/kde4/apps/powerdevil/default.powerdevilprofiles
 usr/share/kde4/apps/powerdevil/powerdevil.notifyrc
 usr/share/kde4/apps/solidfakenetbackend/fakenetworking.xml

Modified: branches/kde4.2/packages/kdebase-workspace/debian/not-installed
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/not-installed	2008-12-05 22:07:10 UTC (rev 12858)
+++ branches/kde4.2/packages/kdebase-workspace/debian/not-installed	2008-12-06 01:03:02 UTC (rev 12859)
@@ -2,18 +2,18 @@
 #no need to ship dev symlink
 ./usr/lib/libkwinnvidiahack.so
 
+# Python *.pyc files
+./usr/share/kde4/apps/plasma_scriptengine_python/package_pythoid.pyc
+./usr/share/kde4/apps/plasma_scriptengine_python/pyappletscript.pyc
+./usr/share/kde4/apps/plasma_scriptengine_python/pydataengine.pyc
+./usr/share/kde4/apps/plasma_scriptengine_python/plasma_importer.pyc
+./usr/lib/libkhotkeysprivate.so
+./usr/lib/python2.5/site-packages/PyKDE4/plasmascript.pyc
+
+# Gets renamed by python-support
+./usr/lib/python2.5/site-packages/PyKDE4/plasmascript.py
+
 #cursors is in oxygencursors package
-./usr/share/icons/Oxygen_Black/cursors/
-./usr/share/icons/Oxygen_Black_Big/cursors/
-./usr/share/icons/Oxygen_Blue/cursors/
-./usr/share/icons/Oxygen_Blue_Big/cursors/
-./usr/share/icons/Oxygen_White/cursors/
-./usr/share/icons/Oxygen_White_Big/cursors/
-./usr/share/icons/Oxygen_Yellow/cursors/
-./usr/share/icons/Oxygen_Yellow_Big/cursors/
-./usr/share/icons/Oxygen_Zion/cursors/
-./usr/share/icons/Oxygen_Zion_Big/cursors/
-
 ./usr/share/icons/Oxygen_Black/cursors/00000000000000020006000e7e9ffc3f
 ./usr/share/icons/Oxygen_Black/cursors/00008160000006810000408080010102
 ./usr/share/icons/Oxygen_Black/cursors/03b6e0fcb3499374a867c041f52298f0

Added: branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-apple.debhelper.log
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-apple.debhelper.log	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-apple.debhelper.log	2008-12-06 01:03:02 UTC (rev 12859)
@@ -0,0 +1 @@
+dh_installgen

Added: branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-apple.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-apple.install	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-apple.install	2008-12-06 01:03:02 UTC (rev 12859)
@@ -0,0 +1,15 @@
+usr/lib/kde4/plasma_appletscriptengine_dashboard.so
+usr/lib/kde4/plasma_appletscriptengine_webapplet.so
+usr/lib/kde4/plasma_packagestructure_dashboard.so
+usr/lib/kde4/plasma_packagestructure_web.so
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleButton.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleInfoButton.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleScrollArea.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleScrollbar.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleSlider.js
+usr/share/kde4/apps/plasma/dashboard/button/genericButton.js
+usr/share/kde4/services/plasma-packagestructure-dashboard.desktop
+usr/share/kde4/services/plasma-packagestructure-web.desktop
+usr/share/kde4/services/plasma-scriptengine-applet-dashboard.desktop
+usr/share/kde4/services/plasma-scriptengine-applet-web.desktop

Added: branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-python.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-python.install	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-python.install	2008-12-06 01:03:02 UTC (rev 12859)
@@ -0,0 +1,8 @@
+usr/lib/python2.5/site-packages/PyKDE4/plasmascript.py
+usr/share/kde4/apps/plasma_scriptengine_python/package_pythoid.py
+usr/share/kde4/apps/plasma_scriptengine_python/plasma_importer.py
+usr/share/kde4/apps/plasma_scriptengine_python/pyappletscript.py
+usr/share/kde4/apps/plasma_scriptengine_python/pydataengine.py
+usr/share/kde4/services/plasma-packagestructure-python.desktop
+usr/share/kde4/services/plasma-scriptengine-applet-python.desktop
+usr/share/kde4/services/plasma-scriptengine-dataengine-python.desktop

Added: branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-qtscript.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-qtscript.install	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-qtscript.install	2008-12-06 01:03:02 UTC (rev 12859)
@@ -0,0 +1,4 @@
+usr/lib/kde4/plasma_runner_scriptengine_qscript.so
+usr/lib/kde4/plasma_scriptengine_qscript.so
+usr/share/kde4/services/plasma-scriptengine-qscript.desktop
+usr/share/kde4/services/plasma-scriptengine-qscriptrunner.desktop

Added: branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-ruby.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-ruby.install	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-ruby.install	2008-12-06 01:03:02 UTC (rev 12859)
@@ -0,0 +1,6 @@
+usr/share/kde4/apps/plasma_scriptengine_ruby/applet.rb
+usr/share/kde4/apps/plasma_scriptengine_ruby/data_engine.rb
+usr/share/kde4/apps/plasma_scriptengine_ruby/package_ruboid.rb
+usr/share/kde4/services/plasma-scriptengine-ruby-applet.desktop
+usr/share/kde4/services/plasma-scriptengine-ruby-dataengine.desktop
+usr/share/kde4/services/plasma-scriptengine-ruby-package.desktop

Added: branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-webkit.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-webkit.install	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/plasma-scriptengine-webkit.install	2008-12-06 01:03:02 UTC (rev 12859)
@@ -0,0 +1,15 @@
+usr/lib/kde4/plasma_appletscriptengine_dashboard.so
+usr/lib/kde4/plasma_appletscriptengine_webapplet.so
+usr/lib/kde4/plasma_packagestructure_dashboard.so
+usr/lib/kde4/plasma_packagestructure_web.so
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleButton.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleInfoButton.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleScrollArea.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleScrollbar.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleSlider.js
+usr/share/kde4/apps/plasma/dashboard/button/genericButton.js
+usr/share/kde4/services/plasma-packagestructure-dashboard.desktop
+usr/share/kde4/services/plasma-packagestructure-web.desktop
+usr/share/kde4/services/plasma-scriptengine-applet-dashboard.desktop
+usr/share/kde4/services/plasma-scriptengine-applet-web.desktop

Added: branches/kde4.2/packages/kdebase-workspace/debian/pyversions
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/pyversions	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/pyversions	2008-12-06 01:03:02 UTC (rev 12859)
@@ -0,0 +1 @@
+2.4-

Modified: branches/kde4.2/packages/kdebase-workspace/debian/rules
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/rules	2008-12-05 22:07:10 UTC (rev 12858)
+++ branches/kde4.2/packages/kdebase-workspace/debian/rules	2008-12-06 01:03:02 UTC (rev 12859)
@@ -16,3 +16,6 @@
 
 binary-install/kdm::
 	install -p -D -m644 debian/kdm-np.pam debian/kdm/etc/pam.d/kdm-np
+
+binary-install/plasma-scriptengine-python::
+	dh_pysupport -p$(cdbs_curpkg) /usr/share/kde4/apps/plasma_scriptengine_python




More information about the pkg-kde-commits mailing list