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

Proposed by Daniel T Chen on 2009-03-29
Status: Merged
Merged at revision: 22
Proposed branch: lp:~crimsun/alsa-lib/ubuntu.new
Merge into: lp:~ubuntu-core-dev/alsa-lib/ubuntu.new
Diff against target: None lines
To merge this branch: bzr merge lp:~crimsun/alsa-lib/ubuntu.new
Reviewer Review Type Date Requested Status
Luke Yelavich 2009-03-29 Approve on 2009-03-30
Review via email: mp+5017@code.launchpad.net
To post a comment you must log in.
lp:~crimsun/alsa-lib/ubuntu.new updated on 2009-03-30
22. By Luke Yelavich on 2009-03-30

merge from crimsun's branch

Luke Yelavich (themuso) wrote :

 review approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'changelog'
2--- changelog 2009-03-23 05:29:23 +0000
3+++ changelog 2009-03-29 22:14:05 +0000
4@@ -1,3 +1,10 @@
5+alsa-lib (1.0.18-1ubuntu9) UNRELEASED; urgency=low
6+
7+ * Don't display notifier hint if ~/.asoundrc and
8+ ~/.asoundrc.asoundconf aren't writable, either
9+
10+ -- Daniel T Chen <crimsun@ubuntu.com> Sun, 29 Mar 2009 18:10:58 -0400
11+
12 alsa-lib (1.0.18-1ubuntu8) jaunty; urgency=low
13
14 * Don't display notifier hint if in GNOME (LP: #328245)
15
16=== modified file 'libasound2.postinst'
17--- libasound2.postinst 2009-03-23 05:29:23 +0000
18+++ libasound2.postinst 2009-03-29 22:14:05 +0000
19@@ -15,7 +15,7 @@
20 unud=/var/lib/update-notifier/user.d
21
22 if [ -d $unud ]; then
23- if [ -z "$GNOME_DESKTOP_SESSION_ID" ]; then
24+ if [ -z "$GNOME_DESKTOP_SESSION_ID" ] && [ -w ~/.asoundrc ] && [ -w ~/.asoundrc.asoundconf ]; then
25 cp -f /usr/share/alsa/user-must-execute-asoundconf-set-default-card.update-notifier \
26 "$unud/user-must-execute-asoundconf-set-default-card"
27 fi
28
29=== modified file 'user-must-execute-asoundconf-set-default-card.update-notifier'
30--- user-must-execute-asoundconf-set-default-card.update-notifier 2009-03-23 05:29:23 +0000
31+++ user-must-execute-asoundconf-set-default-card.update-notifier 2009-03-29 22:14:05 +0000
32@@ -2,7 +2,7 @@
33 Priority: High
34 Terminal: True
35 DontShowAfterReboot: False
36-DisplayIf: [ -z "$GNOME_DESKTOP_SESSION_ID" ]
37+DisplayIf: [ -z "$GNOME_DESKTOP_SESSION_ID" ] && [ -w ~/.asoundrc ] && [ -w ~/.asoundrc.asoundconf ]
38 Description: New Advanced Linux Sound Architecture (ALSA) configuration presets
39 have been added. Please execute the asoundconf(1) set-default-card macro in
40 a Terminal now to refresh your user's configuration presets. You may

Subscribers

People subscribed via source and target branches

to all changes: