[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-utils/debian (4 files)

[Thomas Hood]

    Date: Monday, September 20, 2004 @ 08:51:48
  Author: jdthood-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-utils/debian

   Added: modprobe-post-install
Modified: changelog patches/92_debian_alsaconf_restore.dpatch rules

Implement the modprobe-post-install thing


-------------------------------------------+
 changelog                                 |    8 +++++---
 modprobe-post-install                     |    2 ++
 patches/92_debian_alsaconf_restore.dpatch |   10 +++-------
 rules                                     |    4 +++-
 4 files changed, 13 insertions(+), 11 deletions(-)


Index: debian/alsa-utils/debian/changelog
diff -u debian/alsa-utils/debian/changelog:1.49 debian/alsa-utils/debian/changelog:1.50
--- debian/alsa-utils/debian/changelog:1.49	Mon Sep 20 07:05:51 2004
+++ debian/alsa-utils/debian/changelog	Mon Sep 20 08:51:47 2004
@@ -1,10 +1,12 @@
-alsa-utils (1.0.6-1) unstable; urgency=medium
+alsa-utils (1.0.6-1) unstable; urgency=low
 
   * **** Unreleased ****
   * New upstream release.
   * Thomas Hood:
     - aconnect.c
       + 50_aconnect_betwen: 'betwen' -> 'between'
+    - /usr/lib/alsa-utils/modprobe-post-install
+      + Add
     - alsaconf.in:
       + Split up 90_debian_alsaconf into three patches:
         . 90_debian_alsaconf_paths
@@ -18,8 +20,8 @@
       + Add 91_debian_alsaconf_noclear:
         . Don't really clear screen; just newline  (Closes: #261850)
       + Add 92_debian_alsaconf_restore:
-        . Set up module loader to do "alsactl restore" post install
-          (Closes: #268221)
+        . Set up module loader to do
+          /usr/lib/alsa-utils/modprobe-post-install (Closes: #268221)
     - amixer.1
       + Add 15_amixer_doc_bug271556:
         . Fix formatting  (Closes #271556)
Index: debian/alsa-utils/debian/modprobe-post-install
diff -u /dev/null debian/alsa-utils/debian/modprobe-post-install:1.1
--- /dev/null	Mon Sep 20 08:51:48 2004
+++ debian/alsa-utils/debian/modprobe-post-install	Mon Sep 20 08:51:47 2004
@@ -0,0 +1,2 @@
+#!/bin/sh
+alsactl restore
Index: debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch
diff -u debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch:1.3 debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch:1.4
--- debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch:1.3	Tue Sep  7 02:24:26 2004
+++ debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch	Mon Sep 20 08:51:47 2004
@@ -23,19 +23,17 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
---- /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:10:22.000000000 +0200
-+++ alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:11:28.000000000 +0200
-@@ -610,6 +610,13 @@
+diff -urNad /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
+--- /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-20 16:25:28.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-20 16:27:28.000000000 +0200
+@@ -609,6 +609,11 @@
      if [ -n "$CARD_OPTS" ]; then
  	echo "options $CARD_DRIVER $CARD_OPTS" >> $addcfg
      fi
 +    if [ "$kernel" = old ] ; then
-+	echo "post-install $CARD_DRIVER /usr/sbin/alsactl restore
-+#pre-remove $CARD_DRIVER /usr/sbin/alsactl store" >> $addcfg
++	echo "post-install $CARD_DRIVER /usr/lib/alsa-utils/modprobe-post-install" >> $addcfg
 +    else
-+	echo "install $CARD_DRIVER /sbin/modprobe --ignore-install $CARD_DRIVER && /usr/sbin/alsactl restore
-+#remove $CARD_DRIVER /usr/sbin/alsactl store ; /sbin/modprobe --remove --ignore-remove $CARD_DRIVER" >> $addcfg
++	echo "install $CARD_DRIVER /sbin/modprobe --ignore-install $CARD_DRIVER && /usr/lib/alsa-utils/modprobe-post-install" >> $addcfg
 +    fi
  
      if [ -n "$cfgout" ]; then
Index: debian/alsa-utils/debian/rules
diff -u debian/alsa-utils/debian/rules:1.3 debian/alsa-utils/debian/rules:1.4
--- debian/alsa-utils/debian/rules:1.3	Sat Jul 10 17:35:39 2004
+++ debian/alsa-utils/debian/rules	Mon Sep 20 08:51:47 2004
@@ -63,11 +63,13 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdirs
+	dh_installdirs usr/lib/alsa-utils
 	dh_link
 	dh_installdocs
 	mv debian/alsa-utils/usr/share/doc/alsa-utils/patch-stamp debian/alsa-utils/usr/share/doc/alsa-utils/PATCHES
 	cp alsamixer/README debian/alsa-utils/usr/share/doc/alsa-utils/README.alsamixer
+	cp debian/modprobe-post-install debian/alsa-utils/usr/lib/alsa-utils/modprobe-post-install
+	chmod ugo+x debian/alsa-utils/usr/lib/alsa-utils/modprobe-post-install
 	dh_installchangelogs ChangeLog
 	dh_installmenu
 	dh_strip