[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 87d70477235c51ed9d678306f4934f19cd825236
Author: Luca Niccoli <lultimouomo at gmail.com>
Date:   Wed May 12 01:06:04 2010 +0200

    Update debian/control and maintainer scripts for the migration to acpi-support: get rid of old conffiles, conflict and replace old eeepc-acpi-support
    
    Signed-off-by: Luca Niccoli <lultimouomo at gmail.com>

diff --git a/debian/control b/debian/control
index 828d3e8..efddc45 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,8 @@ 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
diff --git a/debian/postinst b/debian/postinst
index 70aad5f..94882e3 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -10,6 +10,13 @@ case "$1" in
             invoke-rc.d acpid restart>/dev/null
             ;;
         esac
+        # move eeepc-amixer-blacklist that could have been left behind
+        # if the user had changed it.
+        if ( dpkg --compare-versions "$2" le "1.1.10" &&
+            [ -e /etc/acpi/lib/eeepc-amixer-blacklist ] ); then
+            mv /etc/acpi/lib/eeepc-amixer-blacklist /etc/acpi/eeepc-amixer-blacklist
+            rmdir /etc/acpi/lib/ || true
+        fi
         /lib/udev/eeepc-acpi-scripts
 
         # we no longer configure stop init.d symlinks
diff --git a/debian/preinst b/debian/preinst
index 2ddaddf..52e4bf8 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -23,7 +23,29 @@ case "$1" in
         if dpkg --compare-versions "$2" le "1.1.10"; then
             prep_mv_conffile "/etc/acpi/events/ac_adapter_inserted"
             prep_mv_conffile "/etc/acpi/events/ac_adapter_removed"
+            prep_mv_conffile "/etc/acpi/events/hotkey"
+            prep_mv_conffile "/etc/acpi/events/hotkey-button"
+            prep_mv_conffile "/etc/acpi/events/hotkey-netlink"
+            prep_mv_conffile "/etc/acpi/events/hotkey-video"
+            prep_mv_conffile "/etc/acpi/events/lid"
+            prep_mv_conffile "/etc/acpi/events/sleep"
+            prep_mv_conffile "/etc/acpi/events/sleep-netlink"
             prep_mv_conffile "/etc/acpi/actions/ac_adapter.sh"
+            prep_mv_conffile "/etc/acpi/actions/gsm.sh"
+            prep_mv_conffile "/etc/acpi/actions/hotkey.sh"
+            prep_mv_conffile "/etc/acpi/actions/lid.sh"
+            prep_mv_conffile "/etc/acpi/actions/sleep.sh"
+            prep_mv_conffile "/etc/acpi/actions/suspend.sh"
+            prep_mv_conffile "/etc/acpi/actions/vga-toggle.sh"
+            prep_mv_conffile "/etc/acpi/actions/volume.sh"
+            prep_mv_conffile "/etc/acpi/actions/wireless.sh"
+            prep_mv_conffile "/etc/acpi/lib/bluetooth.sh"
+            prep_mv_conffile "/etc/acpi/lib/camera.sh"
+            prep_mv_conffile "/etc/acpi/lib/eeepc-amixer-blacklist"
+            prep_mv_conffile "/etc/acpi/lib/notify.sh"
+            prep_mv_conffile "/etc/acpi/lib/shengine.sh"
+            prep_mv_conffile "/etc/acpi/lib/sound.sh"
+            prep_mv_conffile "/etc/acpi/lib/touchpad.sh"
         fi
     ;;
 

-- 
Maintenance of eeepc-acpi-scripts debian package