[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#857373: unblock: plasma-workspace/4:5.8.6-2

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear release team,

KDE Plasma 5.8 is an LTS that I consider fit to be updated in stretch, this 
particular request is to provide the 5.8.6 version of plasma-workspace in 
stretch, and I'll be producing similar requests for the other KDE Plasma 
components in the following days.

>From the upstream side, plasma-workspace 5.8.6 contains ~30 fixes compared to 
the 5.8.4 version currently in stretch, among them:
 - Fix crash when switching activities, after several uses (05826bd)
 - Fix crash when the media player provides invalid information (03374b1)
 - Move updating of primary screen in screenpool after fetching its id
   (bdfa0f3, reproducible crash fix)
 - Several fixes regarding multiple displays (b0b31de 3792ef9 dd0d19d 19a8803
   44c703d f7b170d bdfa0f3 0b0d146)
 - User facing changes:
   - [Lock Screen] Add keyboard icon for keyboard layout switcher (b34601f)
   - Fix "Unable to assign [undefined] to int" log (f4b5dfb)
   - [SDDM Theme] Remember last username (83fac04)

On the Debian side of changes we add sddm-theme-debian-breeze, that contains 
the breeze theme adapted to the new desktop-base. We are also fixing the bugs:
 - Add missing runtime dependency (#836241, rc)
 - Add missing x-session-manager provides (#853885, requested by the
   debian-edu team)
 - Add powerdevil recommends (#793463)

Due to the size of the diff I'm only attaching the Debian changes, and 
publishing the other files in:
 https://freak.gnuservers.com.ar/~maxy/debian/plasma-workspace_5.8.6_unblock/

Currently plasma-workspace 4:5.8.6-1 is in experimental, and I would upload it 
to sid if this gets approved.

Please unblock package plasma-workspace

Happy hacking,

unblock plasma-workspace/4:5.8.6-2

-- System Information:
Debian Release: 9.0
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'testing'), (500, 'stable'), (50, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf

Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)

commit 964b4568a827d40f6f9d2e0c61f76f4e88f7d5ae
Author: Maximiliano Curia <maxy@gnuservers.com.ar>
Date:   Wed Mar 8 19:10:29 2017 +0100

    Release to experimental

diff --git a/debian/changelog b/debian/changelog
index f905174ba..b06d51414 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-plasma-workspace (4:5.8.6-1~) UNRELEASED; urgency=medium
+plasma-workspace (4:5.8.6-1) experimental; urgency=medium
 
   * New upstream release (5.8.6) (Closes: 844707)
   * Add missing runtime dependency qml-module-org-kde-kholidays.
@@ -9,7 +9,7 @@ plasma-workspace (4:5.8.6-1~) UNRELEASED; urgency=medium
   * Recommend powerdevil.
     Thanks to Salvo Tomaselli for reporting (Closes: 793463)
 
- -- Maximiliano Curia <maxy@debian.org>  Tue, 07 Mar 2017 10:49:06 +0100
+ -- Maximiliano Curia <maxy@debian.org>  Wed, 08 Mar 2017 19:10:29 +0100
 
 plasma-workspace (4:5.8.5-1) experimental; urgency=medium
 

commit 5665d29d0266d2392d9d1d94f3495dd809706757
Author: Maximiliano Curia <maxy@gnuservers.com.ar>
Date:   Wed Mar 8 15:17:04 2017 +0100

    Prepare changelog
    
    Gbp-Dch: Ignore

diff --git a/debian/changelog b/debian/changelog
index dfda34ba4..f905174ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ plasma-workspace (4:5.8.6-1~) UNRELEASED; urgency=medium
     (Closes: 836241)
   * Add missing provides for x-session-manager.
     Thanks to Wolfgang Schweer for reporting (Closes: 853885)
+  * Recommend powerdevil.
+    Thanks to Salvo Tomaselli for reporting (Closes: 793463)
 
  -- Maximiliano Curia <maxy@debian.org>  Tue, 07 Mar 2017 10:49:06 +0100
 

commit 532512122a0faedcd204b417700d62da8d5e18ad
Author: Maximiliano Curia <maxy@gnuservers.com.ar>
Date:   Tue Mar 7 11:38:19 2017 +0100

    Recommend powerdevil.
    
    Closes: 793463
    Thanks: Salvo Tomaselli for reporting

diff --git a/debian/control b/debian/control
index 6e5f8e7e5..73bcf5248 100644
--- a/debian/control
+++ b/debian/control
@@ -185,7 +185,7 @@ Replaces: kde-workspace-bin,
           plasma-workspace-data,
           ${kde-l10n:all}
 Provides: notification-daemon, x-session-manager
-Recommends: kio-extras, libpam-kwallet5
+Recommends: kio-extras, libpam-kwallet5, powerdevil
 Description: Plasma Workspace for KF5
  Plasma Workspace for KF5. Workspaces provide
  support for KDE Plasma Widgets, integrated search,

commit 8d0235fd42355d39d4649d7b053eb483e39f493f
Author: Maximiliano Curia <maxy@gnuservers.com.ar>
Date:   Wed Mar 8 14:36:13 2017 +0100

    Prepare changelog
    
    Gbp-Dch: Ignore

diff --git a/debian/changelog b/debian/changelog
index 426261ffc..dfda34ba4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 plasma-workspace (4:5.8.6-1~) UNRELEASED; urgency=medium
 
-  * 
+  * New upstream release (5.8.6) (Closes: 844707)
+  * Add missing runtime dependency qml-module-org-kde-kholidays.
+    Thanks to Ignacio R. Morelle and YOSHINO Yoshihito for the report
+    (Closes: 836241)
+  * Add missing provides for x-session-manager.
+    Thanks to Wolfgang Schweer for reporting (Closes: 853885)
 
  -- Maximiliano Curia <maxy@debian.org>  Tue, 07 Mar 2017 10:49:06 +0100
 

commit a227d8bf03ba81efa62403b956881876530f14b5
Author: Maximiliano Curia <maxy@gnuservers.com.ar>
Date:   Tue Mar 7 11:00:40 2017 +0100

    Add missing provides for x-session-manager
    
    Closes: 853885
    Thanks: Wolfgang Schweer for reporting

diff --git a/debian/control b/debian/control
index 33bee28c9..6e5f8e7e5 100644
--- a/debian/control
+++ b/debian/control
@@ -184,7 +184,7 @@ Replaces: kde-workspace-bin,
           plasma-systray-legacy,
           plasma-workspace-data,
           ${kde-l10n:all}
-Provides: notification-daemon
+Provides: notification-daemon, x-session-manager
 Recommends: kio-extras, libpam-kwallet5
 Description: Plasma Workspace for KF5
  Plasma Workspace for KF5. Workspaces provide

commit 7a36622a057dc35a8812b36cb4a40613fb0cfcd5
Author: Maximiliano Curia <maxy@gnuservers.com.ar>
Date:   Tue Mar 7 10:55:38 2017 +0100

    Add missing runtime dependency qml-module-org-kde-kholidays
    
    Closes: 836241
    Thanks: Ignacio R. Morelle and YOSHINO Yoshihito for the report

diff --git a/debian/control b/debian/control
index c6a078942..33bee28c9 100644
--- a/debian/control
+++ b/debian/control
@@ -139,6 +139,7 @@ Depends: dbus-x11,
          qml-module-org-kde-draganddrop,
          qml-module-org-kde-extensionplugin,
          qml-module-org-kde-kcoreaddons,
+         qml-module-org-kde-kholidays,
          qml-module-org-kde-kquickcontrols,
          qml-module-org-kde-kquickcontrolsaddons,
          qml-module-org-kde-kwindowsystem,

commit b2aeee3e44ab37a7bfa12151ce00e42cb4c18fa9
Author: Maximiliano Curia <maxy@gnuservers.com.ar>
Date:   Tue Mar 7 10:49:44 2017 +0100

    Prepare changelog entry
    
    Gbp-Dch: Ignore

diff --git a/debian/changelog b/debian/changelog
index 26fb8e982..426261ffc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+plasma-workspace (4:5.8.6-1~) UNRELEASED; urgency=medium
+
+  * 
+
+ -- Maximiliano Curia <maxy@debian.org>  Tue, 07 Mar 2017 10:49:06 +0100
+
 plasma-workspace (4:5.8.5-1) experimental; urgency=medium
 
   * New upstream release (5.8.5).

commit 932a9aaa1f74b05ed0d527fe77abd8602ca5edcd
Author: Maximiliano Curia <maxy@gnuservers.com.ar>
Date:   Fri Dec 30 18:46:23 2016 +0100

    Release to experimental

diff --git a/debian/changelog b/debian/changelog
index 01461896d..26fb8e982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-plasma-workspace (4:5.8.5-1~) UNRELEASED; urgency=medium
+plasma-workspace (4:5.8.5-1) experimental; urgency=medium
 
   * New upstream release (5.8.5).
   * Drop upstream applied patch: Fix-Unable-to-assign-undefined-to-int-
     log.patch
   * Update symbols files.
 
- -- Maximiliano Curia <maxy@debian.org>  Wed, 28 Dec 2016 15:24:52 +0100
+ -- Maximiliano Curia <maxy@debian.org>  Fri, 30 Dec 2016 18:46:22 +0100
 
 plasma-workspace (4:5.8.4-1) unstable; urgency=medium
 

commit b8a43d0ddee10d609b6c9e05dabbe21f3de371c3
Author: Maximiliano Curia <maxy@gnuservers.com.ar>
Date:   Fri Dec 30 14:44:34 2016 +0100

    Update symbols files.

diff --git a/debian/changelog b/debian/changelog
index 3d099ccbb..01461896d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ plasma-workspace (4:5.8.5-1~) UNRELEASED; urgency=medium
   * New upstream release (5.8.5).
   * Drop upstream applied patch: Fix-Unable-to-assign-undefined-to-int-
     log.patch
+  * Update symbols files.
 
  -- Maximiliano Curia <maxy@debian.org>  Wed, 28 Dec 2016 15:24:52 +0100
 
diff --git a/debian/libtaskmanager6.symbols b/debian/libtaskmanager6.symbols
index e5ffe9405..17d5eaa2f 100644
--- a/debian/libtaskmanager6.symbols
+++ b/debian/libtaskmanager6.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:5.8.1 amd64 armhf i386
+# SymbolsHelper-Confirmed: 4:5.8.5 amd64
 libtaskmanager.so.6 libtaskmanager6 #MINVER#
  _ZN11TaskManager10TasksModel11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:5.8.1
  _ZN11TaskManager10TasksModel11qt_metacastEPKc@Base 4:5.8.1
@@ -305,6 +305,14 @@ libtaskmanager.so.6 libtaskmanager6 #MINVER#
  _ZN11TaskManager22TaskGroupingProxyModelD0Ev@Base 4:5.8.1
  _ZN11TaskManager22TaskGroupingProxyModelD1Ev@Base 4:5.8.1
  _ZN11TaskManager22TaskGroupingProxyModelD2Ev@Base 4:5.8.1
+ _ZN11TaskManager24AbstractWindowTasksModel11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:5.8.5
+ _ZN11TaskManager24AbstractWindowTasksModel11qt_metacastEPKc@Base 4:5.8.5
+ _ZN11TaskManager24AbstractWindowTasksModel16staticMetaObjectE@Base 4:5.8.5
+ _ZN11TaskManager24AbstractWindowTasksModelC1EP7QObject@Base 4:5.8.5
+ _ZN11TaskManager24AbstractWindowTasksModelC2EP7QObject@Base 4:5.8.5
+ _ZN11TaskManager24AbstractWindowTasksModelD0Ev@Base 4:5.8.5
+ _ZN11TaskManager24AbstractWindowTasksModelD1Ev@Base 4:5.8.5
+ _ZN11TaskManager24AbstractWindowTasksModelD2Ev@Base 4:5.8.5
  _ZN11TaskManager26ConcatenateTasksProxyModel11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:5.8.1
  _ZN11TaskManager26ConcatenateTasksProxyModel11qt_metacastEPKc@Base 4:5.8.1
  _ZN11TaskManager26ConcatenateTasksProxyModel16staticMetaObjectE@Base 4:5.8.1
@@ -468,6 +476,7 @@ libtaskmanager.so.6 libtaskmanager6 #MINVER#
  _ZNK11TaskManager22TaskGroupingProxyModel6parentERK11QModelIndex@Base 4:5.8.1
  _ZNK11TaskManager22TaskGroupingProxyModel8rowCountERK11QModelIndex@Base 4:5.8.1
  _ZNK11TaskManager22TaskGroupingProxyModel9groupModeEv@Base 4:5.8.1
+ _ZNK11TaskManager24AbstractWindowTasksModel10metaObjectEv@Base 4:5.8.5
  _ZNK11TaskManager26ConcatenateTasksProxyModel10metaObjectEv@Base 4:5.8.1
  _ZNK11TaskManager26ConcatenateTasksProxyModel16mapIfaceToSourceERK11QModelIndex@Base 4:5.8.1
  _ZNK11TaskManager27FlattenTaskGroupsProxyModel10metaObjectEv@Base 4:5.8.1
@@ -484,6 +493,7 @@ libtaskmanager.so.6 libtaskmanager6 #MINVER#
  _ZTIN11TaskManager20TaskFilterProxyModelE@Base 4:5.8.1
  _ZTIN11TaskManager22TaskGroupingProxyModelE@Base 4:5.8.1
  _ZTIN11TaskManager23AbstractTasksModelIfaceE@Base 4:5.8.1
+ _ZTIN11TaskManager24AbstractWindowTasksModelE@Base 4:5.8.5
  _ZTIN11TaskManager26ConcatenateTasksProxyModelE@Base 4:5.8.1
  _ZTIN11TaskManager27FlattenTaskGroupsProxyModelE@Base 4:5.8.1
  _ZTIN11TaskManager28AbstractTasksProxyModelIfaceE@Base 4:5.8.1
@@ -499,6 +509,7 @@ libtaskmanager.so.6 libtaskmanager6 #MINVER#
  _ZTSN11TaskManager20TaskFilterProxyModelE@Base 4:5.8.1
  _ZTSN11TaskManager22TaskGroupingProxyModelE@Base 4:5.8.1
  _ZTSN11TaskManager23AbstractTasksModelIfaceE@Base 4:5.8.1
+ _ZTSN11TaskManager24AbstractWindowTasksModelE@Base 4:5.8.5
  _ZTSN11TaskManager26ConcatenateTasksProxyModelE@Base 4:5.8.1
  _ZTSN11TaskManager27FlattenTaskGroupsProxyModelE@Base 4:5.8.1
  _ZTSN11TaskManager28AbstractTasksProxyModelIfaceE@Base 4:5.8.1
@@ -513,6 +524,7 @@ libtaskmanager.so.6 libtaskmanager6 #MINVER#
  _ZTVN11TaskManager18VirtualDesktopInfoE@Base 4:5.8.1
  _ZTVN11TaskManager20TaskFilterProxyModelE@Base 4:5.8.1
  _ZTVN11TaskManager22TaskGroupingProxyModelE@Base 4:5.8.1
+ _ZTVN11TaskManager24AbstractWindowTasksModelE@Base 4:5.8.5
  _ZTVN11TaskManager26ConcatenateTasksProxyModelE@Base 4:5.8.1
  _ZTVN11TaskManager27FlattenTaskGroupsProxyModelE@Base 4:5.8.1
  _ZTVN11TaskManager28AbstractTasksProxyModelIfaceE@Base 4:5.8.1
@@ -533,6 +545,7 @@ libtaskmanager.so.6 libtaskmanager6 #MINVER#
  (c++)"non-virtual thunk to TaskManager::AbstractTasksModel::requestToggleShaded(QModelIndex const&)@Base" 4:5.8.1
  (c++)"non-virtual thunk to TaskManager::AbstractTasksModel::requestVirtualDesktop(QModelIndex const&, int)@Base" 4:5.8.1
  (c++)"non-virtual thunk to TaskManager::AbstractTasksModel::~AbstractTasksModel()@Base" 4:5.8.1
+ (c++)"non-virtual thunk to TaskManager::AbstractWindowTasksModel::~AbstractWindowTasksModel()@Base" 4:5.8.5
  (c++)"non-virtual thunk to TaskManager::ConcatenateTasksProxyModel::mapIfaceToSource(QModelIndex const&) const@Base" 4:5.8.1
  (c++)"non-virtual thunk to TaskManager::ConcatenateTasksProxyModel::~ConcatenateTasksProxyModel()@Base" 4:5.8.1
  (c++)"non-virtual thunk to TaskManager::FlattenTaskGroupsProxyModel::mapIfaceToSource(QModelIndex const&) const@Base" 4:5.8.1

commit 7e81c22d9c01b580cf50f017670236a0ea870b62
Author: Maximiliano Curia <maxy@gnuservers.com.ar>
Date:   Thu Dec 29 17:10:49 2016 +0100

    Drop upstream applied patch: Fix-Unable-to-assign-undefined-to-int-log.patch

diff --git a/debian/changelog b/debian/changelog
index c340f7f6a..3d099ccbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 plasma-workspace (4:5.8.5-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.8.5).
+  * Drop upstream applied patch: Fix-Unable-to-assign-undefined-to-int-
+    log.patch
 
  -- Maximiliano Curia <maxy@debian.org>  Wed, 28 Dec 2016 15:24:52 +0100
 
diff --git a/debian/patches/Fix-Unable-to-assign-undefined-to-int-log.patch b/debian/patches/Fix-Unable-to-assign-undefined-to-int-log.patch
deleted file mode 100644
index 1273ad095..000000000
--- a/debian/patches/Fix-Unable-to-assign-undefined-to-int-log.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Maximiliano Curia <maxy@gnuservers.com.ar>
-Date: Thu, 17 Nov 2016 10:01:49 +0100
-Subject: Fix "Unable to assign [undefined] to int" log
-
-The sddm breeze theme battery icon is trying to access the battery
-percent. In a batteryless system it produces the syslog message:
-Nov 14 22:28:23 samd sddm-greeter[3210]: file:///usr/share/sddm/themes/breeze/components/Battery.qml:39:18: Unable to assign [undefined] to int
-
-Based on https://gist.github.com/Zren/4e5709d842965227088f6e1d3fd42016
-
-Debian-Bug: https://bugs.debian.org/844194
----
- lookandfeel/contents/components/Battery.qml | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/lookandfeel/contents/components/Battery.qml b/lookandfeel/contents/components/Battery.qml
-index c4a94eb..c1bbf73 100644
---- a/lookandfeel/contents/components/Battery.qml
-+++ b/lookandfeel/contents/components/Battery.qml
-@@ -33,10 +33,19 @@ Row {
-         connectedSources: ["Battery", "AC Adapter"]
-     }
- 
-+    function getBatteryData(key, def) {
-+        var value = pmSource.data.Battery[key]
-+        if (typeof value === "undefined") {
-+            return def;
-+        } else {
-+            return value;
-+        }
-+    }
-+
-     PW.BatteryIcon {
-         id: battery
--        hasBattery: true
--        percent: pmSource.data["Battery"]["Percent"]
-+        hasBattery: getBatteryData("Has Battery", false)
-+        percent: getBatteryData("Percent", 100)
-         pluggedIn: pmSource.data["AC Adapter"] ? pmSource.data["AC Adapter"]["Plugged in"] : false
- 
-         height: batteryLabel.height
diff --git a/debian/patches/series b/debian/patches/series
index f72e68d76..8b5dcef41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 kubuntu_startkde-qtpath.diff
 disable_incompatible_tests
-Fix-Unable-to-assign-undefined-to-int-log.patch
 add_sddm_debian_breeze.patch

commit ed73d44929f4ff1396338b332470de160c5e6fab
Author: Maximiliano Curia <maxy@gnuservers.com.ar>
Date:   Wed Dec 28 15:24:52 2016 +0100

    New upstream release (5.8.5).

diff --git a/debian/changelog b/debian/changelog
index 2c9d41554..c340f7f6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+plasma-workspace (4:5.8.5-1~) UNRELEASED; urgency=medium
+
+  * New upstream release (5.8.5).
+
+ -- Maximiliano Curia <maxy@debian.org>  Wed, 28 Dec 2016 15:24:52 +0100
+
 plasma-workspace (4:5.8.4-1) unstable; urgency=medium
 
   * New upstream release (5.8.4)

commit 73bbc444d626c2044c6e64d805d4b664d3f349c2
Author: Maximiliano Curia <maxy@gnuservers.com.ar>
Date:   Thu Dec 1 16:05:48 2016 +0100

    Tweak the alternatives priorities
    
    Gbp-Dch: Ignore

diff --git a/debian/control b/debian/control
index 8f964fb26..c6a078942 100644
--- a/debian/control
+++ b/debian/control
@@ -262,11 +262,8 @@ Depends: plasma-framework,
          sddm-theme-breeze,
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: sddm,
-            desktop-base (>= 9.0.0~)
+Recommends: desktop-base (>= 9.0.0~), sddm
 Provides: sddm-theme
-Breaks: plasma-workspace (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa5)
-Replaces: plasma-workspace (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa5)
 Description: Debian Breeze SDDM theme
  Plasma Workspace for KF5. Workspaces provide
  support for KDE Plasma Widgets, integrated search,
diff --git a/debian/sddm-theme-breeze.postinst b/debian/sddm-theme-breeze.postinst
index fd3ded9b7..6db7ee6b6 100644
--- a/debian/sddm-theme-breeze.postinst
+++ b/debian/sddm-theme-breeze.postinst
@@ -5,7 +5,7 @@ if [[ "$1" = "configure" || "$1" = "abort-upgrade" || "$1" = "abort-remove" ]];
     update-alternatives --install \
         /usr/share/sddm/themes/debian-theme \
         sddm-debian-theme \
-        /usr/share/sddm/themes/breeze 20
+        /usr/share/sddm/themes/breeze 30
 fi
 
 # Tag to allow some debhelper commands to inject relevant code
diff --git a/debian/sddm-theme-debian-breeze.postinst b/debian/sddm-theme-debian-breeze.postinst
index bbad8c870..b842d2657 100644
--- a/debian/sddm-theme-debian-breeze.postinst
+++ b/debian/sddm-theme-debian-breeze.postinst
@@ -5,7 +5,7 @@ if [[ "$1" = "configure" || "$1" = "abort-upgrade" || "$1" = "abort-remove" ]];
     update-alternatives --install \
         /usr/share/sddm/themes/debian-theme \
         sddm-debian-theme \
-        /usr/share/sddm/themes/debian-breeze 50
+        /usr/share/sddm/themes/debian-breeze 60
 fi
 
 # Tag to allow some debhelper commands to inject relevant code

commit 73a38129b358a039301f86e436719aec63e0f10f
Author: Aurélien COUDERC <zecoucou@free.fr>
Date:   Wed Nov 30 21:29:12 2016 +0100

    Create debian-breeze SDDM theme, add alternatives for use by SDDM

diff --git a/debian/control b/debian/control
index 17caef9c9..8f964fb26 100644
--- a/debian/control
+++ b/debian/control
@@ -254,3 +254,24 @@ Description: Breeze SDDM theme
  Taskmanager library.
  .
  This package contains the files for the breeze SDDM theme.
+
+Package: sddm-theme-debian-breeze
+Architecture: any
+Depends: plasma-framework,
+         plasma-workspace,
+         sddm-theme-breeze,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: sddm,
+            desktop-base (>= 9.0.0~)
+Provides: sddm-theme
+Breaks: plasma-workspace (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa5)
+Replaces: plasma-workspace (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa5)
+Description: Debian Breeze SDDM theme
+ Plasma Workspace for KF5. Workspaces provide
+ support for KDE Plasma Widgets, integrated search,
+ hardware management and a high degree of customizability.
+ Taskmanager library.
+ .
+ This package contains the files for the breeze SDDM theme adapted
+ to use the active desktop-base theme for the background.
diff --git a/debian/patches/add_sddm_debian_breeze.patch b/debian/patches/add_sddm_debian_breeze.patch
new file mode 100644
index 000000000..d7313a2d7
--- /dev/null
+++ b/debian/patches/add_sddm_debian_breeze.patch
@@ -0,0 +1,51 @@
+Index: plasma-workspace/CMakeLists.txt
+===================================================================
+--- plasma-workspace.orig/CMakeLists.txt	2016-12-01 00:31:20.000000000 +0100
++++ plasma-workspace/CMakeLists.txt	2016-12-01 00:42:40.883970067 +0100
+@@ -122,6 +122,17 @@
+     #NOTE this trailing slash is important to rename the directory
+     install(DIRECTORY sddm-theme/ DESTINATION ${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze PATTERN "README.txt" EXCLUDE PATTERN "components" EXCLUDE PATTERN "dummydata" EXCLUDE)
+     install(DIRECTORY lookandfeel/contents/components DESTINATION ${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze PATTERN "README.txt" EXCLUDE)
++
++# Install Debian-themed SDDM theme
++    file(COPY "sddm-theme/Main.qml" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/sddm-theme-debian")
++    set(SED_EXPR "s=^[[:space:]]*import[[:space:]]*\\\"components\\\"[[:space:]]*$=import \\\"../breeze\\\"\\nimport \\\"../breeze/components\\\"=")
++    execute_process(COMMAND sed -i -e "${SED_EXPR}" "${CMAKE_CURRENT_SOURCE_DIR}/sddm-theme-debian/Main.qml" RESULT_VARIABLE SED_RES OUTPUT_VARIABLE SED_OUT ERROR_VARIABLE SED_ERR)
++    message("Result of sed replacement for debian-breeze imports in Main.qml: (Res: ${SED_RES}, Out: ${SED_OUT}, Err: ${SED_ERR})")
++
++    #NOTE this trailing slash is important to rename the directory
++    install(DIRECTORY sddm-theme-debian/ DESTINATION ${KDE_INSTALL_FULL_DATADIR}/sddm/themes/debian-breeze)
++    # Patch Main.qml to directly use ../breeze qml files
++
+ endif()
+ 
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+Index: plasma-workspace/sddm-theme-debian/metadata.desktop
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ plasma-workspace/sddm-theme-debian/metadata.desktop	2016-12-01 00:31:24.000000000 +0100
+@@ -0,0 +1,17 @@
++[SddmGreeterTheme]
++Name=Debian Breeze
++Description=Breeze Theme using Debian artwork
++Description[fr]=Thème brise utilisant l’apparence Debian
++Author=David Edmundson
++Copyright=(c) 2014, David Edmundson
++License=CC-BY-SA
++Type=sddm-theme
++Version=0.1
++Website=https://github.com/sddm/sddm
++Screenshot=preview.png
++MainScript=Main.qml
++ConfigFile=theme.conf
++TranslationsDirectory=translations
++Email=davidedmundson@kde.org
++Theme-Id=debian-breeze
++Theme-API=2.0
+Index: plasma-workspace/sddm-theme-debian/theme.conf
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ plasma-workspace/sddm-theme-debian/theme.conf	2016-12-01 00:31:24.000000000 +0100
+@@ -0,0 +1,2 @@
++[General]
++background=/usr/share/desktop-base/active-theme/login/background.svg
diff --git a/debian/patches/series b/debian/patches/series
index c2f626853..f72e68d76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kubuntu_startkde-qtpath.diff
 disable_incompatible_tests
 Fix-Unable-to-assign-undefined-to-int-log.patch
+add_sddm_debian_breeze.patch
diff --git a/debian/sddm-theme-breeze.postinst b/debian/sddm-theme-breeze.postinst
new file mode 100644
index 000000000..fd3ded9b7
--- /dev/null
+++ b/debian/sddm-theme-breeze.postinst
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+if [[ "$1" = "configure" || "$1" = "abort-upgrade" || "$1" = "abort-remove" ]]; then
+    update-alternatives --install \
+        /usr/share/sddm/themes/debian-theme \
+        sddm-debian-theme \
+        /usr/share/sddm/themes/breeze 20
+fi
+
+# Tag to allow some debhelper commands to inject relevant code
+#DEBHELPER#
+
diff --git a/debian/sddm-theme-breeze.prerm b/debian/sddm-theme-breeze.prerm
new file mode 100644
index 000000000..b40de9799
--- /dev/null
+++ b/debian/sddm-theme-breeze.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+    update-alternatives --remove \
+        sddm-debian-theme \
+        /usr/share/sddm/themes/breeze
+fi
+
+# Tag to allow some debhelper commands to inject relevant code
+#DEBHELPER#
+
diff --git a/debian/sddm-theme-debian-breeze.install b/debian/sddm-theme-debian-breeze.install
new file mode 100644
index 000000000..138706ddb
--- /dev/null
+++ b/debian/sddm-theme-debian-breeze.install
@@ -0,0 +1 @@
+usr/share/sddm/themes/debian-breeze
diff --git a/debian/sddm-theme-debian-breeze.postinst b/debian/sddm-theme-debian-breeze.postinst
new file mode 100644
index 000000000..bbad8c870
--- /dev/null
+++ b/debian/sddm-theme-debian-breeze.postinst
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+if [[ "$1" = "configure" || "$1" = "abort-upgrade" || "$1" = "abort-remove" ]]; then
+    update-alternatives --install \
+        /usr/share/sddm/themes/debian-theme \
+        sddm-debian-theme \
+        /usr/share/sddm/themes/debian-breeze 50
+fi
+
+# Tag to allow some debhelper commands to inject relevant code
+#DEBHELPER#
+
diff --git a/debian/sddm-theme-debian-breeze.prerm b/debian/sddm-theme-debian-breeze.prerm
new file mode 100644
index 000000000..926b04a52
--- /dev/null
+++ b/debian/sddm-theme-debian-breeze.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+    update-alternatives --remove \
+        sddm-debian-theme \
+        /usr/share/sddm/themes/debian-breeze
+fi
+
+# Tag to allow some debhelper commands to inject relevant code
+#DEBHELPER#
+
Reply to: