Bug#1051229: tlp 1.6 doesn't conflict with power-profile-daemon anymore

2023-09-28 Thread Raphaël Halimi 

Control: tags -1 wontfix
Control: close -1

Dear Sebastien,

Thanks for your suggestion and your patch, but I prefer to follow 
upstream's advice and keep the conflict in place to disallow 
co-installation of TLP and PPD.


Regards,

--
Raphaël Halimi

Bug#1051229: tlp 1.6 doesn't conflict with power-profile-daemon anymore

2023-09-04 Thread Sebastien Bacher 

Package: tlp
Version: 1.6.0-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu mantic ubuntu-patch

Reading the changelog from 1.6.0-beta.1

    - Allow coexistence with power-profiles-daemon: do not apply
  PLATFORM_PROFILE_ON_AC/BAT, CPU_ENERGY_PERF_POLICY_ON_AC/BAT and
  CPU_BOOST_ON_BAT/BAT when it is running

The package conflicts isn't needed anymore, the attached patch removes it
diff -Nru tlp-1.6.0/debian/changelog tlp-1.6.0/debian/changelog
--- tlp-1.6.0/debian/changelog	2023-08-30 15:02:39.0 +0200
+++ tlp-1.6.0/debian/changelog	2023-09-04 20:43:27.0 +0200
@@ -1,3 +1,10 @@
+tlp (1.6.0-2) UNRELEASED; urgency=medium
+
+  * Remove the conflicts with power-profile-daemon, the new version
+has been made to adapt its behaviour when the service is installed
+
+ -- Sebastien Bacher   Mon, 04 Sep 2023 20:43:27 +0200
+
 tlp (1.6.0-1) unstable; urgency=medium
 
   * New upstream version 1.6.0
diff -Nru tlp-1.6.0/debian/control tlp-1.6.0/debian/control
--- tlp-1.6.0/debian/control	2023-08-30 15:02:24.0 +0200
+++ tlp-1.6.0/debian/control	2023-09-04 20:43:10.0 +0200
@@ -13,7 +13,7 @@
 Depends: hdparm, iw, pciutils, rfkill, usbutils, ${misc:Depends}
 Recommends: tlp-rdw, ethtool
 Suggests: tp-smapi-dkms, smartmontools, ${dist:Suggests}
-Conflicts: laptop-mode-tools, power-profiles-daemon
+Conflicts: laptop-mode-tools
 Description: Optimize laptop battery life
  TLP is a feature-rich command-line utility, saving laptop battery power
  without the need to delve deeper into technical details.