Merge lp:~crimsun/alsa-lib/ubuntu.new into lp:~ubuntu-core-dev/alsa-lib/ubuntu.new

[Daniel T Chen]

[lp:~crimsun/alsa-lib/ubuntu.new]

22. By Luke Yelavich on 2009-03-30

merge from crimsun's branch

[Luke Yelavich (themuso)]

 review approve

review: Approve

=== modified file 'changelog'
--- changelog	2009-03-23 05:29:23 +0000
+++ changelog	2009-03-29 22:14:05 +0000
@@ -1,3 +1,10 @@
+alsa-lib (1.0.18-1ubuntu9) UNRELEASED; urgency=low
+
+  * Don't display notifier hint if ~/.asoundrc and
+    ~/.asoundrc.asoundconf aren't writable, either
+
+ -- Daniel T Chen <[e-mail]>  Sun, 29 Mar 2009 18:10:58 -0400
+
 alsa-lib (1.0.18-1ubuntu8) jaunty; urgency=low
 
   * Don't display notifier hint if in GNOME (LP: #328245)
 
=== modified file 'libasound2.postinst'
--- libasound2.postinst	2009-03-23 05:29:23 +0000
+++ libasound2.postinst	2009-03-29 22:14:05 +0000
@@ -15,7 +15,7 @@
 unud=/var/lib/update-notifier/user.d
 
 if [ -d $unud ]; then
-    if [ -z "$GNOME_DESKTOP_SESSION_ID" ]; then
+    if [ -z "$GNOME_DESKTOP_SESSION_ID" ] && [ -w ~/.asoundrc ] && [ -w ~/.asoundrc.asoundconf ]; then
 	cp -f /usr/share/alsa/user-must-execute-asoundconf-set-default-card.update-notifier \
 	    "$unud/user-must-execute-asoundconf-set-default-card" 
     fi
 
=== modified file 'user-must-execute-asoundconf-set-default-card.update-notifier'
--- user-must-execute-asoundconf-set-default-card.update-notifier	2009-03-23 05:29:23 +0000
+++ user-must-execute-asoundconf-set-default-card.update-notifier	2009-03-29 22:14:05 +0000
@@ -2,7 +2,7 @@
 Priority: High
 Terminal: True
 DontShowAfterReboot: False
-DisplayIf: [ -z "$GNOME_DESKTOP_SESSION_ID" ]
+DisplayIf: [ -z "$GNOME_DESKTOP_SESSION_ID" ] && [ -w ~/.asoundrc ] && [ -w ~/.asoundrc.asoundconf ]
 Description: New Advanced Linux Sound Architecture (ALSA) configuration presets
  have been added.  Please execute the asoundconf(1) set-default-card macro in
  a Terminal now to refresh your user's configuration presets.  You may