[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.11.22-2-1-g8f48230
Scott Kitterman
kitterman at moszumanska.debian.org
Fri Sep 11 02:20:07 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=8f48230
The following commit has been merged in the master branch:
commit 8f48230df589ffd10fb29b8773a922b202ec107c
Author: Scott Kitterman <scott at kitterman.com>
Date: Thu Sep 10 22:19:57 2015 -0400
* Convert plasma-netbook into an arch all transitional package that depends
on plasma-desktop due to the lack of a netbook specific U/I in Plasma 5
* Stop building plasma-widgets-workspace binary as is it no longer needed
* Stop building plasma-scriptengines binary as it is no longer useful
* Drop kde-workspace-bin Reccomends of plasma-scriptengines
* Stop building plasma-scriptengine-ruby as it is no longer useful
* Stop building plasma-scriptengine-python as it is no longer useful
* Stop building plasma-scriptengine-webkit as it is no longer useful
* Stop building kde-workspace-dbg since it makes the package take forever
to upload and there's little value for this unmaintained code
* Remove obsolete kdebase-* transitional packages (already in a stable
release)
---
debian/changelog | 18 ++++
debian/control | 199 +++++++++++++++++++-----------------------
debian/plasma-netbook.desktop | 112 ------------------------
debian/plasma-netbook.install | 40 ---------
debian/rules | 3 -
5 files changed, 106 insertions(+), 266 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5495818..eba3ff3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+kde-workspace (4:4.11.22-3) unstable; urgency=medium
+
+ * Team upload.
+ * Convert plasma-netbook into an arch all transitional package that depends
+ on plasma-desktop due to the lack of a netbook specific U/I in Plasma 5
+ * Stop building plasma-widgets-workspace binary as is it no longer needed
+ * Stop building plasma-scriptengines binary as it is no longer useful
+ * Drop kde-workspace-bin Reccomends of plasma-scriptengines
+ * Stop building plasma-scriptengine-ruby as it is no longer useful
+ * Stop building plasma-scriptengine-python as it is no longer useful
+ * Stop building plasma-scriptengine-webkit as it is no longer useful
+ * Stop building kde-workspace-dbg since it makes the package take forever
+ to upload and there's little value for this unmaintained code
+ * Remove obsolete kdebase-* transitional packages (already in a stable
+ release)
+
+ -- Scott Kitterman <scott at kitterman.com> Thu, 10 Sep 2015 16:03:41 -0400
+
kde-workspace (4:4.11.22-2) unstable; urgency=medium
* Remove kde-style-oxygen binary package. It's a transitional package
diff --git a/debian/control b/debian/control
index 5d5b208..6271a79 100644
--- a/debian/control
+++ b/debian/control
@@ -106,15 +106,6 @@ Description: KDE Plasma Workspace components
.
This package provides a basic KDE desktop installation.
-Package: kdebase-workspace
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: kde-workspace, ${misc:Depends}
-Description: transitional package for kde-workspace
- This is a dummy transitional package for kde-workspace and can be safely
- removed after the installation is complete.
-
# Package: plasma-desktop
# Architecture: any
# Depends: kde-wallpapers-default,
@@ -136,20 +127,16 @@ Description: transitional package for kde-workspace
# This package is part of the KDE base workspace module.
Package: plasma-netbook
-Architecture: any
-Depends: kde-wallpapers-default,
- plasma-widgets-workspace (= ${binary:Version}),
+Section: oldlibs
+Architecture: all
+Depends: plasma-desktop,
${misc:Depends},
${shlibs:Depends}
-Recommends: kde-workspace
-Description: KDE Plasma workspace for netbook computers
- Provides the environment for running and managing applications and integrating
- interaction of applications. It is designed as generic environment for all
- kinds of applications in a netbook environment, not only applications built on
- the KDE Platform. It integrates best with applications following the standards
- used by the KDE Platform.
+Description: transitional package for plasma-netbook
+ This is a dummy transitional package to upgrade KDE plasma-netbook users to
+ Plasma 5 plasma-desktop since a separate netbook U/I is no longer provided.
.
- This package is part of the KDE base workspace module.
+ This package can be safely removed after the upgrade is complete.
Package: kde-workspace-bin
Architecture: any
@@ -162,8 +149,7 @@ Depends: iso-codes,
x11-xserver-utils,
${misc:Depends},
${shlibs:Depends}
-Recommends: plasma-scriptengines,
- polkit-kde-1 (>= 0.99) | policykit-1-gnome,
+Recommends: polkit-kde-1 (>= 0.99) | policykit-1-gnome,
upower [linux-any]
Suggests: x11-xkb-utils
Replaces: kcontrol,
@@ -264,70 +250,70 @@ Description: KDE Plasma data engines
.
This package is part of the KDE base workspace module.
-Package: plasma-widgets-workspace
-Architecture: any
-Depends: plasma-dataengines-workspace (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Provides: notification-daemon
-Description: plasma widgets and containments for the KDE Plasma Workspace
- This package contains standard Plasma widgets and containments shipped in the
- KDE base workspace module. They provide such basic desktop functionality as
- the panel, task manager, application laucher, clock and more. The default KDE
- Workspace is a combination of these visual components.
- .
- This package also includes the default animator used by the main KDE Plasma
- Desktop shell.
- .
- This package is part of the KDE base workspace module.
-
-Package: plasma-scriptengines
-Architecture: all
-Depends: plasma-scriptengine-javascript (>= 4:4.2.95),
- plasma-scriptengine-python (>= ${source:Version}),
- plasma-scriptengine-ruby (>= ${source:Version}),
- plasma-scriptengine-webkit (>= ${source:Version}),
- ${misc:Depends}
-Recommends: plasma-scriptengine-superkaramba
-Suggests: plasma-scriptengine-kimono
-Description: metapackage to install all Plasma script engines
- This metapackage depends on all Plasma script engines which kde-workspace
- module provides and suggests script engines from other official KDE modules.
- .
- This package is part of the KDE base workspace module.
-
-Package: plasma-scriptengine-ruby
-Architecture: all
-Depends: ruby-plasma, ${misc:Depends}
-Description: Ruby script engine for Plasma
- This package provides the Ruby script engine for Plasma. You have to install it
- if you want to use Plasma widgets and data engines written in Ruby.
- .
- This package is part of the KDE base workspace module.
-
-Package: plasma-scriptengine-python
-Architecture: all
-Depends: python-kde4 (>= 4:4.6.80),
- python-qt4-dbus,
- ${misc:Depends},
- ${python:Depends}
-Description: Python script engine for Plasma
- This package provides the Python script engine for Plasma. You have to install
- it if you want to use Plasma widgets and data engines written in Python.
- .
- This package is part of the KDE base workspace module.
-
-Package: plasma-scriptengine-webkit
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Web and Mac OS X dashboard widget support for Plasma
- This package provides the WebKit script engine for Plasma which adds support
- for the webpage widgets written in HTML and JavaScript and for the 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 base workspace module.
-
+#Package: plasma-widgets-workspace
+#Architecture: any
+#Depends: plasma-dataengines-workspace (= ${binary:Version}),
+# ${misc:Depends},
+# ${shlibs:Depends}
+#Provides: notification-daemon
+#Description: plasma widgets and containments for the KDE Plasma Workspace
+# This package contains standard Plasma widgets and containments shipped in the
+# KDE base workspace module. They provide such basic desktop functionality as
+# the panel, task manager, application laucher, clock and more. The default KDE
+# Workspace is a combination of these visual components.
+# .
+# This package also includes the default animator used by the main KDE Plasma
+# Desktop shell.
+# .
+# This package is part of the KDE base workspace module.
+#
+#Package: plasma-scriptengines
+#Architecture: all
+#Depends: plasma-scriptengine-javascript (>= 4:4.2.95),
+# plasma-scriptengine-python (>= ${source:Version}),
+# plasma-scriptengine-ruby (>= ${source:Version}),
+# plasma-scriptengine-webkit (>= ${source:Version}),
+# ${misc:Depends}
+#Recommends: plasma-scriptengine-superkaramba
+#Suggests: plasma-scriptengine-kimono
+#Description: metapackage to install all Plasma script engines
+# This metapackage depends on all Plasma script engines which kde-workspace
+# module provides and suggests script engines from other official KDE modules.
+# .
+# This package is part of the KDE base workspace module.
+#
+#Package: plasma-scriptengine-ruby
+#Architecture: all
+#Depends: ruby-plasma, ${misc:Depends}
+#Description: Ruby script engine for Plasma
+# This package provides the Ruby script engine for Plasma. You have to install it
+# if you want to use Plasma widgets and data engines written in Ruby.
+# .
+# This package is part of the KDE base workspace module.
+#
+#Package: plasma-scriptengine-python
+#Architecture: all
+#Depends: python-kde4 (>= 4:4.6.80),
+# python-qt4-dbus,
+# ${misc:Depends},
+# ${python:Depends}
+#Description: Python script engine for Plasma
+# This package provides the Python script engine for Plasma. You have to install
+# it if you want to use Plasma widgets and data engines written in Python.
+# .
+# This package is part of the KDE base workspace module.
+#
+#Package: plasma-scriptengine-webkit
+#Architecture: any
+#Depends: ${misc:Depends}, ${shlibs:Depends}
+#Description: Web and Mac OS X dashboard widget support for Plasma
+# This package provides the WebKit script engine for Plasma which adds support
+# for the webpage widgets written in HTML and JavaScript and for the 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 base workspace module.
+#
Package: freespacenotifier
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -665,31 +651,22 @@ Description: library which provides an interface for weather information service
.
This package is part of the KDE base workspace module.
-Package: kde-workspace-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: kde-runtime-dbg, ${misc:Depends}
-Replaces: kdebase-dbg (<< 4:4.5),
- kdebase-runtime-dbg (<< 4:4.5),
- kdebase-workspace-dbg (<< 4:4.7.2)
-Breaks: kdebase-dbg (<< 4:4.5),
- kdebase-runtime-dbg (<< 4:4.5),
- kdebase-workspace-dbg (<< 4:4.7.2)
-Suggests: kde-workspace (>= ${source:Version})
-Description: debugging symbols for the KDE Plasma Workspaces
- This package contains debugging files used to investigate problems with
- binaries included in the KDE base workspace module.
-
-Package: kdebase-workspace-dbg
-Section: oldlibs
-Architecture: any
-Priority: extra
-Depends: kde-workspace-dbg, ${misc:Depends}
-Description: transitional package for kde-workspace-dbg
- This is a dummy transitional package for kde-workspace-dbg and can be safely
- removed after the installation is complete.
-
+#Package: kde-workspace-dbg
+#Section: debug
+#Architecture: any
+#Priority: extra
+#Depends: kde-runtime-dbg, ${misc:Depends}
+#Replaces: kdebase-dbg (<< 4:4.5),
+# kdebase-runtime-dbg (<< 4:4.5),
+# kdebase-workspace-dbg (<< 4:4.7.2)
+#Breaks: kdebase-dbg (<< 4:4.5),
+# kdebase-runtime-dbg (<< 4:4.5),
+# kdebase-workspace-dbg (<< 4:4.7.2)
+#Suggests: kde-workspace (>= ${source:Version})
+#Description: debugging symbols for the KDE Plasma Workspaces
+# This package contains debugging files used to investigate problems with
+# binaries included in the KDE base workspace module.
+#
Package: ktouchpadenabler
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/plasma-netbook.desktop b/debian/plasma-netbook.desktop
deleted file mode 100644
index 5341c03..0000000
--- a/debian/plasma-netbook.desktop
+++ /dev/null
@@ -1,112 +0,0 @@
-[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
deleted file mode 100644
index f0c576c..0000000
--- a/debian/plasma-netbook.install
+++ /dev/null
@@ -1,40 +0,0 @@
-debian/plasma-netbook.desktop usr/share/autostart
-usr/bin/plasma-netbook
-usr/lib/kde4/plasma_applet_currentappcontrol.so
-usr/lib/kde4/plasma_applet_searchbox.so
-usr/lib/kde4/plasma_containment_netpanel.so
-usr/lib/kde4/plasma_containment_sal.so
-usr/lib/kde4/plasma_engine_searchlaunch.so
-usr/lib/libkdeinit4_plasma-netbook.so
-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
-usr/share/kde4/apps/desktoptheme/air-netbook/widgets/panel-background.svgz
-usr/share/kde4/apps/plasma-netbook/init/00-defaultLayout.js
-usr/share/kde4/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/contents/layout.js
-usr/share/kde4/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/metadata.desktop
-usr/share/kde4/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/contents/layout.js
-usr/share/kde4/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/metadata.desktop
-usr/share/kde4/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents/layout.js
-usr/share/kde4/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/metadata.desktop
-usr/share/kde4/apps/plasma/services/searchlaunch.operations
-usr/share/kde4/services/plasma-applet-currentappcontrol.desktop
-usr/share/kde4/services/plasma-applet-searchbox.desktop
-usr/share/kde4/services/plasma-containment-netpanel.desktop
-usr/share/kde4/services/plasma-containment-sal.desktop
-usr/share/kde4/services/plasma-engine-searchlaunch.desktop
-usr/share/kde4/services/plasma-layout-org.kde.plasma-netbook.defaultPage.desktop
-usr/share/kde4/services/plasma-layout-org.kde.plasma-netbook.defaultPanel.desktop
-usr/share/kde4/services/plasma-layout-org.kde.plasma-netbook.defaultSal.desktop
-usr/share/kde4/services/plasma-sal-bookmarks.desktop
-usr/share/kde4/services/plasma-sal-contacts.desktop
-usr/share/kde4/services/plasma-sal-development.desktop
-usr/share/kde4/services/plasma-sal-education.desktop
-usr/share/kde4/services/plasma-sal-games.desktop
-usr/share/kde4/services/plasma-sal-graphics.desktop
-usr/share/kde4/services/plasma-sal-internet.desktop
-usr/share/kde4/services/plasma-sal-multimedia.desktop
-usr/share/kde4/services/plasma-sal-office.desktop
-usr/share/kde4/services/plasma-sal-system.desktop
-usr/share/kde4/services/plasma-sal-utility.desktop
-usr/share/kde4/servicetypes/plasma-sal-menu.desktop
diff --git a/debian/rules b/debian/rules
index 1203f67..e695558 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,9 +22,6 @@ override_dh_auto_test:
# Disable dh_auto_test at build time
:
-override_dh_strip:
- $(overridden_command) --dbg-package=kde-workspace-dbg
-
override_dh_makeshlibs:
$(overridden_command) -pplasma-desktop -Xlibkickoff.so
$(overridden_command) --remaining-packages
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list