Merge lp:~cyphermox/ubuntu/natty/casper/lp656757 into lp:ubuntu/natty/casper

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: 849
Proposed branch: lp:~cyphermox/ubuntu/natty/casper/lp656757
Merge into: lp:ubuntu/natty/casper
Diff against target: 27 lines (+9/-1)
2 files modified
debian/changelog (+8/-0)
scripts/casper-bottom/44pk_allow_ubuntu (+1/-1)
To merge this branch: bzr merge lp:~cyphermox/ubuntu/natty/casper/lp656757
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+42683@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-11-29 13:28:44 +0000
+++ debian/changelog 2010-12-03 20:23:56 +0000
@@ -1,3 +1,11 @@
1casper (1.251) UNRELEASED; urgency=low
2
3 * scripts/casper-bottom/44pk_allow_ubuntu: Tweak the default PolicyKit
4 policy to avoid dropping wireless connections when a user switches to
5 another VT (LP: #656757)
6
7 -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 02 Dec 2010 15:55:58 -0500
8
1casper (1.250) natty; urgency=low9casper (1.250) natty; urgency=low
210
3 * Use LDLIBS rather than LDFLAGS for 'pkg-config --libs ply-boot-client',11 * Use LDLIBS rather than LDFLAGS for 'pkg-config --libs ply-boot-client',
412
=== modified file 'scripts/casper-bottom/44pk_allow_ubuntu'
--- scripts/casper-bottom/44pk_allow_ubuntu 2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/44pk_allow_ubuntu 2010-12-03 20:23:56 +0000
@@ -49,7 +49,7 @@
49Identity=unix-user:$USERNAME49Identity=unix-user:$USERNAME
50Action=*50Action=*
51ResultAny=no51ResultAny=no
52ResultInactive=no52ResultInactive=yes
53ResultActive=yes53ResultActive=yes
54EOF54EOF
5555

Subscribers

People subscribed via source and target branches