[neon/backports-jammy/power-profiles-daemon/Neon/unstable] debian: 0.10.1-3 (patches unapplied)

[git-ubuntu importer]

Git commit 00ec483ae11653ea57e1c92a1501004b2438755b by git-ubuntu importer, on behalf of Sebastien Bacher.
Committed on 05/03/2022 at 22:35.
Pushed by carlosdem into branch 'Neon/unstable'.

0.10.1-3 (patches unapplied)

Imported using git-ubuntu import.

M  +11   -0    debian/changelog
A  +18   -0    debian/patches/remove_tlp_conflict.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/backports-jammy/power-profiles-daemon/-/commit/00ec483ae11653ea57e1c92a1501004b2438755b

diff --git a/debian/changelog b/debian/changelog
index 62780cd..14afa9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+power-profiles-daemon (0.10.1-3) unstable; urgency=medium
+
+  * debian/patches/remove_tlp_conflict.patch:
+    - remove the systemd unit conflict on tlp.service. We don't want that in
+      Ubuntu since we patch tlp to not do performance modes changes when
+      power-profiles-daemon is active but the change can be included in
+      Debian also since the tlp maintainer made the packages conflict
+      which means we can't end up installed together.
+
+ -- Sebastien Bacher <seb128 at ubuntu.com>  Sat, 05 Mar 2022 18:17:30 +0100
+
 power-profiles-daemon (0.10.1-2) unstable; urgency=medium
 
   * debian/tests: remove for now since changes in the new versions are
diff --git a/debian/patches/remove_tlp_conflict.patch b/debian/patches/remove_tlp_conflict.patch
new file mode 100644
index 0000000..e334e26
--- /dev/null
+++ b/debian/patches/remove_tlp_conflict.patch
@@ -0,0 +1,18 @@
+Description: remove the systemd unit conflict on tlp.service
+we don't want that in Ubuntu since we patch tlp to not do performance modes
+changes when power-profiles-daemon is active but the change can be
+included in Debian also since the tlp maintainer made the packages conflict
+which means we can't end up installed together
+forwarded: not-needed
+Index: power-profiles-daemon/data/power-profiles-daemon.service.in
+===================================================================
+--- power-profiles-daemon.orig/data/power-profiles-daemon.service.in
++++ power-profiles-daemon/data/power-profiles-daemon.service.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Power Profiles daemon
+-Conflicts=tuned.service tlp.service auto-cpufreq.service system76-power.service
++Conflicts=tuned.service auto-cpufreq.service system76-power.service
+ Before=multi-user.target display-manager.target
+ 
+ [Service]
diff --git a/debian/patches/series b/debian/patches/series
index 1a4a0bc..8675d1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 build_older_polkit.patch
+remove_tlp_conflict.patch