Merge lp:~sil2100/indicators-client/fixes_for_the_masses into lp:indicators-client

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 214
Merged at revision: 214
Proposed branch: lp:~sil2100/indicators-client/fixes_for_the_masses
Merge into: lp:indicators-client
Diff against target: 138 lines (+15/-32)
4 files modified
CMakeLists.txt (+2/-1)
debian/control (+12/-23)
debian/indicators-client-examples.install (+0/-4)
debian/rules (+1/-4)
To merge this branch: bzr merge lp:~sil2100/indicators-client/fixes_for_the_masses
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+180842@code.launchpad.net

Commit message

Remove the indicators-client-examples package, as we no longer have phone-app on which this package is depending. Fix some lintian and packaging errors

Description of the change

Remove the indicators-client-examples package, as we no longer have phone-app on which this package is depending. Fix some lintian and packaging errors

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

The changes look all good, +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-06-20 15:09:32 +0000
3+++ CMakeLists.txt 2013-08-19 11:20:17 +0000
4@@ -58,7 +58,8 @@
5 add_subdirectory(chewieui)
6 add_subdirectory(client)
7 add_subdirectory(plugins)
8-add_subdirectory(examples)
9+# FIXME: Examples require phone-app, which is no longer developed
10+#add_subdirectory(examples)
11 add_subdirectory(tests)
12
13 # Doc
14
15=== modified file 'debian/control'
16--- debian/control 2013-06-21 10:59:02 +0000
17+++ debian/control 2013-08-19 11:20:17 +0000
18@@ -6,13 +6,13 @@
19 cmake (>= 2.8.9),
20 qtbase5-dev (>= 5.0),
21 qtdeclarative5-dev (>= 5.0),
22- libgl-dev,
23+ libgl1-mesa-dev,
24 libgles2-mesa-dev,
25 libglib2.0-dev,
26 libnm-glib-dev,
27 libqmenumodel-dev,
28 python,
29-Standards-Version: 3.9.3
30+Standards-Version: 3.9.4
31 # If you aren't a member of ~phablet-team but need to upload
32 # packaging changes, just go ahead. ~phablet-team will notice
33 # and sync up the code again.
34@@ -20,7 +20,7 @@
35 Vcs-Browser: https://code.launchpad.net/~phablet-team/indicators-client/trunk/files
36
37 Package: indicators-client
38-Architecture: amd64 armhf i386
39+Architecture: any
40 Depends: ${shlibs:Depends},
41 ${misc:Depends},
42 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
43@@ -30,7 +30,7 @@
44 settings.
45
46 Package: indicators-client-plugin-network
47-Architecture: amd64 armhf i386
48+Architecture: any
49 Depends: ${shlibs:Depends},
50 ${misc:Depends},
51 indicators-client (= ${binary:Version}),
52@@ -39,14 +39,15 @@
53 application that allows configuring network connections.
54
55 Package: indicators-client-plugin-sound
56-Architecture: amd64 armhf i386
57-Depends: indicators-client (= ${binary:Version}),
58+Architecture: any
59+Depends: ${misc:Depends},
60+ indicators-client (= ${binary:Version}),
61 Description: Sound settings menu
62 This package contains the plugin for the indicators and system settings client
63 application that allows configuring the sound.
64
65 Package: indicators-client-plugin-messaging
66-Architecture: amd64 armhf i386
67+Architecture: any
68 Depends: ${shlibs:Depends},
69 ${misc:Depends},
70 indicators-client (= ${binary:Version}),
71@@ -56,7 +57,7 @@
72 application that displays the messaging menu.
73
74 Package: indicators-client-plugin-power
75-Architecture: amd64 armhf i386
76+Architecture: any
77 Depends: ${shlibs:Depends},
78 ${misc:Depends},
79 indicators-client (= ${binary:Version}),
80@@ -66,7 +67,7 @@
81 application that displays the battery indicator.
82
83 Package: indicators-client-plugin-datetime
84-Architecture: amd64 armhf i386
85+Architecture: any
86 Depends: ${shlibs:Depends},
87 ${misc:Depends},
88 indicators-client (= ${binary:Version}),
89@@ -75,22 +76,10 @@
90 This package contains the plugin for the indicators and system settings client
91 application that allows display the date & time.
92
93-Package: indicators-client-examples
94-Architecture: all
95-Depends: python,
96- python-dbus,
97- python-gi,
98- gir1.2-glib-2.0,
99- gir1.2-messagingmenu-1.0,
100- phone-app,
101- indicators-client (= ${binary:Version}),
102-Description: Indicators and system settings example application
103- This package contains the example applications for the indicators and system
104- settings client application.
105-
106 Package: indicators-client-autopilot
107 Architecture: all
108-Depends: libautopilot-qt,
109+Depends: ${misc:Depends},
110+ libautopilot-qt,
111 libqt5test5,
112 indicators-client-plugin-messaging (= ${source:Version}),
113 Description: Autopilot tests for Indicators and system settings example application
114
115=== removed file 'debian/indicators-client-examples.install'
116--- debian/indicators-client-examples.install 2012-11-28 20:22:02 +0000
117+++ debian/indicators-client-examples.install 1970-01-01 00:00:00 +0000
118@@ -1,4 +0,0 @@
119-usr/bin/chewie_messaging_server_example
120-usr/bin/chewie_messaging_populate_menu
121-usr/share/dbus-1/services/com.canonical.test.messaging.service
122-usr/share/chewie/examples
123
124=== modified file 'debian/rules'
125--- debian/rules 2013-04-23 14:44:46 +0000
126+++ debian/rules 2013-08-19 11:20:17 +0000
127@@ -4,10 +4,7 @@
128 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
129
130 %:
131- dh $@ --parallel
132+ dh $@ --parallel --fail-missing
133
134 override_dh_makeshlibs:
135 dh_makeshlibs -Xindicators-client
136-
137-override_dh_install:
138- dh_install --fail-missing

Subscribers

People subscribed via source and target branches