Merge lp:~noskcaj/ubuntu/utopic/xfce4-power-manager/apply-patch into lp:ubuntu/utopic/xfce4-power-manager

Proposed by Jackson Doak
Status: Merged
Merge reported by: Dmitry Shachnev
Merged at revision: not available
Proposed branch: lp:~noskcaj/ubuntu/utopic/xfce4-power-manager/apply-patch
Merge into: lp:ubuntu/utopic/xfce4-power-manager
Diff against target: 22 lines (+7/-0)
2 files modified
debian/changelog (+6/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/utopic/xfce4-power-manager/apply-patch
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+221642@code.launchpad.net

Description of the change

Actually apply the patch from the previous upload

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-05-27 00:03:16 +0000
3+++ debian/changelog 2014-06-01 22:17:45 +0000
4@@ -1,3 +1,9 @@
5+xfce4-power-manager (1.2.0-3ubuntu6) utopic; urgency=medium
6+
7+ * Actually use the 10_inhibit_logind.patch
8+
9+ -- Jackson Doak <noskcaj@ubuntu.com> Mon, 02 Jun 2014 08:07:35 +1000
10+
11 xfce4-power-manager (1.2.0-3ubuntu5) utopic; urgency=medium
12
13 * Add 10_inhibit_logind.patch (Fixes LP: #1303736, Closes LP: #1323367)
14
15=== modified file 'debian/patches/series'
16--- debian/patches/series 2014-04-07 10:09:14 +0000
17+++ debian/patches/series 2014-06-01 22:17:45 +0000
18@@ -8,3 +8,4 @@
19 07_fix-screen-dimming.patch
20 08_show_preferences_lxde.patch
21 09_sync_session_xfpm_lock_setting.patch
22+10_inhibit_logind.patch

Subscribers

People subscribed via source and target branches

to all changes: