[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian (alsa-base.postinst changelog)

[David B Harris]

    Date: Saturday, February 28, 2004 @ 18:52:15
  Author: dbharris-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian

Modified: alsa-base.postinst changelog

Migrate /etc/alsa/modutils/0.9 to /etc/alsa/modutils/1.0, if the latter doesn't exist - also do so before we do anything with /etc/alsa/modutils/1.0


--------------------+
 alsa-base.postinst |   12 ++++++------
 changelog          |    4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)


Index: debian/alsa-driver/debian/alsa-base.postinst
diff -u debian/alsa-driver/debian/alsa-base.postinst:1.28 debian/alsa-driver/debian/alsa-base.postinst:1.29
--- debian/alsa-driver/debian/alsa-base.postinst:1.28	Fri Feb 27 18:31:39 2004
+++ debian/alsa-driver/debian/alsa-base.postinst	Sat Feb 28 18:52:14 2004
@@ -41,6 +41,12 @@
 		printf "### DEBCONF MAGIC\n# This file was automatically generated by alsa-base's debconf stuff\n\n" > "$debconfbit"
 		filetodumpto="$(tempfile)"
 		cat "$debconfbit" /usr/share/alsa-base/modules-snippet.conf "$tempfile" > "$filetodumpto"
+		if dpkg --compare-versions "$2" lt "1.0+0beta10-1"; then
+			if [ -f /etc/alsa/modutils/0.9 -a ! -f /etc/alsa/modutils/1.0 ]; then
+				echo "Moving ALSA 1.0 configuration file back to ALSA 1.0."
+				mv /etc/alsa/modutils/0.9 /etc/alsa/modutils/1.0
+			fi
+		fi
 		if [ ! -f /etc/alsa/modutils/1.0 ] || grep -Eq \
             "^[[:space:]]*### DEBCONF MAGIC$" /etc/alsa/modutils/1.0 ; then
 			if [ -f /etc/alsa/modutils/1.0 ]; then
@@ -66,12 +72,6 @@
 			-e "s/alsactl_store_on_shutdown=.*/alsactl_store_on_shutdown=$alsactl_store_on_shutdown/" /etc/default/alsa > /etc/default/alsa.tmp
 			mv /etc/default/alsa /etc/default/alsa.debconf-backup
 			mv /etc/default/alsa.tmp /etc/default/alsa
-		fi
-		if dpkg --compare-versions "$2" lt "1.0+0beta10-1"; then
-			if [ -f /etc/alsa/modutils/1.0 -a ! -f /etc/alsa/modutils/1.0 ]; then
-				echo "Moving ALSA 1.0 configuration file back to ALSA 1.0."
-				mv /etc/alsa/modutils/1.0 /etc/alsa/modutils/1.0
-			fi
 		fi
 		if [ -x /usr/sbin/update-devfsd ]; then
 			/usr/sbin/update-devfsd >&2
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.214 debian/alsa-driver/debian/changelog:1.215
--- debian/alsa-driver/debian/changelog:1.214	Sat Feb 28 18:45:03 2004
+++ debian/alsa-driver/debian/changelog	Sat Feb 28 18:52:14 2004
@@ -26,11 +26,13 @@
         if it doesn't only then use /etc/alsa/modutils/0.9.
       + 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.
       + debian/alsa-base.README.Debian: Update
       + debian/alsa-source.README.Debian: Update
   * Unreleased.
 
- -- David B. Harris <dbharris@debian.org>  Thu, 26 Feb 2004 19:16:13 -0500
+ -- David B. Harris <dbharris@debian.org>  Sat, 28 Feb 2004 12:49:38 -0500
 
 alsa-driver (1.0.2c-3) unstable; urgency=low