[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 569d21aac206dfb3b90d01fd409afbe0c6352731

[Darren Salt]

The following commit has been merged in the master branch:
commit 569d21aac206dfb3b90d01fd409afbe0c6352731
Merge: 3261a14dde1c4da42167b5226261af93519deed8 c37040db0496377ac18b7ce0410e526db683d2d6
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Sun Mar 15 20:22:24 2009 +0000

    Merge branch 'support-2.6.28'

diff --combined debian/changelog
index 79d31b1,b7b5735..c25c0d0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -18,13 -18,15 +18,17 @@@ eeepc-acpi-scripts (1.0.12) UNRELEASED
      (which is 2dB for LineOut on at least ALC269 and ALC662).
    * Blacklist some ALSA volume controls; we want to alter only one of them.
      (Tested on ALC269 (901) and ALC662 (701).)
 +  * Cache audio control names etc. to avoid need to detect them every time
 +    the volume level is changed.
    * Enable audio power saving, defaulting to a 5-second delay before
      powering down. (snd_hda_intel power_save in /etc/modprobe.d/eeepc)
    * When locking the display, if all else fails, try xtrlock.
    * Prepare for netlink-enabled acpid: ignore lid-open events and handle
      differently-reported hotkey events.
+   * Modify /etc/modprobe.d/eeepc for Linux 2.6.27 and later.
+     The pciehp module's pciehp_slot_with_bus option was removed in 2.6.27,
+     and the module isn't needed in 2.6.29 since eeepc-laptop handles the
+     wireless hotplugging.
  
    [ Raphael Geissert ]
    * Auto detect the playback devices and the playback switches
@@@ -35,10 -37,6 +39,10 @@@
      present.
    * Fix detection of rfkill on systems that don't have it.
  
 +  [ Damyan Ivanov ]
 +  * rename etc/modprobe.d/eeepc to eeepc.conf, adapting to modprobe requirement
 +    Closes: #518573
 +
   -- Ben Armstrong <synrg at sanctuary.nslug.ns.ca>  Sat, 07 Feb 2009 14:47:15 -0400
  
  eeepc-acpi-scripts (1.0.11) unstable; urgency=low
diff --combined debian/rules
index 54ef99b,690ada2..f7e509d
--- a/debian/rules
+++ b/debian/rules
@@@ -32,9 -32,8 +32,9 @@@ install: buil
  	install -m 0755 etc/acpi/actions/* $(TMP)/etc/acpi/actions
  	install -m 0644 etc/acpi/events/* $(TMP)/etc/acpi/events
  	install -m 0644 etc/acpi/lib/* $(TMP)/etc/acpi/lib
 +	install -m 0755 etc/alsa/modprobe-post-install.d/* $(TMP)/etc/alsa/modprobe-post-install.d
  	install -m 0644 etc/modprobe.d/* $(TMP)/etc/modprobe.d
- 	install -m 0644 functions.sh $(TMP)/usr/share/$(PKG)/
+ 	install -m 0644 functions.sh pciehp.sh $(TMP)/usr/share/$(PKG)/
  
  binary-indep: build install
  	dh_testdir
diff --combined etc/modprobe.d/eeepc.conf
index 8e8d7a4,20a28b0..20a28b0
--- a/etc/modprobe.d/eeepc.conf
+++ b/etc/modprobe.d/eeepc.conf
@@@ -1,4 -1,5 +1,5 @@@
  # module options specific for Asus EeePC
  blacklist pcspkr
- options pciehp pciehp_force=1 pciehp_slot_with_bus=1
+ # different kernel versions, different options...
+ install pciehp sh /usr/share/eeepc-acpi-scripts/pciehp.sh
  options snd_hda_intel power_save=5

-- 
Maintenance of eeepc-acpi-scripts debian package