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

[Thomas Hood]

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

Modified: changelog patches/92_debian_alsaconf_restore.dpatch rules

Use /usr/lib/alsa/ rather than /usr/lib/alsa-utils for modprobe-post-install


-------------------------------------------+
 changelog                                 |    4 ++--
 patches/92_debian_alsaconf_restore.dpatch |    4 +---
 rules                                     |    6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)


Index: debian/alsa-utils/debian/changelog
diff -u debian/alsa-utils/debian/changelog:1.50 debian/alsa-utils/debian/changelog:1.51
--- debian/alsa-utils/debian/changelog:1.50	Mon Sep 20 08:51:47 2004
+++ debian/alsa-utils/debian/changelog	Mon Sep 20 09:08:29 2004
@@ -5,7 +5,7 @@
   * Thomas Hood:
     - aconnect.c
       + 50_aconnect_betwen: 'betwen' -> 'between'
-    - /usr/lib/alsa-utils/modprobe-post-install
+    - /usr/lib/alsa/modprobe-post-install
       + Add
     - alsaconf.in:
       + Split up 90_debian_alsaconf into three patches:
@@ -21,7 +21,7 @@
         . Don't really clear screen; just newline  (Closes: #261850)
       + Add 92_debian_alsaconf_restore:
         . Set up module loader to do
-          /usr/lib/alsa-utils/modprobe-post-install (Closes: #268221)
+          /usr/lib/alsa/modprobe-post-install (Closes: #268221)
     - amixer.1
       + Add 15_amixer_doc_bug271556:
         . Fix formatting  (Closes #271556)
Index: debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch
diff -u debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch:1.4 debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch:1.5
--- debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch:1.4	Mon Sep 20 08:51:47 2004
+++ debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch	Mon Sep 20 09:08:29 2004
@@ -24,16 +24,16 @@
 
 @DPATCH@
 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
+--- /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-20 16:53:16.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-20 16:53:49.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/lib/alsa-utils/modprobe-post-install" >> $addcfg
++	echo "post-install $CARD_DRIVER /usr/lib/alsa/modprobe-post-install" >> $addcfg
 +    else
-+	echo "install $CARD_DRIVER /sbin/modprobe --ignore-install $CARD_DRIVER && /usr/lib/alsa-utils/modprobe-post-install" >> $addcfg
++	echo "install $CARD_DRIVER /sbin/modprobe --ignore-install $CARD_DRIVER && /usr/lib/alsa/modprobe-post-install" >> $addcfg
 +    fi
  
      if [ -n "$cfgout" ]; then
Index: debian/alsa-utils/debian/rules
diff -u debian/alsa-utils/debian/rules:1.4 debian/alsa-utils/debian/rules:1.5
--- debian/alsa-utils/debian/rules:1.4	Mon Sep 20 08:51:47 2004
+++ debian/alsa-utils/debian/rules	Mon Sep 20 09:08:29 2004
@@ -63,13 +63,13 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdirs usr/lib/alsa-utils
+	dh_installdirs usr/lib/alsa
 	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
+	cp debian/modprobe-post-install debian/alsa-utils/usr/lib/alsa/modprobe-post-install
+	chmod ugo+x debian/alsa-utils/usr/lib/alsa/modprobe-post-install
 	dh_installchangelogs ChangeLog
 	dh_installmenu
 	dh_strip