Merge lp:~jbicha/lightdm-webkit-greeter/lp1588037-obsolete-webkit-dependency into lp:~ubuntu-desktop/lightdm-webkit-greeter/ubuntu

Proposed by Jeremy Bicha on 2016-06-01
Status: Merged
Approved by: Michael Terry on 2016-06-01
Approved revision: 7
Merged at revision: 6
Proposed branch: lp:~jbicha/lightdm-webkit-greeter/lp1588037-obsolete-webkit-dependency
Merge into: lp:~ubuntu-desktop/lightdm-webkit-greeter/ubuntu
Diff against target: 42 lines (+17/-2)
3 files modified
debian/40-lightdm-webkit-greeter.conf (+1/-1)
debian/changelog (+15/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~jbicha/lightdm-webkit-greeter/lp1588037-obsolete-webkit-dependency
Reviewer Review Type Date Requested Status
Michael Terry 2016-06-01 Approve on 2016-06-01
Review via email: mp+296250@code.launchpad.net
To post a comment you must log in.
Michael Terry (mterry) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/40-lightdm-webkit-greeter.conf'
2--- debian/40-lightdm-webkit-greeter.conf 2013-12-09 21:24:08 +0000
3+++ debian/40-lightdm-webkit-greeter.conf 2016-06-01 19:33:54 +0000
4@@ -1,2 +1,2 @@
5-[SeatDefaults]
6+[Seat:*]
7 greeter-session=lightdm-webkit-greeter
8
9=== modified file 'debian/changelog'
10--- debian/changelog 2013-12-09 21:24:08 +0000
11+++ debian/changelog 2016-06-01 19:33:54 +0000
12@@ -1,3 +1,18 @@
13+lightdm-webkit-greeter (0.1.2-0ubuntu4) UNRELEASED; urgency=medium
14+
15+ * debian/control:
16+ Build-depend on libwebkitgtk-dev instead of libwebkit-dev,
17+ which has been a transitional package since Precise (LP: #1588037)
18+
19+ -- Jeremy Bicha <jbicha@linux.com> Wed, 01 Jun 2016 15:21:52 -0400
20+
21+lightdm-webkit-greeter (0.1.2-0ubuntu3) wily; urgency=medium
22+
23+ * debian/40-lightdm-webkit-greeter.conf:
24+ - Use [Seat:*] instead of deprecated [SeatDefaults]
25+
26+ -- Robert Ancell <robert.ancell@canonical.com> Fri, 07 Aug 2015 13:31:25 +1200
27+
28 lightdm-webkit-greeter (0.1.2-0ubuntu2) trusty; urgency=low
29
30 * debian/40-lightdm-webkit-greeter.conf:
31
32=== modified file 'debian/control'
33--- debian/control 2013-12-09 21:24:08 +0000
34+++ debian/control 2016-06-01 19:33:54 +0000
35@@ -6,7 +6,7 @@
36 Build-Depends: debhelper (>= 7.0.50~),
37 gnome-common,
38 liblightdm-gobject-1-dev,
39- libwebkit-dev
40+ libwebkitgtk-dev
41 Homepage: https://launchpad.net/lightdm
42 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/lightdm-webkit-greeter/ubuntu
43

Subscribers

People subscribed via source and target branches