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

[David B Harris]

    Date: Saturday, February 28, 2004 @ 19:16:38
  Author: dbharris-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian

Modified: alsa-base.config alsa-base.postinst changelog

Update symlink handling to change the symlink to /etc/modutils/alsa/1.0


--------------------+
 alsa-base.config   |    4 ----
 alsa-base.postinst |    6 ++++--
 changelog          |    9 ++++++---
 3 files changed, 10 insertions(+), 9 deletions(-)


Index: debian/alsa-driver/debian/alsa-base.config
diff -u debian/alsa-driver/debian/alsa-base.config:1.36 debian/alsa-driver/debian/alsa-base.config:1.37
--- debian/alsa-driver/debian/alsa-base.config:1.36	Sat Feb 28 18:39:01 2004
+++ debian/alsa-driver/debian/alsa-base.config	Sat Feb 28 19:16:37 2004
@@ -74,10 +74,6 @@
   unregister("alsa-base/$_") if $ret[0] == 0;
 }
 
-if (-f "/etc/modutils/alsa" && ! -l "/etc/modutils/alsa") {
-  move_file("/etc/modutils/alsa", "/etc/alsa/modutils/1.0");
-}
-
 my @alsa_file = ();
 if (-f "/etc/alsa/modutils/1.0") {
 
Index: debian/alsa-driver/debian/alsa-base.postinst
diff -u debian/alsa-driver/debian/alsa-base.postinst:1.29 debian/alsa-driver/debian/alsa-base.postinst:1.30
--- debian/alsa-driver/debian/alsa-base.postinst:1.29	Sat Feb 28 18:52:14 2004
+++ debian/alsa-driver/debian/alsa-base.postinst	Sat Feb 28 19:16:37 2004
@@ -95,10 +95,12 @@
 	alsactl store >/dev/null 2>&1 || true
 fi
 
-if [ ! -e /etc/modutils/alsa ]; then
+modprobe_target="$(stat -c%N /etc/modprobe.d/alsa | sed "s#^\`/etc/modprobe\.d/alsa' -> \`\(/etc/alsa/modutils/0\.9\)'#\1#")"
+modutils_target="$(stat -c%N /etc/modutils/alsa | sed "s#^\`/etc/modutils/alsa' -> \`\(/etc/alsa/modutils/0\.9\)'#\1#")"
+if [ ! -e /etc/modutils/alsa ] || [ "$modutils_target" = "/etc/alsa/modutils/0.9" ]; then
 	ln -sf /etc/alsa/modutils/1.0 /etc/modutils/alsa
 fi
-if [ ! -e /etc/modprobe.d/alsa ]; then
+if [ ! -e /etc/modprobe.d/alsa ] || [ "$modprobe_target" = "/etc/alsa/modutils/0.9" ]; then
 	ln -sf /etc/alsa/modutils/1.0 /etc/modprobe.d/alsa
 fi
 /sbin/update-modules >/dev/null 2>&1
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.217 debian/alsa-driver/debian/changelog:1.218
--- debian/alsa-driver/debian/changelog:1.217	Sat Feb 28 19:09:31 2004
+++ debian/alsa-driver/debian/changelog	Sat Feb 28 19:16:37 2004
@@ -23,11 +23,14 @@
       your normal levels, not all-muted). (Closes: #233974)
     - Transition from /etc/modutils/alsa/0.9 to /etc/modutils/alsa/1.0:
       + debian/alsa-base.config: Use /etc/alsa/modutils/1.0 if it exists, and
-        if it doesn't try to use /etc/alsa/modutils/0.9.
+        if it doesn't try to use /etc/alsa/modutils/0.9. Additionally, stop
+        replacing /etc/modutils/alsa with a symlink if it's a non-symlink.
       + debian/alsa-base.examples, debian/modutils-0.9.conf: Move to
         modutils-1.0.conf
       + debian/alsa-base.postinst: Migrate /etc/alsa/modutils/0.9 to
-        /etc/alsa/modutils/1.0, if the latter doesn't exist.
+        /etc/alsa/modutils/1.0, if the latter doesn't exist. Update
+        /etc/{modprobe.d,modutils}/alsa symlinks if and only if they point to
+        0.9
       + debian/alsa-base.postrm: Remove known conffiles from
         /etc/alsa/modutils/ on purge
       + debian/alsa-base.README.Debian: Update
@@ -2637,4 +2640,4 @@
 
  -- Wichert Akkerman <wakkerma@debian.org>  Sun,  7 Jun 1998 16:53:01 +0200
 
-
+# vim: set expandtab: