[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 1.1.5-74-g83c9b5c

[Ben Armstrong]

The following commit has been merged in the master branch:
commit 7caf33c5a862533247f09e7b8eb88c40b2510b0d
Author: Luca Niccoli <lultimouomo at gmail.com>
Date:   Fri Apr 23 19:02:11 2010 +0200

    Stop conflicting with acpi-support; depend on it.
    Make love, not war!
    
    Signed-off-by: Luca Niccoli <lultimouomo at gmail.com>

diff --git a/debian/control b/debian/control
index d9cce2c..828d3e8 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,7 @@ DM-Upload-Allowed: yes
 
 Package: eeepc-acpi-scripts
 Architecture: all
-Conflicts: acpi-support
-Depends: acpid (>= 1.0.8-6), acpi-support-base, pm-utils, rfkill (>= 0.3-3),
+Depends: acpid (>= 1.0.8-6), acpi-support-base, acpi-support, pm-utils, rfkill (>= 0.3-3),
  ${misc:Depends}
 Recommends: alsa-utils
 Suggests: aosd-cat, ttf-dejavu | ttf-bitstream-vera | ttf-freefont

-- 
Maintenance of eeepc-acpi-scripts debian package