Merge lp:~didrocks/lightdm/packaging-cleanup into lp:~mir-team/lightdm/unity

Proposed by Didier Roche on 2013-06-27
Status: Merged
Approved by: Robert Ancell on 2013-06-27
Approved revision: 1636
Merged at revision: 1631
Proposed branch: lp:~didrocks/lightdm/packaging-cleanup
Merge into: lp:~mir-team/lightdm/unity
Diff against target: 170 lines (+25/-24)
6 files modified
.bzr-builddeb/default.conf (+2/-0)
data/lightdm-set-defaults.1 (+0/-1)
debian/changelog (+7/-0)
debian/control (+12/-12)
debian/rules (+4/-8)
debian/tests/control (+0/-3)
To merge this branch: bzr merge lp:~didrocks/lightdm/packaging-cleanup
Reviewer Review Type Date Requested Status
Robert Ancell 2013-06-27 Approve on 2013-06-27
PS Jenkins bot continuous-integration Approve on 2013-06-27
Review via email: mp+171722@code.launchpad.net

Commit message

Misc packaging cleanup

Description of the change

Misc packaging cleanup.
Don't multiarch lightdm for now as there is a lot of complexity like for
lightdm-set-defaults which should be in a separate (non multiarched) package.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Robert Ancell (robert-ancell) wrote :

Looks good - one thing I notice we should probably do is not depend on unity-system-compositor once we do daily landing into main (yet). Since this packaging is going to the testing PPA we should keep it on for now until we at least update the documentation to require people to explicitly install it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2013-06-27 07:23:28 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== modified file 'data/lightdm-set-defaults.1'
10--- data/lightdm-set-defaults.1 2012-11-06 21:34:21 +0000
11+++ data/lightdm-set-defaults.1 2013-06-27 07:23:28 +0000
12@@ -49,7 +49,6 @@
13 .TP
14 .B /etc/lightdm/lightdm.conf
15 Configuration
16-.TP
17
18 .sp
19 .LP
20
21=== modified file 'debian/changelog'
22--- debian/changelog 2013-06-21 02:47:57 +0000
23+++ debian/changelog 2013-06-27 07:23:28 +0000
24@@ -1,3 +1,10 @@
25+lightdm (1.7.4-0ubuntu1) UNRELEASED; urgency=low
26+
27+ * Clean packaging and prepare it for daily release
28+ * Automatic snapshot from revision 1629 (bootstrap)
29+
30+ -- Didier Roche <didrocks@ubuntu.com> Thu, 27 Jun 2013 08:51:29 +0200
31+
32 lightdm (1.7.3-0ubuntu1) saucy; urgency=low
33
34 * New upstream release:
35
36=== modified file 'debian/control'
37--- debian/control 2013-06-21 03:23:11 +0000
38+++ debian/control 2013-06-27 07:23:28 +0000
39@@ -24,7 +24,7 @@
40 gtk-doc-tools,
41 yelp-tools,
42 dbus,
43- python-gi
44+ python-gi,
45 Homepage: https://launchpad.net/lightdm
46
47 Package: lightdm
48@@ -38,7 +38,7 @@
49 libglib2.0-bin,
50 dbus,
51 plymouth (>= 0.8.8-0ubuntu6.1),
52- unity-system-compositor
53+ unity-system-compositor,
54 Recommends: xserver-xorg,
55 unity-greeter | lightdm-greeter | lightdm-kde-greeter
56 Conflicts: liblightdm-gobject-0-0,
57@@ -54,9 +54,9 @@
58 Package: liblightdm-gobject-1-0
59 Architecture: any
60 Depends: ${misc:Depends},
61- ${shlibs:Depends}
62+ ${shlibs:Depends},
63 Recommends: lightdm,
64- accountsservice
65+ accountsservice,
66 Description: LightDM GObject client library
67 A GObject based library for LightDM clients to use to interface with LightDM.
68
69@@ -64,14 +64,14 @@
70 Section: libs
71 Architecture: any
72 Depends: ${misc:Depends},
73- liblightdm-gobject-1-0 (= ${binary:Version})
74+ liblightdm-gobject-1-0 (= ${binary:Version}),
75 Description: Typelib file for liblightdm-1
76 A GObject based library for LightDM clients to use to interface with LightDM.
77
78 Package: liblightdm-qt-3-0
79 Architecture: any
80 Depends: ${misc:Depends},
81- ${shlibs:Depends}
82+ ${shlibs:Depends},
83 Recommends: lightdm
84 Conflicts: liblightdm-qt-1-0 (>= 1.1.1)
85 Replaces: liblightdm-qt-1-0 (>= 1.1.1)
86@@ -81,8 +81,8 @@
87 Package: liblightdm-qt5-3-0
88 Architecture: any
89 Depends: ${misc:Depends},
90- ${shlibs:Depends}
91-Recommends: lightdm
92+ ${shlibs:Depends},
93+Recommends: lightdm,
94 Description: LightDM Qt 5 client library
95 A Qt 5 based library for LightDM clients to use to interface with LightDM.
96
97@@ -93,7 +93,7 @@
98 liblightdm-gobject-1-0 (= ${binary:Version}),
99 libglib2.0-dev,
100 libdbus-glib-1-dev,
101- libxklavier-dev
102+ libxklavier-dev,
103 Description: LightDM GObject client library (development files)
104 A GObject based library for LightDM clients to use to interface with LightDM.
105 .
106@@ -105,7 +105,7 @@
107 Architecture: any
108 Depends: ${misc:Depends},
109 liblightdm-qt-3-0 (= ${binary:Version}),
110- libqt4-dev
111+ libqt4-dev,
112 Breaks: liblightdm-qt-1-dev (>= 1.1.1), liblightdm-qt-3-dev
113 Replaces: liblightdm-qt-1-dev (>= 1.1.1), liblightdm-qt-3-dev
114 Description: LightDM Qt client library (development files)
115@@ -119,7 +119,7 @@
116 Architecture: any
117 Depends: ${misc:Depends},
118 liblightdm-qt5-3-0 (= ${binary:Version}),
119- libqt4-dev
120+ libqt4-dev,
121 Description: LightDM Qt 5 client library (development files)
122 A Qt 5 based library for LightDM clients to use to interface with LightDM.
123 .
124@@ -129,7 +129,7 @@
125 Package: liblightdm-gobject-1-doc
126 Section: doc
127 Architecture: all
128-Depends: ${misc:Depends}
129+Depends: ${misc:Depends},
130 Description: LightDM client library (documentation)
131 A GObject based library for LightDM clients to use to interface with LightDM.
132 .
133
134=== modified file 'debian/rules'
135--- debian/rules 2013-06-20 04:48:53 +0000
136+++ debian/rules 2013-06-27 07:23:28 +0000
137@@ -3,7 +3,7 @@
138 LDFLAGS+=-Wl,--as-needed
139
140 %:
141- dh $@ --with quilt,autoreconf,translations
142+ dh $@ --with quilt,autoreconf,translations --parallel
143
144 override_dh_autoreconf:
145 NOCONFIGURE=1 dh_autoreconf ./autogen.sh
146@@ -17,13 +17,9 @@
147 override_dh_auto_test:
148
149 override_dh_install:
150- #Remove .la and .a files.
151- find debian/tmp/usr/lib/ -name *.a |xargs rm
152- find debian/tmp/usr/lib -name *.la |xargs rm
153- #Remove conf files from upstream
154- #find debian/tmp/etc/ -name *.conf |xargs rm
155- #find debian/tmp/etc/init -name *.conf |xargs rm
156- dh_install --list-missing
157+ rm -r debian/tmp/usr/share/help/C/
158+ # we do install pam through installpam and init through installinit
159+ dh_install -X.a -X.la -Xpam.d -X'etc/init/lightdm.conf' --fail-missing
160 mv debian/lightdm/usr/lib/lightdm/lightdm/lightdm-set-defaults debian/lightdm/usr/lib/lightdm
161 chmod +x debian/lightdm/usr/lib/lightdm/lightdm-greeter-session
162
163
164=== removed file 'debian/tests/control'
165--- debian/tests/control 2013-04-30 19:12:50 +0000
166+++ debian/tests/control 1970-01-01 00:00:00 +0000
167@@ -1,3 +0,0 @@
168-#Tests: upstream-tests
169-#Depends: @, python-gi, xauth
170-#Restrictions: build-needed needs-root

Subscribers

People subscribed via source and target branches