Light Display Manager

Merge lp:~agateau/lightdm/lightdm-qt-2-packaging-fixes into lp:~ubuntu-desktop/lightdm/ubuntu

  1. lightdm-qt-2-packaging-fixes
  2. Merge into ubuntu
Proposed by Aurélien Gâteau
Status: Merged
Merged at revision: 1060
Proposed branch: lp:~agateau/lightdm/lightdm-qt-2-packaging-fixes
Merge into: lp:~ubuntu-desktop/lightdm/ubuntu
Diff against target: 63 lines (+11/-7)
5 files modified
debian/control (+7/-3)
debian/liblightdm-qt-1-0.install (+0/-1)
debian/liblightdm-qt-1-dev.install (+0/-3)
debian/liblightdm-qt-2-0.install (+1/-0)
debian/liblightdm-qt-2-dev.install (+3/-0)
To merge this branch: bzr merge lp:~agateau/lightdm/lightdm-qt-2-packaging-fixes
Reviewer Review Type Date Requested Status
Sebastien Bacher Needs Fixing
Review via email: mp+89202@code.launchpad.net

Description of the change

Rename liblightdm-qt packages to match upstream changes (liblightdm-qt-1 => liblightdm-qt-2)

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for catching that, small issue: since we shipped the new name in liblightdm-qt-1-0 the fixed version (liblightdm-qt-2-0) will conflict with the buggy -1 (they will have the same content), so we should add a Conflicts: liblightdm-qt-1-0, Replaces: liblightdm-qt-1-0

review: Needs Fixing
lp:~agateau/lightdm/lightdm-qt-2-packaging-fixes updated
1061. By Aurélien Gâteau

Add Conflicts/Replaces for liblightdm-qt-2 packages

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2012-01-18 10:09:46 +0000
3+++ debian/control 2012-01-19 10:23:34 +0000
4@@ -61,11 +61,13 @@
5 Description: Typelib file for liblightdm-1
6 A GObject based library for LightDM clients to use to interface with LightDM.
7
8-Package: liblightdm-qt-1-0
9+Package: liblightdm-qt-2-0
10 Architecture: any
11 Depends: ${misc:Depends},
12 ${shlibs:Depends}
13 Recommends: lightdm
14+Conflicts: liblightdm-qt-1-0 (>= 1.1.1)
15+Replaces: liblightdm-qt-1-0 (>= 1.1.1)
16 Description: LightDM Qt client library
17 A Qt based library for LightDM clients to use to interface with LightDM.
18
19@@ -83,12 +85,14 @@
20 This package contains header files and development information, which
21 is useful for building LightDM greeters and user switchers.
22
23-Package: liblightdm-qt-1-dev
24+Package: liblightdm-qt-2-dev
25 Section: libdevel
26 Architecture: any
27 Depends: ${misc:Depends},
28- liblightdm-qt-1-0 (= ${binary:Version}),
29+ liblightdm-qt-2-0 (= ${binary:Version}),
30 libqt4-dev
31+Conflicts: liblightdm-qt-1-dev (>= 1.1.1)
32+Replaces: liblightdm-qt-1-dev (>= 1.1.1)
33 Description: LightDM client library (development files)
34 A Qt based library for LightDM clients to use to interface with LightDM.
35 .
36
37=== removed file 'debian/liblightdm-qt-1-0.install'
38--- debian/liblightdm-qt-1-0.install 2011-08-09 13:27:33 +0000
39+++ debian/liblightdm-qt-1-0.install 1970-01-01 00:00:00 +0000
40@@ -1,1 +0,0 @@
41-usr/lib/liblightdm-qt-*.so.*
42
43=== removed file 'debian/liblightdm-qt-1-dev.install'
44--- debian/liblightdm-qt-1-dev.install 2011-08-09 13:27:33 +0000
45+++ debian/liblightdm-qt-1-dev.install 1970-01-01 00:00:00 +0000
46@@ -1,3 +0,0 @@
47-usr/include/lightdm-qt-*
48-usr/lib/pkgconfig/liblightdm-qt-*.pc
49-usr/lib/liblightdm-qt-*.so
50
51=== added file 'debian/liblightdm-qt-2-0.install'
52--- debian/liblightdm-qt-2-0.install 1970-01-01 00:00:00 +0000
53+++ debian/liblightdm-qt-2-0.install 2012-01-19 10:23:34 +0000
54@@ -0,0 +1,1 @@
55+usr/lib/liblightdm-qt-*.so.*
56
57=== added file 'debian/liblightdm-qt-2-dev.install'
58--- debian/liblightdm-qt-2-dev.install 1970-01-01 00:00:00 +0000
59+++ debian/liblightdm-qt-2-dev.install 2012-01-19 10:23:34 +0000
60@@ -0,0 +1,3 @@
61+usr/include/lightdm-qt-*
62+usr/lib/pkgconfig/liblightdm-qt-*.pc
63+usr/lib/liblightdm-qt-*.so

Subscribers

People subscribed via source and target branches