ubuntu-keyboard

Merge lp:~sil2100/ubuntu-keyboard/cleanup_code_and_packaging into lp:ubuntu-keyboard

  1. cleanup_code_and_packaging
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Needs review
Proposed branch: lp:~sil2100/ubuntu-keyboard/cleanup_code_and_packaging
Merge into: lp:ubuntu-keyboard
Diff against target: 264 lines (+21/-9)
4 files modified
debian/control (+18/-0)
qml/Keyboard.qml (+2/-2)
qml/keys/Magnifier.qml (+1/-1)
src/src.pro (+0/-6)
To merge this branch: bzr merge lp:~sil2100/ubuntu-keyboard/cleanup_code_and_packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+204493@code.launchpad.net

Commit message

Remove more unnecessary unused/deprecated images in our source, do some misc cleanup. Change the packaging to force pulling in at least one language package along with ubuntu-keyboard during installation

Description of the change

Remove more unnecessary unused/deprecated images in our source, do some misc cleanup. Change the packaging to force pulling in at least one language package along with ubuntu-keyboard during installation

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/327/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/156
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/155

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/327/rebuild

review: Approve (continuous-integration)
Reply
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:135
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/328/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/157
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/157/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/156

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/328/rebuild

review: Approve (continuous-integration)
Reply

Unmerged revisions

135. By Łukasz Zemczak

No versioning for the virtual package

134. By Łukasz Zemczak

Make sure that the language packages provide a virtual package so that we can do this double-sided dependency, making sure that any of the language packs is required to be installed with the ubuntu-keyboard package

133. By Łukasz Zemczak

Clean up unused duplicate and deprecated images inside the OSK source tree, as well clean up some unused lines of qmake

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory 'data/styles/ubuntu/images'
2=== removed file 'data/styles/ubuntu/images/background.png'
3Binary files data/styles/ubuntu/images/background.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/background.png 1970-01-01 00:00:00 +0000 differ
4=== removed file 'data/styles/ubuntu/images/backspace-icon.png'
5Binary files data/styles/ubuntu/images/backspace-icon.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/backspace-icon.png 1970-01-01 00:00:00 +0000 differ
6=== removed file 'data/styles/ubuntu/images/border_bottom.png'
7Binary files data/styles/ubuntu/images/border_bottom.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/border_bottom.png 1970-01-01 00:00:00 +0000 differ
8=== removed file 'data/styles/ubuntu/images/border_top.png'
9Binary files data/styles/ubuntu/images/border_top.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/border_top.png 1970-01-01 00:00:00 +0000 differ
10=== removed file 'data/styles/ubuntu/images/close-icon.png'
11Binary files data/styles/ubuntu/images/close-icon.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/close-icon.png 1970-01-01 00:00:00 +0000 differ
12=== removed file 'data/styles/ubuntu/images/extended-background.png'
13Binary files data/styles/ubuntu/images/extended-background.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/extended-background.png 1970-01-01 00:00:00 +0000 differ
14=== removed file 'data/styles/ubuntu/images/extended-key-background-pressed.png'
15Binary files data/styles/ubuntu/images/extended-key-background-pressed.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/extended-key-background-pressed.png 1970-01-01 00:00:00 +0000 differ
16=== removed file 'data/styles/ubuntu/images/extended-key-background.png'
17Binary files data/styles/ubuntu/images/extended-key-background.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/extended-key-background.png 1970-01-01 00:00:00 +0000 differ
18=== removed file 'data/styles/ubuntu/images/icon_backspace@18.png'
19Binary files data/styles/ubuntu/images/icon_backspace@18.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/icon_backspace@18.png 1970-01-01 00:00:00 +0000 differ
20=== removed file 'data/styles/ubuntu/images/icon_backspace@20.png'
21Binary files data/styles/ubuntu/images/icon_backspace@20.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/icon_backspace@20.png 1970-01-01 00:00:00 +0000 differ
22=== removed file 'data/styles/ubuntu/images/icon_enter@18.png'
23Binary files data/styles/ubuntu/images/icon_enter@18.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/icon_enter@18.png 1970-01-01 00:00:00 +0000 differ
24=== removed file 'data/styles/ubuntu/images/icon_enter@20.png'
25Binary files data/styles/ubuntu/images/icon_enter@20.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/icon_enter@20.png 1970-01-01 00:00:00 +0000 differ
26=== removed file 'data/styles/ubuntu/images/icon_shift@18.png'
27Binary files data/styles/ubuntu/images/icon_shift@18.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/icon_shift@18.png 1970-01-01 00:00:00 +0000 differ
28=== removed file 'data/styles/ubuntu/images/icon_shift@20.png'
29Binary files data/styles/ubuntu/images/icon_shift@20.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/icon_shift@20.png 1970-01-01 00:00:00 +0000 differ
30=== removed file 'data/styles/ubuntu/images/icon_shift_white@18.png'
31Binary files data/styles/ubuntu/images/icon_shift_white@18.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/icon_shift_white@18.png 1970-01-01 00:00:00 +0000 differ
32=== removed file 'data/styles/ubuntu/images/icon_shift_white@20.png'
33Binary files data/styles/ubuntu/images/icon_shift_white@20.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/icon_shift_white@20.png 1970-01-01 00:00:00 +0000 differ
34=== removed file 'data/styles/ubuntu/images/key-background-pressed.png'
35Binary files data/styles/ubuntu/images/key-background-pressed.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/key-background-pressed.png 1970-01-01 00:00:00 +0000 differ
36=== removed file 'data/styles/ubuntu/images/key-background-special-pressed.png'
37Binary files data/styles/ubuntu/images/key-background-special-pressed.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/key-background-special-pressed.png 1970-01-01 00:00:00 +0000 differ
38=== removed file 'data/styles/ubuntu/images/key-background-special.png'
39Binary files data/styles/ubuntu/images/key-background-special.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/key-background-special.png 1970-01-01 00:00:00 +0000 differ
40=== removed file 'data/styles/ubuntu/images/key-background.png'
41Binary files data/styles/ubuntu/images/key-background.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/key-background.png 1970-01-01 00:00:00 +0000 differ
42=== removed file 'data/styles/ubuntu/images/keybg@18.png'
43Binary files data/styles/ubuntu/images/keybg@18.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/keybg@18.png 1970-01-01 00:00:00 +0000 differ
44=== removed file 'data/styles/ubuntu/images/keybg_action@18.png'
45Binary files data/styles/ubuntu/images/keybg_action@18.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/keybg_action@18.png 1970-01-01 00:00:00 +0000 differ
46=== removed file 'data/styles/ubuntu/images/keybg_action_active@18.png'
47Binary files data/styles/ubuntu/images/keybg_action_active@18.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/keybg_action_active@18.png 1970-01-01 00:00:00 +0000 differ
48=== removed file 'data/styles/ubuntu/images/keybg_capslock_bg@18.png'
49Binary files data/styles/ubuntu/images/keybg_capslock_bg@18.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/keybg_capslock_bg@18.png 1970-01-01 00:00:00 +0000 differ
50=== removed file 'data/styles/ubuntu/images/keyboard_popover.png'
51Binary files data/styles/ubuntu/images/keyboard_popover.png 2013-08-13 15:33:41 +0000 and data/styles/ubuntu/images/keyboard_popover.png 1970-01-01 00:00:00 +0000 differ
52=== removed file 'data/styles/ubuntu/images/language-icon.png'
53Binary files data/styles/ubuntu/images/language-icon.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/language-icon.png 1970-01-01 00:00:00 +0000 differ
54=== removed file 'data/styles/ubuntu/images/return-icon.png'
55Binary files data/styles/ubuntu/images/return-icon.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/return-icon.png 1970-01-01 00:00:00 +0000 differ
56=== removed file 'data/styles/ubuntu/images/shift-icon.png'
57Binary files data/styles/ubuntu/images/shift-icon.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/shift-icon.png 1970-01-01 00:00:00 +0000 differ
58=== removed file 'data/styles/ubuntu/images/shift-latched-icon.png'
59Binary files data/styles/ubuntu/images/shift-latched-icon.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/shift-latched-icon.png 1970-01-01 00:00:00 +0000 differ
60=== removed file 'data/styles/ubuntu/images/small-cut.png'
61Binary files data/styles/ubuntu/images/small-cut.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/small-cut.png 1970-01-01 00:00:00 +0000 differ
62=== removed file 'data/styles/ubuntu/images/small-square-smile.png'
63Binary files data/styles/ubuntu/images/small-square-smile.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/small-square-smile.png 1970-01-01 00:00:00 +0000 differ
64=== removed file 'data/styles/ubuntu/images/square-smile.png'
65Binary files data/styles/ubuntu/images/square-smile.png 2013-07-19 12:05:07 +0000 and data/styles/ubuntu/images/square-smile.png 1970-01-01 00:00:00 +0000 differ
66=== modified file 'debian/control'
67--- debian/control 2014-01-22 20:31:47 +0000
68+++ debian/control 2014-02-04 15:45:23 +0000
69@@ -36,6 +36,7 @@
70 Depends: maliit-framework (>= 0.99.0+git20130615+97e8335-0ubuntu3),
71 qtdeclarative5-window-plugin,
72 ubuntu-keyboard-data (>= ${source:Version}),
73+ ubuntu-keyboard-language,
74 ${misc:Depends},
75 ${shlibs:Depends},
76 Description: Ubuntu on-screen keyboard
77@@ -89,6 +90,7 @@
78 hunspell-ar,
79 ${misc:Depends},
80 ${shlibs:Depends},
81+Provides: ubuntu-keyboard-language
82 Description: Ubuntu on-screen keyboard data files - Arabic
83 Data files for the Ubuntu virtual keyboard - Arabic
84
85@@ -97,6 +99,7 @@
86 Depends: ubuntu-keyboard (= ${binary:Version}),
87 ${misc:Depends},
88 ${shlibs:Depends},
89+Provides: ubuntu-keyboard-language
90 Description: Ubuntu on-screen keyboard data files - Chinese Pinyin
91 Data files for the Ubuntu virtual keyboard - Chinese Pinyin
92
93@@ -105,6 +108,7 @@
94 Depends: ubuntu-keyboard (= ${binary:Version}),
95 ${misc:Depends},
96 ${shlibs:Depends},
97+Provides: ubuntu-keyboard-language
98 Description: Ubuntu on-screen keyboard data files - Czech
99 Data files for the Ubuntu virtual keyboard - Czech
100
101@@ -114,6 +118,7 @@
102 hunspell-da,
103 ${misc:Depends},
104 ${shlibs:Depends},
105+Provides: ubuntu-keyboard-language
106 Description: Ubuntu on-screen keyboard data files - Danish
107 Data files for the Ubuntu virtual keyboard - Danish
108
109@@ -123,6 +128,7 @@
110 myspell-nl,
111 ${misc:Depends},
112 ${shlibs:Depends},
113+Provides: ubuntu-keyboard-language
114 Description: Ubuntu on-screen keyboard data files - Dutch
115 Data files for the Ubuntu virtual keyboard - Dutch
116
117@@ -132,6 +138,7 @@
118 hunspell-en-us,
119 ${misc:Depends},
120 ${shlibs:Depends},
121+Provides: ubuntu-keyboard-language
122 Description: Ubuntu on-screen keyboard data files - English
123 Data files for the Ubuntu virtual keyboard - English
124
125@@ -140,6 +147,7 @@
126 Depends: ubuntu-keyboard (= ${binary:Version}),
127 ${misc:Depends},
128 ${shlibs:Depends},
129+Provides: ubuntu-keyboard-language
130 Description: Ubuntu on-screen keyboard data files - Finnish
131 Data files for the Ubuntu virtual keyboard - Finnish
132
133@@ -149,6 +157,7 @@
134 hunspell-fr,
135 ${misc:Depends},
136 ${shlibs:Depends},
137+Provides: ubuntu-keyboard-language
138 Description: Ubuntu on-screen keyboard data files - French
139 Data files for the Ubuntu virtual keyboard - French
140
141@@ -158,6 +167,7 @@
142 hunspell-de-de,
143 ${misc:Depends},
144 ${shlibs:Depends},
145+Provides: ubuntu-keyboard-language
146 Description: Ubuntu on-screen keyboard data files - German
147 Data files for the Ubuntu virtual keyboard - German
148
149@@ -166,6 +176,7 @@
150 Depends: ubuntu-keyboard (= ${binary:Version}),
151 ${misc:Depends},
152 ${shlibs:Depends},
153+Provides: ubuntu-keyboard-language
154 Description: Ubuntu on-screen keyboard data files - Hebrew
155 Data files for the Ubuntu virtual keyboard - Hebrew
156
157@@ -175,6 +186,7 @@
158 hunspell-hu,
159 ${misc:Depends},
160 ${shlibs:Depends},
161+Provides: ubuntu-keyboard-language
162 Description: Ubuntu on-screen keyboard data files - Hungarian
163 Data files for the Ubuntu virtual keyboard - Hungarian
164
165@@ -183,6 +195,7 @@
166 Depends: ubuntu-keyboard (= ${binary:Version}),
167 ${misc:Depends},
168 ${shlibs:Depends},
169+Provides: ubuntu-keyboard-language
170 Description: Ubuntu on-screen keyboard data files - Italian
171 Data files for the Ubuntu virtual keyboard - Italian
172
173@@ -192,6 +205,7 @@
174 myspell-pl,
175 ${misc:Depends},
176 ${shlibs:Depends},
177+Provides: ubuntu-keyboard-language
178 Description: Ubuntu on-screen keyboard data files - Polish
179 Data files for the Ubuntu virtual keyboard - Polish
180
181@@ -200,6 +214,7 @@
182 Depends: ubuntu-keyboard (= ${binary:Version}),
183 ${misc:Depends},
184 ${shlibs:Depends},
185+Provides: ubuntu-keyboard-language
186 Description: Ubuntu on-screen keyboard data files - Portuguese
187 Data files for the Ubuntu virtual keyboard - Portuguese
188
189@@ -209,6 +224,7 @@
190 hunspell-ru,
191 ${misc:Depends},
192 ${shlibs:Depends},
193+Provides: ubuntu-keyboard-language
194 Description: Ubuntu on-screen keyboard data files - Russian
195 Data files for the Ubuntu virtual keyboard - Russian
196
197@@ -217,6 +233,7 @@
198 Depends: ubuntu-keyboard (= ${binary:Version}),
199 ${misc:Depends},
200 ${shlibs:Depends},
201+Provides: ubuntu-keyboard-language
202 Description: Ubuntu on-screen keyboard data files - Spanish
203 Data files for the Ubuntu virtual keyboard - Spanish
204
205@@ -226,5 +243,6 @@
206 hunspell-sv-se,
207 ${misc:Depends},
208 ${shlibs:Depends},
209+Provides: ubuntu-keyboard-language
210 Description: Ubuntu on-screen keyboard data files - Swedish
211 Data files for the Ubuntu virtual keyboard - Swedish
212
213=== modified file 'qml/Keyboard.qml'
214--- qml/Keyboard.qml 2014-01-21 22:51:18 +0000
215+++ qml/Keyboard.qml 2014-02-04 15:45:23 +0000
216@@ -165,14 +165,14 @@
217
218 Image {
219 id: borderTop
220- source: "styles/ubuntu/images/border_top.png"
221+ source: "images/border_top.png"
222 width: parent.width
223 anchors.top: parent.top.bottom
224 }
225
226 Image {
227 id: borderBottom
228- source: "styles/ubuntu/images/border_bottom.png"
229+ source: "images/border_bottom.png"
230 width: parent.width
231 anchors.bottom: background.bottom
232 }
233
234=== modified file 'qml/keys/Magnifier.qml'
235--- qml/keys/Magnifier.qml 2013-10-08 10:36:32 +0000
236+++ qml/keys/Magnifier.qml 2014-02-04 15:45:23 +0000
237@@ -52,7 +52,7 @@
238 transformOrigin: Item.Bottom
239 opacity: animationStep
240
241- source: Qt.resolvedUrl("../styles/ubuntu/images/keyboard_popover.png")
242+ source: Qt.resolvedUrl("../images/keyboard_popover.png")
243
244 Text {
245 id: label
246
247=== modified file 'src/src.pro'
248--- src/src.pro 2013-07-19 12:05:07 +0000
249+++ src/src.pro 2014-02-04 15:45:23 +0000
250@@ -4,12 +4,6 @@
251 lib \
252 view \
253 plugin \
254-# benchmark \
255-
256-
257-#!notests {
258-# SUBDIRS += tests
259-#}
260
261 QMAKE_EXTRA_TARGETS += check
262 check.target = check
263
264=== removed directory 'src/tests'

Subscribers

People subscribed via source and target branches