diff options
| author | Victor Lowther <victor.lowther@gmail.com> | 2010-06-12 13:07:51 -0500 |
|---|---|---|
| committer | Victor Lowther <victor.lowther@gmail.com> | 2010-06-12 13:07:51 -0500 |
| commit | a4e4b0ce456c66d01d9c5f09a73242d2db6c65e9 (patch) | |
| tree | 6458917d6687efbe652bfb0ff6553ae4575edd18 | |
| parent | cbb1de4dd5c79641169316e232b630662ecbf46f (diff) | |
Update git tree packaging to conflict with laptop-mode-tools
The new powermanagement scripts conflict with laptop-mode-tools.
Make sure both are not installed at the same time.
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | pm-utils.spec.in | 1 |
3 files changed, 3 insertions, 1 deletions
@@ -5,7 +5,7 @@ pkgdesc="Utilities and scripts for suspend and hibernate power management" arch=('i686' 'x86_64') url="http://pm-utils.freedesktop.org" license=('GPL') -conflicts=('pm-utils') +conflicts=('pm-utils' 'laptop-mode-tools') provides=('pm-utils=9999') depends=('bash' 'procps' 'vbetool' 'pm-quirks') optdepends=('upower') diff --git a/debian/control b/debian/control index 8f21405..5ac10fe 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Standards-Version: 3.7.2 Package: pm-utils Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, powermgmt-base +Conflicts: laptop-mode-tools Recommends: uswsusp, vbetool, radeontool Description: utilities and scripts for power management This packages provides simple shell command line tools to suspend and diff --git a/pm-utils.spec.in b/pm-utils.spec.in index 1b314ae..8548625 100644 --- a/pm-utils.spec.in +++ b/pm-utils.spec.in @@ -13,6 +13,7 @@ Requires: hdparm %ifarch %{ix86} x86_64 Requires: vbetool %endif +Conflicts: laptop-mode-tools BuildRequires: xmlto BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) |