[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 75982e716757fa90a60b056b827b8d674589fc25
Author: Luca Niccoli <lultimouomo at gmail.com>
Date:   Tue May 18 16:28:09 2010 +0200

    We don't need to conflict with ourselves, after all.
    
    Signed-off-by: Luca Niccoli <lultimouomo at gmail.com>

diff --git a/debian/control b/debian/control
index efddc45..828d3e8 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,6 @@ DM-Upload-Allowed: yes
 
 Package: eeepc-acpi-scripts
 Architecture: all
-Conflicts: eeepc-acpi-scripts (<= 1.1.10)
-Replaces: eeepc-acpi-scripts (<= 1.1.10)
 Depends: acpid (>= 1.0.8-6), acpi-support-base, acpi-support, pm-utils, rfkill (>= 0.3-3),
  ${misc:Depends}
 Recommends: alsa-utils

-- 
Maintenance of eeepc-acpi-scripts debian package