Merge lp:~themuso/ubuntu-terminal-app/yakkety-packaging-updates into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
- yakkety-packaging-updates
- Merge into reboot
Proposed by
Luke Yelavich
Status: | Merged |
---|---|
Approved by: | Alan Pope πΊπ§π± π¦ |
Approved revision: | 218 |
Merged at revision: | 209 |
Proposed branch: | lp:~themuso/ubuntu-terminal-app/yakkety-packaging-updates |
Merge into: | lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot |
Diff against target: |
772 lines (+532/-7) 26 files modified
CMakeLists.txt (+1/-0) debian/changelog (+11/-0) debian/control (+3/-3) debian/copyright (+96/-4) src/app/fileio.cpp (+21/-0) src/app/fileio.h (+21/-0) src/app/qml/AlternateActionPopover.qml (+17/-0) src/app/qml/CircularTransparentButton.qml (+17/-0) src/app/qml/ExpandableButton.qml (+17/-0) src/app/qml/KeyboardBar.qml (+17/-0) src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml (+17/-0) src/app/qml/KeyboardRows/JsonTranslator.qml (+17/-0) src/app/qml/KeyboardRows/KeyModel.qml (+17/-0) src/app/qml/KeyboardRows/KeyboardButton.qml (+17/-0) src/app/qml/KeyboardRows/KeyboardLayout.qml (+17/-0) src/app/qml/KeyboardRows/KeyboardRow.qml (+17/-0) src/app/qml/PressFeedback.qml (+17/-0) src/app/qml/TabsModel.qml (+17/-0) src/app/qml/TabsPage.qml (+17/-0) src/app/qml/TerminalComponent.qml (+17/-0) src/app/qml/TerminalInputArea.qml (+17/-0) src/app/qml/TerminalKeyboardShortcutHandler.qml (+17/-0) src/app/qml/TerminalPage.qml (+17/-0) src/app/qml/TerminalSettings.qml (+17/-0) src/app/qml/ubuntu-terminal-app.qml (+17/-0) terminal.1 (+56/-0) |
To merge this branch: | bzr merge lp:~themuso/ubuntu-terminal-app/yakkety-packaging-updates |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jenkins Bot | continuous-integration | Approve | |
Alan Pope πΊπ§π± π¦ (community) | Approve | ||
Review via email: mp+306050@code.launchpad.net |
Commit message
Packaging fixes in preparation for yakkety:
* Added copyright headers to src/app/qml files that didn't have it.
* Added a manpage to satisfy lintian.
* Updated debian/copyright.
Description of the change
Packaging fixes in preparation for yakkety:
* Added copyright headers to src/app/qml files that didn't have it.
* Added a manpage to satisfy lintian.
* Updated debian/copyright.
To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) : | # |
review:
Approve
(continuous-integration)
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 2015-02-03 10:24:54 +0000 |
3 | +++ CMakeLists.txt 2016-09-19 00:47:22 +0000 |
4 | @@ -72,6 +72,7 @@ |
5 | set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME}) |
6 | set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}) |
7 | set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications) |
8 | + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/terminal.1 DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man1) |
9 | endif(CLICK_MODE) |
10 | |
11 | file(GLOB_RECURSE I18N_SRC_FILES |
12 | |
13 | === modified file 'debian/changelog' |
14 | --- debian/changelog 2015-07-04 08:41:27 +0000 |
15 | +++ debian/changelog 2016-09-19 00:47:22 +0000 |
16 | @@ -1,3 +1,14 @@ |
17 | +ubuntu-terminal-app (0.7ubuntu1) UNRELEASED; urgency=medium |
18 | + |
19 | + * Get packaging ready for inclusion in yakkety (LP: #1623845) |
20 | + * Update standards version |
21 | + * Fix up build dependency formatting |
22 | + * Added manpage |
23 | + * Update copyright |
24 | + * Update Vcs-bzr field |
25 | + |
26 | + -- Luke Yelavich <themuso@ubuntu.com> Fri, 16 Sep 2016 09:04:28 +1000 |
27 | + |
28 | ubuntu-terminal-app (0.7) wily; urgency=medium |
29 | |
30 | * Bumped changelog version (LP: #1468385) |
31 | |
32 | === modified file 'debian/control' |
33 | --- debian/control 2016-03-15 14:20:16 +0000 |
34 | +++ debian/control 2016-09-19 00:47:22 +0000 |
35 | @@ -9,11 +9,11 @@ |
36 | libpam0g-dev, |
37 | qtbase5-dev, |
38 | qtdeclarative5-dev, |
39 | - qt5-default, |
40 | -Standards-Version: 3.9.6 |
41 | + qt5-default |
42 | +Standards-Version: 3.9.8 |
43 | Section: misc |
44 | Homepage: https://launchpad.net/ubuntu-terminal-app |
45 | -Vcs-Bzr: https://code.launchpad.net/~ubuntu-terminal-dev/ubuntu-terminal-app/trunk |
46 | +Vcs-Bzr: https://code.launchpad.net/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot |
47 | |
48 | Package: ubuntu-terminal-app |
49 | Section: misc |
50 | |
51 | === modified file 'debian/copyright' |
52 | --- debian/copyright 2014-10-25 04:42:31 +0000 |
53 | +++ debian/copyright 2016-09-19 00:47:22 +0000 |
54 | @@ -11,6 +11,49 @@ |
55 | 2013 Sam Hewitt <snwh@ubuntu.com> |
56 | License: GPL-3 |
57 | |
58 | +Files: src/app/* |
59 | +Copyright: 2013-2014 Canonical Ltd. |
60 | +License: GPL-3+ |
61 | + |
62 | +Files: src/app/qml/* |
63 | +Copyright: 2013-2014 Canonical Ltd. |
64 | + 2014 Canonical Ltd. |
65 | + 2013, 2014, 2016 Canonical Ltd. |
66 | + 2013, 2014 Canonical Ltd. |
67 | +License: GPL-3 |
68 | + |
69 | +Files: src/app/plugin/konsole/* |
70 | + src/plugin/qmltermwidget/lib/* |
71 | +Copyright: 2000 Stephan Kulow <coolo@kde.org> |
72 | + 2008 e_k <e_k@users.sourceforge.net> |
73 | + 2007-2008 Robert Knight <robertknight@gmail.com> |
74 | + 1997-1998 Lars Doelle <lars.doelle@on-line.de> |
75 | + 1996 Matthias Ettrich <ettrich@kde.org> |
76 | + 2007 Oswald Buddenhagen <ossi@kde.org> |
77 | + 2002 Waldo Bastian <bastian@kde.org> |
78 | + 2002-2003, 2007 Oswald Buddenhagen <ossi@kde.org> |
79 | + 2010 KDE e.V. <kde-ev-board@kde.org> |
80 | + 2013 Dmitry Zagnoyko <hiroshidi@gmail.com> |
81 | + 2007 Robert Knight <robertknight@gmail.com> |
82 | + 2006-2007 Robert Knight <robertknight@gmail.com> |
83 | + 2006-2008 Robert Knight <robertknight@gmail.com> |
84 | +License: GPL-2+ |
85 | + |
86 | +Files: src/app/plugin/konsole/konsole_wcwidth.* |
87 | + src/plugin/qmltermwidget/lib/konsole_wcwidth.* |
88 | +Copyright: no copyright claimed |
89 | +License: public-domain |
90 | + No copyright claimed by author. |
91 | + |
92 | +Files: src/plugin/pamauthentication/* |
93 | +Copyright: 2014 Canonical Ltd. |
94 | +License: GPL-3 |
95 | + |
96 | +Files: tests/autopilot/ubuntu_terminal_app/* |
97 | + tests/autopilot/ubuntu_terminal_app/tests/* |
98 | +Copyright: 2013 Canonical Ltd. |
99 | +License: GPL-3 |
100 | + |
101 | Files: debian/* |
102 | Copyright: 2013 Canonical Ltd. |
103 | License: LGPL-3 |
104 | @@ -18,8 +61,24 @@ |
105 | License: GPL-3 |
106 | This package is free software; you can redistribute it and/or |
107 | modify it under the terms of the GNU General Public |
108 | - License as published by the Free Software Foundation; either |
109 | - version 3 of the License. |
110 | + License version 3 as published by the Free Software Foundation. |
111 | + . |
112 | + This package is distributed in the hope that it will be useful, |
113 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
114 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
115 | + General Public License for more details. |
116 | + . |
117 | + You should have received a copy of the GNU General Public License |
118 | + along with this program. If not, see <http://www.gnu.org/licenses/>. |
119 | + . |
120 | + On Debian systems, the complete text of the GNU General |
121 | + Public License can be found in "/usr/share/common-licenses/GPL-3". |
122 | + |
123 | +License: GPL-3+ |
124 | + This package is free software; you can redistribute it and/or |
125 | + modify it under the terms of the GNU General Public |
126 | + License as published by the Free Software Foundation; either version |
127 | + 3 of the License, or (at your option) any later version. |
128 | . |
129 | This package is distributed in the hope that it will be useful, |
130 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
131 | @@ -35,8 +94,7 @@ |
132 | License: LGPL-3 |
133 | This package is free software; you can redistribute it and/or |
134 | modify it under the terms of the GNU Lesser General Public |
135 | - License as published by the Free Software Foundation; either |
136 | - version 3 of the License. |
137 | + License version 3 as published by the Free Software Foundation. |
138 | . |
139 | This package is distributed in the hope that it will be useful, |
140 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
141 | @@ -48,3 +106,37 @@ |
142 | . |
143 | On Debian systems, the complete text of the GNU Lesser General |
144 | Public License can be found in "/usr/share/common-licenses/LGPL-3". |
145 | + |
146 | +License: GPL-2 |
147 | + This package is free software; you can redistribute it and/or modify |
148 | + it under the terms of the GNU General Public License as published by |
149 | + the Free Software Foundation; either version 2 of the License, or |
150 | + (at your option) any later version. |
151 | + . |
152 | + This package is distributed in the hope that it will be useful, |
153 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
154 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
155 | + GNU General Public License for more details. |
156 | + . |
157 | + You should have received a copy of the GNU General Public License |
158 | + along with this program. If not, see <http://www.gnu.org/licenses/>. |
159 | + . |
160 | + On Debian systems, the complete text of the GNU General |
161 | + Public License can be found in "/usr/share/common-licenses/GPL-2". |
162 | + |
163 | +License: GPL-2+ |
164 | + This package is free software; you can redistribute it and/or |
165 | + modify it under the terms of the GNU General Public |
166 | + License as published by the Free Software Foundation; either version |
167 | + 2 of the License, or (at your option) any later version. |
168 | + . |
169 | + This package is distributed in the hope that it will be useful, |
170 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
171 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
172 | + General Public License for more details. |
173 | + . |
174 | + You should have received a copy of the GNU General Public License |
175 | + along with this program. If not, see <http://www.gnu.org/licenses/>. |
176 | + . |
177 | + On Debian systems, the complete text of the GNU General |
178 | + Public License can be found in "/usr/share/common-licenses/GPL-2". |
179 | |
180 | === modified file 'src/app/fileio.cpp' |
181 | --- src/app/fileio.cpp 2015-04-01 22:01:44 +0000 |
182 | +++ src/app/fileio.cpp 2016-09-19 00:47:22 +0000 |
183 | @@ -1,3 +1,24 @@ |
184 | +/* |
185 | + * Copyright: 2015 Canonical Ltd. |
186 | + * |
187 | + * This file is part of ubuntu-terminal-app |
188 | + * |
189 | + * ubuntu-terminal-app is free software: you can redistribute it and/or modify |
190 | + * it under the terms of the GNU General Public License as published by |
191 | + * the Free Software Foundation, either version 3 of the License, or |
192 | + * (at your option) any later version. |
193 | + * |
194 | + * ubuntu-terminal-app is distributed in the hope that it will be useful, |
195 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
196 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
197 | + * GNU General Public License for more details. |
198 | + * |
199 | + * You should have received a copy of the GNU General Public License |
200 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
201 | + * |
202 | + * Author: Filippo Scognamiglio <flscogna@gmail.com> |
203 | + */ |
204 | + |
205 | #include "fileio.h" |
206 | |
207 | FileIO::FileIO() |
208 | |
209 | === modified file 'src/app/fileio.h' |
210 | --- src/app/fileio.h 2015-02-03 21:43:38 +0000 |
211 | +++ src/app/fileio.h 2016-09-19 00:47:22 +0000 |
212 | @@ -1,3 +1,24 @@ |
213 | +/* |
214 | + * Copyright: 2015 Canonical Ltd. |
215 | + * |
216 | + * This file is part of ubuntu-terminal-app |
217 | + * |
218 | + * ubuntu-terminal-app is free software: you can redistribute it and/or modify |
219 | + * it under the terms of the GNU General Public License as published by |
220 | + * the Free Software Foundation, either version 3 of the License, or |
221 | + * (at your option) any later version. |
222 | + * |
223 | + * ubuntu-terminal-app is distributed in the hope that it will be useful, |
224 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
225 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
226 | + * GNU General Public License for more details. |
227 | + * |
228 | + * You should have received a copy of the GNU General Public License |
229 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
230 | + * |
231 | + * Author: Filippo Scognamiglio <flscogna@gmail.com> |
232 | + */ |
233 | + |
234 | #ifndef FILEIO_H |
235 | #define FILEIO_H |
236 | |
237 | |
238 | === modified file 'src/app/qml/AlternateActionPopover.qml' |
239 | --- src/app/qml/AlternateActionPopover.qml 2016-02-08 22:27:08 +0000 |
240 | +++ src/app/qml/AlternateActionPopover.qml 2016-09-19 00:47:22 +0000 |
241 | @@ -1,3 +1,20 @@ |
242 | +/* |
243 | + * Copyright (C) 2014 Canonical Ltd |
244 | + * |
245 | + * This program is free software: you can redistribute it and/or modify |
246 | + * it under the terms of the GNU General Public License version 3 as |
247 | + * published by the Free Software Foundation. |
248 | + * |
249 | + * This program is distributed in the hope that it will be useful, |
250 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
251 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
252 | + * GNU General Public License for more details. |
253 | + * |
254 | + * You should have received a copy of the GNU General Public License |
255 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
256 | + * |
257 | + * Authored-by: Filippo Scognamiglio <flscogna@gmail.com> |
258 | + */ |
259 | import QtQuick 2.4 |
260 | import Ubuntu.Components 1.3 |
261 | import Ubuntu.Components.Popups 1.3 |
262 | |
263 | === modified file 'src/app/qml/CircularTransparentButton.qml' |
264 | --- src/app/qml/CircularTransparentButton.qml 2016-03-15 14:39:25 +0000 |
265 | +++ src/app/qml/CircularTransparentButton.qml 2016-09-19 00:47:22 +0000 |
266 | @@ -1,3 +1,20 @@ |
267 | +/* |
268 | + * Copyright (C) 2014 Canonical Ltd |
269 | + * |
270 | + * This program is free software: you can redistribute it and/or modify |
271 | + * it under the terms of the GNU General Public License version 3 as |
272 | + * published by the Free Software Foundation. |
273 | + * |
274 | + * This program is distributed in the hope that it will be useful, |
275 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
276 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
277 | + * GNU General Public License for more details. |
278 | + * |
279 | + * You should have received a copy of the GNU General Public License |
280 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
281 | + * |
282 | + * Authored-by: Filippo Scognamiglio <flscogna@gmail.com> |
283 | + */ |
284 | import QtQuick 2.4 |
285 | import Ubuntu.Components 1.3 |
286 | |
287 | |
288 | === modified file 'src/app/qml/ExpandableButton.qml' |
289 | --- src/app/qml/ExpandableButton.qml 2016-03-15 14:39:25 +0000 |
290 | +++ src/app/qml/ExpandableButton.qml 2016-09-19 00:47:22 +0000 |
291 | @@ -1,3 +1,20 @@ |
292 | +/* |
293 | + * Copyright (C) 2014 Canonical Ltd |
294 | + * |
295 | + * This program is free software: you can redistribute it and/or modify |
296 | + * it under the terms of the GNU General Public License version 3 as |
297 | + * published by the Free Software Foundation. |
298 | + * |
299 | + * This program is distributed in the hope that it will be useful, |
300 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
301 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
302 | + * GNU General Public License for more details. |
303 | + * |
304 | + * You should have received a copy of the GNU General Public License |
305 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
306 | + * |
307 | + * Authored-by: Filippo Scognamiglio <flscogna@gmail.com> |
308 | + */ |
309 | import QtQuick 2.4 |
310 | import Ubuntu.Components 1.3 |
311 | |
312 | |
313 | === modified file 'src/app/qml/KeyboardBar.qml' |
314 | --- src/app/qml/KeyboardBar.qml 2016-01-09 01:47:56 +0000 |
315 | +++ src/app/qml/KeyboardBar.qml 2016-09-19 00:47:22 +0000 |
316 | @@ -1,3 +1,20 @@ |
317 | +/* |
318 | + * Copyright (C) 2014 Canonical Ltd |
319 | + * |
320 | + * This program is free software: you can redistribute it and/or modify |
321 | + * it under the terms of the GNU General Public License version 3 as |
322 | + * published by the Free Software Foundation. |
323 | + * |
324 | + * This program is distributed in the hope that it will be useful, |
325 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
326 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
327 | + * GNU General Public License for more details. |
328 | + * |
329 | + * You should have received a copy of the GNU General Public License |
330 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
331 | + * |
332 | + * Authored-by: Filippo Scognamiglio <flscogna@gmail.com> |
333 | + */ |
334 | import QtQuick 2.4 |
335 | import Ubuntu.Components 1.3 |
336 | import "KeyboardRows" |
337 | |
338 | === modified file 'src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml' |
339 | --- src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml 2016-03-15 14:39:25 +0000 |
340 | +++ src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml 2016-09-19 00:47:22 +0000 |
341 | @@ -1,3 +1,20 @@ |
342 | +/* |
343 | + * Copyright (C) 2014 Canonical Ltd |
344 | + * |
345 | + * This program is free software: you can redistribute it and/or modify |
346 | + * it under the terms of the GNU General Public License version 3 as |
347 | + * published by the Free Software Foundation. |
348 | + * |
349 | + * This program is distributed in the hope that it will be useful, |
350 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
351 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
352 | + * GNU General Public License for more details. |
353 | + * |
354 | + * You should have received a copy of the GNU General Public License |
355 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
356 | + * |
357 | + * Author: Filippo Scognamiglio <flscogna@gmail.com> |
358 | + */ |
359 | import QtQuick 2.4 |
360 | import Ubuntu.Components 1.3 |
361 | |
362 | |
363 | === modified file 'src/app/qml/KeyboardRows/JsonTranslator.qml' |
364 | --- src/app/qml/KeyboardRows/JsonTranslator.qml 2016-01-09 01:47:56 +0000 |
365 | +++ src/app/qml/KeyboardRows/JsonTranslator.qml 2016-09-19 00:47:22 +0000 |
366 | @@ -1,3 +1,20 @@ |
367 | +/* |
368 | + * Copyright (C) 2015 Canonical Ltd |
369 | + * |
370 | + * This program is free software: you can redistribute it and/or modify |
371 | + * it under the terms of the GNU General Public License version 3 as |
372 | + * published by the Free Software Foundation. |
373 | + * |
374 | + * This program is distributed in the hope that it will be useful, |
375 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
376 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
377 | + * GNU General Public License for more details. |
378 | + * |
379 | + * You should have received a copy of the GNU General Public License |
380 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
381 | + * |
382 | + * Author: Niklas Wenzel <nikwen.developer@gmail.com> |
383 | + */ |
384 | import QtQuick 2.4 |
385 | import Ubuntu.Components 1.3 |
386 | |
387 | |
388 | === modified file 'src/app/qml/KeyboardRows/KeyModel.qml' |
389 | --- src/app/qml/KeyboardRows/KeyModel.qml 2016-01-09 01:47:56 +0000 |
390 | +++ src/app/qml/KeyboardRows/KeyModel.qml 2016-09-19 00:47:22 +0000 |
391 | @@ -1,3 +1,20 @@ |
392 | +/* |
393 | + * Copyright (C) 2014 Canonical Ltd |
394 | + * |
395 | + * This program is free software: you can redistribute it and/or modify |
396 | + * it under the terms of the GNU General Public License version 3 as |
397 | + * published by the Free Software Foundation. |
398 | + * |
399 | + * This program is distributed in the hope that it will be useful, |
400 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
401 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
402 | + * GNU General Public License for more details. |
403 | + * |
404 | + * You should have received a copy of the GNU General Public License |
405 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
406 | + * |
407 | + * Author: Filippo Scognamiglio <flscogna@gmail.com> |
408 | + */ |
409 | import QtQuick 2.4 |
410 | import Ubuntu.Components 1.3 |
411 | |
412 | |
413 | === modified file 'src/app/qml/KeyboardRows/KeyboardButton.qml' |
414 | --- src/app/qml/KeyboardRows/KeyboardButton.qml 2016-03-15 14:39:25 +0000 |
415 | +++ src/app/qml/KeyboardRows/KeyboardButton.qml 2016-09-19 00:47:22 +0000 |
416 | @@ -1,3 +1,20 @@ |
417 | +/* |
418 | + * Copyright (C) 2014 Canonical Ltd |
419 | + * |
420 | + * This program is free software: you can redistribute it and/or modify |
421 | + * it under the terms of the GNU General Public License version 3 as |
422 | + * published by the Free Software Foundation. |
423 | + * |
424 | + * This program is distributed in the hope that it will be useful, |
425 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
426 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
427 | + * GNU General Public License for more details. |
428 | + * |
429 | + * You should have received a copy of the GNU General Public License |
430 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
431 | + * |
432 | + * Author: Filippo Scognamiglio <flscogna@gmail.com> |
433 | + */ |
434 | import QtQuick 2.4 |
435 | import Ubuntu.Components 1.3 |
436 | |
437 | |
438 | === modified file 'src/app/qml/KeyboardRows/KeyboardLayout.qml' |
439 | --- src/app/qml/KeyboardRows/KeyboardLayout.qml 2016-01-09 01:47:56 +0000 |
440 | +++ src/app/qml/KeyboardRows/KeyboardLayout.qml 2016-09-19 00:47:22 +0000 |
441 | @@ -1,3 +1,20 @@ |
442 | +/* |
443 | + * Copyright (C) 2015 Canonical Ltd |
444 | + * |
445 | + * This program is free software: you can redistribute it and/or modify |
446 | + * it under the terms of the GNU General Public License version 3 as |
447 | + * published by the Free Software Foundation. |
448 | + * |
449 | + * This program is distributed in the hope that it will be useful, |
450 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
451 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
452 | + * GNU General Public License for more details. |
453 | + * |
454 | + * You should have received a copy of the GNU General Public License |
455 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
456 | + * |
457 | + * Author: Filippo Scognamiglio <flscogna@gmail.com> |
458 | + */ |
459 | import QtQuick 2.4 |
460 | import Ubuntu.Components 1.3 |
461 | |
462 | |
463 | === modified file 'src/app/qml/KeyboardRows/KeyboardRow.qml' |
464 | --- src/app/qml/KeyboardRows/KeyboardRow.qml 2016-01-09 01:47:56 +0000 |
465 | +++ src/app/qml/KeyboardRows/KeyboardRow.qml 2016-09-19 00:47:22 +0000 |
466 | @@ -1,3 +1,20 @@ |
467 | +/* |
468 | + * Copyright (C) 2014 Canonical Ltd |
469 | + * |
470 | + * This program is free software: you can redistribute it and/or modify |
471 | + * it under the terms of the GNU General Public License version 3 as |
472 | + * published by the Free Software Foundation. |
473 | + * |
474 | + * This program is distributed in the hope that it will be useful, |
475 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
476 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
477 | + * GNU General Public License for more details. |
478 | + * |
479 | + * You should have received a copy of the GNU General Public License |
480 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
481 | + * |
482 | + * Author: Filippo Scognamiglio <flscogna@gmail.com> |
483 | + */ |
484 | import QtQuick 2.4 |
485 | import Ubuntu.Components 1.3 |
486 | |
487 | |
488 | === modified file 'src/app/qml/PressFeedback.qml' |
489 | --- src/app/qml/PressFeedback.qml 2015-07-13 20:25:21 +0000 |
490 | +++ src/app/qml/PressFeedback.qml 2016-09-19 00:47:22 +0000 |
491 | @@ -1,3 +1,20 @@ |
492 | +/* |
493 | + * Copyright (C) 2014 Canonical Ltd |
494 | + * |
495 | + * This program is free software: you can redistribute it and/or modify |
496 | + * it under the terms of the GNU General Public License version 3 as |
497 | + * published by the Free Software Foundation. |
498 | + * |
499 | + * This program is distributed in the hope that it will be useful, |
500 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
501 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
502 | + * GNU General Public License for more details. |
503 | + * |
504 | + * You should have received a copy of the GNU General Public License |
505 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
506 | + * |
507 | + * Authored-by: Filippo Scognamiglio <flscogna@gmail.com> |
508 | + */ |
509 | import QtQuick 2.4 |
510 | import QtFeedback 5.0 |
511 | |
512 | |
513 | === modified file 'src/app/qml/TabsModel.qml' |
514 | --- src/app/qml/TabsModel.qml 2015-07-13 20:25:21 +0000 |
515 | +++ src/app/qml/TabsModel.qml 2016-09-19 00:47:22 +0000 |
516 | @@ -1,3 +1,20 @@ |
517 | +/* |
518 | + * Copyright (C) 2014 Canonical Ltd |
519 | + * |
520 | + * This program is free software: you can redistribute it and/or modify |
521 | + * it under the terms of the GNU General Public License version 3 as |
522 | + * published by the Free Software Foundation. |
523 | + * |
524 | + * This program is distributed in the hope that it will be useful, |
525 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
526 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
527 | + * GNU General Public License for more details. |
528 | + * |
529 | + * You should have received a copy of the GNU General Public License |
530 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
531 | + * |
532 | + * Authored-by: Filippo Scognamiglio <flscogna@gmail.com> |
533 | + */ |
534 | import QtQuick 2.4 |
535 | |
536 | ListModel { |
537 | |
538 | === modified file 'src/app/qml/TabsPage.qml' |
539 | --- src/app/qml/TabsPage.qml 2016-05-16 21:17:25 +0000 |
540 | +++ src/app/qml/TabsPage.qml 2016-09-19 00:47:22 +0000 |
541 | @@ -1,3 +1,20 @@ |
542 | +/* |
543 | + * Copyright (C) 2014 Canonical Ltd |
544 | + * |
545 | + * This program is free software: you can redistribute it and/or modify |
546 | + * it under the terms of the GNU General Public License version 3 as |
547 | + * published by the Free Software Foundation. |
548 | + * |
549 | + * This program is distributed in the hope that it will be useful, |
550 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
551 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
552 | + * GNU General Public License for more details. |
553 | + * |
554 | + * You should have received a copy of the GNU General Public License |
555 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
556 | + * |
557 | + * Authored-by: Filippo Scognamiglio <flscogna@gmail.com> |
558 | + */ |
559 | import QtQuick 2.4 |
560 | import Ubuntu.Components 1.3 |
561 | |
562 | |
563 | === modified file 'src/app/qml/TerminalComponent.qml' |
564 | --- src/app/qml/TerminalComponent.qml 2016-03-24 12:23:19 +0000 |
565 | +++ src/app/qml/TerminalComponent.qml 2016-09-19 00:47:22 +0000 |
566 | @@ -1,3 +1,20 @@ |
567 | +/* |
568 | + * Copyright (C) 2014 Canonical Ltd |
569 | + * |
570 | + * This program is free software: you can redistribute it and/or modify |
571 | + * it under the terms of the GNU General Public License version 3 as |
572 | + * published by the Free Software Foundation. |
573 | + * |
574 | + * This program is distributed in the hope that it will be useful, |
575 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
576 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
577 | + * GNU General Public License for more details. |
578 | + * |
579 | + * You should have received a copy of the GNU General Public License |
580 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
581 | + * |
582 | + * Authored-by: Filippo Scognamiglio <flscogna@gmail.com> |
583 | + */ |
584 | import QtQuick 2.4 |
585 | import Ubuntu.Components 1.3 |
586 | import QMLTermWidget 1.0 |
587 | |
588 | === modified file 'src/app/qml/TerminalInputArea.qml' |
589 | --- src/app/qml/TerminalInputArea.qml 2015-07-13 20:25:21 +0000 |
590 | +++ src/app/qml/TerminalInputArea.qml 2016-09-19 00:47:22 +0000 |
591 | @@ -1,3 +1,20 @@ |
592 | +/* |
593 | + * Copyright (C) 2014 Canonical Ltd |
594 | + * |
595 | + * This program is free software: you can redistribute it and/or modify |
596 | + * it under the terms of the GNU General Public License version 3 as |
597 | + * published by the Free Software Foundation. |
598 | + * |
599 | + * This program is distributed in the hope that it will be useful, |
600 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
601 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
602 | + * GNU General Public License for more details. |
603 | + * |
604 | + * You should have received a copy of the GNU General Public License |
605 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
606 | + * |
607 | + * Authored-by: Filippo Scognamiglio <flscogna@gmail.com> |
608 | + */ |
609 | import QtQuick 2.4 |
610 | |
611 | Item{ |
612 | |
613 | === modified file 'src/app/qml/TerminalKeyboardShortcutHandler.qml' |
614 | --- src/app/qml/TerminalKeyboardShortcutHandler.qml 2015-07-13 20:25:21 +0000 |
615 | +++ src/app/qml/TerminalKeyboardShortcutHandler.qml 2016-09-19 00:47:22 +0000 |
616 | @@ -1,3 +1,20 @@ |
617 | +/* |
618 | + * Copyright (C) 2015 Canonical Ltd |
619 | + * |
620 | + * This program is free software: you can redistribute it and/or modify |
621 | + * it under the terms of the GNU General Public License version 3 as |
622 | + * published by the Free Software Foundation. |
623 | + * |
624 | + * This program is distributed in the hope that it will be useful, |
625 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
626 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
627 | + * GNU General Public License for more details. |
628 | + * |
629 | + * You should have received a copy of the GNU General Public License |
630 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
631 | + * |
632 | + * Authored-by: Niklas Wenzel <nikwen.developer@gmail.com> |
633 | + */ |
634 | import QtQuick 2.4 |
635 | |
636 | Item { |
637 | |
638 | === modified file 'src/app/qml/TerminalPage.qml' |
639 | --- src/app/qml/TerminalPage.qml 2016-04-23 12:26:21 +0000 |
640 | +++ src/app/qml/TerminalPage.qml 2016-09-19 00:47:22 +0000 |
641 | @@ -1,3 +1,20 @@ |
642 | +/* |
643 | + * Copyright (C) 2014 Canonical Ltd |
644 | + * |
645 | + * This program is free software: you can redistribute it and/or modify |
646 | + * it under the terms of the GNU General Public License version 3 as |
647 | + * published by the Free Software Foundation. |
648 | + * |
649 | + * This program is distributed in the hope that it will be useful, |
650 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
651 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
652 | + * GNU General Public License for more details. |
653 | + * |
654 | + * You should have received a copy of the GNU General Public License |
655 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
656 | + * |
657 | + * Authored-by: Filippo Scognamiglio <flscogna@gmail.com> |
658 | + */ |
659 | import QtQuick 2.4 |
660 | import Ubuntu.Components 1.3 |
661 | import Ubuntu.Components.Popups 1.3 |
662 | |
663 | === modified file 'src/app/qml/TerminalSettings.qml' |
664 | --- src/app/qml/TerminalSettings.qml 2016-04-05 13:26:03 +0000 |
665 | +++ src/app/qml/TerminalSettings.qml 2016-09-19 00:47:22 +0000 |
666 | @@ -1,3 +1,20 @@ |
667 | +/* |
668 | + * Copyright (C) 2014 Canonical Ltd |
669 | + * |
670 | + * This program is free software: you can redistribute it and/or modify |
671 | + * it under the terms of the GNU General Public License version 3 as |
672 | + * published by the Free Software Foundation. |
673 | + * |
674 | + * This program is distributed in the hope that it will be useful, |
675 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
676 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
677 | + * GNU General Public License for more details. |
678 | + * |
679 | + * You should have received a copy of the GNU General Public License |
680 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
681 | + * |
682 | + * Authored-by: Filippo Scognamiglio <flscogna@gmail.com> |
683 | + */ |
684 | import QtQuick 2.4 |
685 | import Qt.labs.settings 1.0 |
686 | |
687 | |
688 | === modified file 'src/app/qml/ubuntu-terminal-app.qml' |
689 | --- src/app/qml/ubuntu-terminal-app.qml 2016-03-15 14:18:34 +0000 |
690 | +++ src/app/qml/ubuntu-terminal-app.qml 2016-09-19 00:47:22 +0000 |
691 | @@ -1,3 +1,20 @@ |
692 | +/* |
693 | + * Copyright (C) 2014 Canonical Ltd |
694 | + * |
695 | + * This program is free software: you can redistribute it and/or modify |
696 | + * it under the terms of the GNU General Public License version 3 as |
697 | + * published by the Free Software Foundation. |
698 | + * |
699 | + * This program is distributed in the hope that it will be useful, |
700 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
701 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
702 | + * GNU General Public License for more details. |
703 | + * |
704 | + * You should have received a copy of the GNU General Public License |
705 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
706 | + * |
707 | + * Authored-by: Filippo Scognamiglio <flscogna@gmail.com> |
708 | + */ |
709 | import QtQuick 2.4 |
710 | import QtGraphicalEffects 1.0 |
711 | import Ubuntu.Components 1.3 |
712 | |
713 | === added file 'terminal.1' |
714 | --- terminal.1 1970-01-01 00:00:00 +0000 |
715 | +++ terminal.1 2016-09-19 00:47:22 +0000 |
716 | @@ -0,0 +1,56 @@ |
717 | +.\" Hey, EMACS: -*- nroff -*- |
718 | +.\" First parameter, NAME, should be all caps |
719 | +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection |
720 | +.\" other parameters are allowed: see man(7), man(1) |
721 | +.TH TERMINAL 1 "September 16, 2016" |
722 | +.\" Please adjust this date whenever revising the manpage. |
723 | +.\" |
724 | +.\" Some roff macros, for reference: |
725 | +.\" .nh disable hyphenation |
726 | +.\" .hy enable hyphenation |
727 | +.\" .ad l left justify |
728 | +.\" .ad b justify to both left and right margins |
729 | +.\" .nf disable filling |
730 | +.\" .fi enable filling |
731 | +.\" .br insert line break |
732 | +.\" .sp <n> insert n+1 empty lines |
733 | +.\" for manpage-specific macros, see man(7) |
734 | +.SH NAME |
735 | +terminal \- is a terminal emulation application. |
736 | +.SH SYNOPSIS |
737 | +.sp |
738 | +.nf |
739 | +\fIterminal\fR [\-p|\-\-phone] [\-\-workdir <dir>] |
740 | + [\-\-forceAuth <true/false>] [\-t|\-\-tablet] [\-h|\-\-help] [\-I <path>] |
741 | +.nf |
742 | +.sp |
743 | +.SH DESCRIPTION |
744 | +.B terminal |
745 | +is a terminal emulation application that you can use to access a unix shell. |
746 | +.SH OPTIONS |
747 | +.TP |
748 | +.B \-h, \-\-help |
749 | +Show summary of options. |
750 | +.TP |
751 | +.B \-p, \-\-phone |
752 | +If running on Desktop, start in a phone sized window. |
753 | +.TP |
754 | +.B \-t, \-\-tablet |
755 | +If running on Desktop, start in a tablet sized window. |
756 | +.TP |
757 | +.B \-\-forceAuth <true/false> |
758 | +Force authentication on or off. |
759 | +.TP |
760 | +.B \-I <path> |
761 | +Give a path for an additional QML import directory. May be used multiple times. |
762 | +.TP |
763 | +.B \-q <qmlfile> |
764 | +Give an alternative location for the main qml file. |
765 | +.TP |
766 | +.B \-\-workdir <dir> |
767 | +Change working directory to 'dir' |
768 | +.SH AUTHOR |
769 | +Terminal was written by Filippo Scognamiglio <flscogna@gmail.com>. The webpage for this package can be found at |
770 | +http://launchpad.net/ubuntu-terminal-app |
771 | +.PP |
772 | +This manual page was written by Luke Yelavich <themuso@ubuntu.com>, for the Ubuntu project (but may be used by others). |
Many thanks Luke!