Merge lp:~marcoceppi/juju-quickstart/recommend-juju into lp:~juju-gui/juju-quickstart/packaging
- recommend-juju
- Merge into packaging
Proposed by
Marco Ceppi
Status: | Superseded |
---|---|
Proposed branch: | lp:~marcoceppi/juju-quickstart/recommend-juju |
Merge into: | lp:~juju-gui/juju-quickstart/packaging |
Diff against target: |
1211 lines (+1128/-19) 9 files modified
debian/changelog (+167/-0) debian/control (+17/-7) debian/copyright (+661/-12) debian/docs (+1/-0) debian/juju-quickstart.desktop (+13/-0) debian/juju-quickstart.install (+2/-0) debian/juju-quickstart.svg (+257/-0) debian/pydist-overrides (+1/-0) debian/rules (+9/-0) |
To merge this branch: | bzr merge lp:~marcoceppi/juju-quickstart/recommend-juju |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2016-01-24.
Commit message
Description of the change
Juju Quickstart should recommend Juju
To post a comment you must log in.
Unmerged revisions
- 44. By Marco Ceppi
-
Recommend Juju
- 43. By Francesco Banconi
-
[r=frankban,bac] Add Juju Quickstart desktop icon.
- 42. By Francesco Banconi
-
Increase commit revision for retrying build.
- 41. By Francesco Banconi
-
Update for 2.2.4
- 40. By Francesco Banconi
-
Update for 2.2.3
- 39. By Francesco Banconi
-
Update for 2.2.2
- 38. By Francesco Banconi
-
Update for 2.2.1
- 37. By Francesco Banconi
-
Update for 2.2.0
- 36. By Francesco Banconi
-
Update for 2.1.1
- 35. By Francesco Banconi
-
Include jujubundlelib in the build dependencies.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' |
2 | --- debian/changelog 2014-06-05 13:51:30 +0000 |
3 | +++ debian/changelog 2016-01-24 19:17:27 +0000 |
4 | @@ -1,3 +1,170 @@ |
5 | +juju-quickstart (2.2.4ubuntu1) UNRELEASED; urgency=medium |
6 | + |
7 | + * Recommends juju, juju-core, juju-local |
8 | + |
9 | + -- Marco Ceppi <marco@ceppi.net> Sun, 24 Jan 2016 14:15:01 -0500 |
10 | + |
11 | +juju-quickstart (2.2.4) trusty; urgency=low |
12 | + |
13 | + * Update to juju-bundlelib 0.4.1. |
14 | + |
15 | + -- Francesco Banconi <francesco.banconi@canonical.com> Fri, 18 Dec 2015 11:58:26 +0100 |
16 | + |
17 | +juju-quickstart (2.2.3) trusty; urgency=low |
18 | + |
19 | + * Update to jujubundlelib 0.3.2. |
20 | + |
21 | + -- Francesco Banconi <francesco.banconi@canonical.com> Mon, 30 Nov 2015 09:28:51 +0000 |
22 | + |
23 | +juju-quickstart (2.2.2) trusty; urgency=low |
24 | + |
25 | + * Introduce support for Juju controllers. |
26 | + * Use API info to connect to existing environments. |
27 | + * Add the missing Joyent data centers. |
28 | + |
29 | + -- Francesco Banconi <francesco.banconi@canonical.com> Fri, 06 Nov 2015 11:39:31 +0000 |
30 | + |
31 | +juju-quickstart (2.2.1) trusty; urgency=low |
32 | + |
33 | + * Full support for deploying bundles with v4 syntax. |
34 | + * Improve bundle validation logic. |
35 | + |
36 | + -- Francesco Banconi <francesco.banconi@canonical.com> Thu, 13 Aug 2015 13:18:03 +0000 |
37 | + |
38 | +juju-quickstart (2.2.0) trusty; urgency=low |
39 | + |
40 | + * Add support for loading uncommitted bundles on the Juju GUI. |
41 | + * Allow configuring the Juju GUI so that it listens to a customized port. |
42 | + * On existing environments, automatically detect the port used by the GUI server. |
43 | + * Fix SSH agent handling when using uncommon shells. |
44 | + |
45 | + -- Francesco Banconi <francesco.banconi@canonical.com> Thu, 11 Jun 2015 10:05:16 +0000 |
46 | + |
47 | +juju-quickstart (2.1.1) trusty; urgency=low |
48 | + |
49 | + * Fix a bug when handling bundles including services with no num_units defined. |
50 | + |
51 | + -- Francesco Banconi <francesco.banconi@canonical.com> Wed, 13 May 2015 10:09:00 +0000 |
52 | + |
53 | +juju-quickstart (2.1.0) trusty; urgency=low |
54 | + |
55 | + * Improve bundle validation. |
56 | + * Update environment management in the interactive session (provider specific fields). |
57 | + |
58 | + -- Francesco Banconi <francesco.banconi@canonical.com> Mon, 11 May 2015 10:49:49 +0000 |
59 | + |
60 | +juju-quickstart (2.0.2) trusty; urgency=low |
61 | + |
62 | + * Add support for Google Compute Engine. |
63 | + |
64 | + -- Bradley A. Crittenden <bac@canonical.com> Thu, 07 May 2015 15:31:37 -0400 |
65 | + |
66 | +juju-quickstart (2.0.1) trusty; urgency=low |
67 | + |
68 | + * Fix a regression in bundle deployments when using the legacy bundle syntax. |
69 | + The bundle was not found in the case the original legacy YAML only included |
70 | + a single bundle name at top level. |
71 | + * Always run apt-get update before installing new packages, even when the |
72 | + distro-only flag is enabled. |
73 | + * Improve charm store API client code organization. |
74 | + |
75 | + -- Francesco Banconi <francesco.banconi@canonical.com> Tue, 10 Mar 2015 14:30:33 +0000 |
76 | + |
77 | +juju-quickstart (2.0.0) trusty; urgency=low |
78 | + |
79 | + * Update the way bundles can be specified on the command line. |
80 | + The new simplified jujucharms.com syntax is used, |
81 | + e.g. "juju-quickstart mediawiki-single". |
82 | + The old "bundle:mediawiki/single" form is still supported but deprecated. |
83 | + * When deploying bundles, specifying a directory is no longer supported. |
84 | + Local files are still supported but must have a ".yaml" or ".json" |
85 | + extension. For more details, see "juju-quickstart --help". |
86 | + * Add support for new Juju WebSocket API endpoints. |
87 | + Connect to a specific environment using its unique identifier. |
88 | + * External API refactoring: implement the Juju reference model |
89 | + (charm and bundle URLs). |
90 | + Improve support for bundles as first class entities. |
91 | + * Retrieve bundles from the new charm store API v4. |
92 | + * Improve the testing infrastructure: exercize Quickstart with all the |
93 | + supported dependency versions. |
94 | + Also introduce functional tests against a real Juju environment. |
95 | + |
96 | + -- Francesco Banconi <francesco.banconi@canonical.com> Mon, 02 Mar 2015 13:21:52 +0000 |
97 | + |
98 | +juju-quickstart (1.6.0) trusty; urgency=low |
99 | + |
100 | + * Interactive session improvements: highlight active environments. |
101 | + * Ability to use jenv environments not listed in the environments.yaml file. |
102 | + * Ability to remove no longer used jenv files from the Juju home. |
103 | + * Use the new charm store API to retrieve the most recent GUI charm revision. |
104 | + * Include the Juju account user name in the program output. |
105 | + * Support for logging in to the Juju API with non-admin accounts. |
106 | + * Improve the way the environment's provider type is retrieved. |
107 | + * Initial support for Ubuntu 15.04 (vivid). |
108 | + |
109 | + -- Francesco Banconi <francesco.banconi@canonical.com> Tue, 13 Jan 2015 14:11:49 +0000 |
110 | + |
111 | +juju-quickstart (1.5.0) trusty; urgency=low |
112 | + |
113 | + * Initial support for the manual provider type. |
114 | + * Better integration with MAAS: improved the way node addresses are retrieved. |
115 | + * Auto-detect environment data when MAAS (Bare Metal) is used. |
116 | + * Improve the way Juju Quickstart detects the Juju environment is already running. |
117 | + * Interactive session no longer hides errors under certain circumstances. |
118 | + * Dropped support for Juju < 1.18. |
119 | + |
120 | + -- Francesco Banconi <francesco.banconi@canonical.com> Thu, 13 Nov 2014 09:28:37 +0000 |
121 | + |
122 | +juju-quickstart (1.4.4) trusty; urgency=low |
123 | + |
124 | + * Support creating and using MAAS (Metal As A Service) environments. |
125 | + |
126 | + -- Francesco Banconi <francesco.banconi@canonical.com> Wed, 01 Oct 2014 15:38:32 +0000 |
127 | + |
128 | +juju-quickstart (1.4.3) trusty; urgency=low |
129 | + |
130 | + * Support for overriding the Juju executable with the JUJU env var. |
131 | + * Add support for Ubuntu 14.10 (utopic). |
132 | + * Base dependencies update. |
133 | + |
134 | + -- Francesco Banconi <francesco.banconi@canonical.com> Thu, 11 Sep 2014 11:57:47 +0000 |
135 | + |
136 | +juju-quickstart (1.4.2) trusty; urgency=low |
137 | + |
138 | + * Support LXC clone in local provider. |
139 | + * Add support for upload-tools, upload-series and constraints args. |
140 | + |
141 | + -- Francesco Banconi <francesco.banconi@canonical.com> Thu, 21 Aug 2014 16:48:49 +0000 |
142 | + |
143 | +juju-quickstart (1.4.1) trusty; urgency=low |
144 | + |
145 | + * Add release instructions for homebrew. |
146 | + * Do not colocate GUI on machine 0 for Azure. (LP#1335121) |
147 | + * Adapt to Juju 1.20 regarding watcher API changes. (LP#1337831) |
148 | + |
149 | + -- Bradley A. Crittenden <bac@canonical.com> Fri, 04 Jul 2014 10:30:31 -0400 |
150 | + |
151 | +juju-quickstart (1.4.0) trusty; urgency=low |
152 | + |
153 | + * On OS X fail early if brew is not installed. |
154 | + * Do not propose local environments if not supported. |
155 | + * Update README.rst to discuss OS X installation. |
156 | + * Match new HP Cloud configuration. |
157 | + |
158 | + -- Bradley A. Crittenden <bac@canonical.com> Tue, 17 Jun 2014 14:28:56 -0400 |
159 | + |
160 | +juju-quickstart (1.3.5) trusty; urgency=low |
161 | + |
162 | + * Change to 1.3.5 to overcome improper naming of 1.3.4.b1. |
163 | + |
164 | + -- Bradley A. Crittenden <bac@canonical.com> Wed, 11 Jun 2014 20:57:31 -0400 |
165 | + |
166 | +juju-quickstart (1.3.4) trusty; urgency=low |
167 | + |
168 | + * Fail early if platform does not support LXC and it is requested. |
169 | + |
170 | + -- Bradley A. Crittenden <bac@canonical.com> Wed, 11 Jun 2014 20:11:33 -0400 |
171 | + |
172 | juju-quickstart (1.3.3) precise; urgency=low |
173 | |
174 | * Make juju-quickstart websockets use TLSv1. |
175 | |
176 | === modified file 'debian/control' |
177 | --- debian/control 2013-10-18 12:16:40 +0000 |
178 | +++ debian/control 2016-01-24 19:17:27 +0000 |
179 | @@ -1,9 +1,18 @@ |
180 | Source: juju-quickstart |
181 | -Maintainer: Francesco Banconi <francesco.banconi@canonical.com> |
182 | Section: python |
183 | Priority: optional |
184 | -Standards-Version: 3.9.3 |
185 | -Build-Depends: debhelper (>= 7.4), python(>= 2.7), python-setuptools |
186 | +Maintainer: Francesco Banconi <francesco.banconi@canonical.com> |
187 | +Standards-Version: 3.9.5 |
188 | +Build-Depends: |
189 | + debhelper (>= 8~), |
190 | + jujubundlelib, |
191 | + python-all, |
192 | + python-setuptools, |
193 | + python-nose, |
194 | + python-jujuclient, |
195 | + python-mock, |
196 | + python-urwid, |
197 | + python-yaml |
198 | XS-Python-Version: all |
199 | Homepage: https://launchpad.net/juju-quickstart |
200 | |
201 | @@ -12,7 +21,8 @@ |
202 | XB-Python-Version: ${python:Versions} |
203 | Depends: ${python:Depends}, ${misc:Depends} |
204 | Provides: ${python:Provides} |
205 | -Description: Set up a Juju environment with a GUI in very few steps |
206 | - Juju Quickstart is a Juju plugin which allows for easily setting up a Juju |
207 | - environment in very few steps. The environment is bootstrapped and set up so |
208 | - that it can be managed using a Web interface (the Juju GUI). |
209 | +Recommends: juju-core, juju, juju-local |
210 | +Description: Easy configuration of Juju environments |
211 | + Juju Quickstart is a Juju plugin which supports easy configuration of a Juju |
212 | + environment. The environment is bootstrapped and set up that it can be |
213 | + managed using the Juju GUI. |
214 | |
215 | === modified file 'debian/copyright' |
216 | --- debian/copyright 2014-01-17 18:44:27 +0000 |
217 | +++ debian/copyright 2016-01-24 19:17:27 +0000 |
218 | @@ -11,15 +11,664 @@ |
219 | License: AGPL-3.0+ |
220 | |
221 | License: AGPL-3.0+ |
222 | - This program is free software: you can redistribute it and/or modify |
223 | - it under the terms of the GNU Affero General Public License as |
224 | - published by the Free Software Foundation, either version 3 of the |
225 | - License, or (at your option) any later version. |
226 | - |
227 | - This program is distributed in the hope that it will be useful, |
228 | - but WITHOUT ANY WARRANTY; without even the implied warranty of |
229 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
230 | - GNU Affero General Public License for more details. |
231 | - |
232 | - You should have received a copy of the GNU Affero General Public License |
233 | - along with this program. If not, see <http://www.gnu.org/licenses/>. |
234 | + GNU AFFERO GENERAL PUBLIC LICENSE |
235 | + Version 3, 19 November 2007 |
236 | + . |
237 | + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> |
238 | + Everyone is permitted to copy and distribute verbatim copies |
239 | + of this license document, but changing it is not allowed. |
240 | + . |
241 | + Preamble |
242 | + . |
243 | + The GNU Affero General Public License is a free, copyleft license for |
244 | + software and other kinds of works, specifically designed to ensure |
245 | + cooperation with the community in the case of network server software. |
246 | + . |
247 | + The licenses for most software and other practical works are designed |
248 | + to take away your freedom to share and change the works. By contrast, |
249 | + our General Public Licenses are intended to guarantee your freedom to |
250 | + share and change all versions of a program--to make sure it remains free |
251 | + software for all its users. |
252 | + . |
253 | + When we speak of free software, we are referring to freedom, not |
254 | + price. Our General Public Licenses are designed to make sure that you |
255 | + have the freedom to distribute copies of free software (and charge for |
256 | + them if you wish), that you receive source code or can get it if you |
257 | + want it, that you can change the software or use pieces of it in new |
258 | + free programs, and that you know you can do these things. |
259 | + . |
260 | + Developers that use our General Public Licenses protect your rights |
261 | + with two steps: (1) assert copyright on the software, and (2) offer |
262 | + you this License which gives you legal permission to copy, distribute |
263 | + and/or modify the software. |
264 | + . |
265 | + A secondary benefit of defending all users' freedom is that |
266 | + improvements made in alternate versions of the program, if they |
267 | + receive widespread use, become available for other developers to |
268 | + incorporate. Many developers of free software are heartened and |
269 | + encouraged by the resulting cooperation. However, in the case of |
270 | + software used on network servers, this result may fail to come about. |
271 | + The GNU General Public License permits making a modified version and |
272 | + letting the public access it on a server without ever releasing its |
273 | + source code to the public. |
274 | + . |
275 | + The GNU Affero General Public License is designed specifically to |
276 | + ensure that, in such cases, the modified source code becomes available |
277 | + to the community. It requires the operator of a network server to |
278 | + provide the source code of the modified version running there to the |
279 | + users of that server. Therefore, public use of a modified version, on |
280 | + a publicly accessible server, gives the public access to the source |
281 | + code of the modified version. |
282 | + . |
283 | + An older license, called the Affero General Public License and |
284 | + published by Affero, was designed to accomplish similar goals. This is |
285 | + a different license, not a version of the Affero GPL, but Affero has |
286 | + released a new version of the Affero GPL which permits relicensing under |
287 | + this license. |
288 | + . |
289 | + The precise terms and conditions for copying, distribution and |
290 | + modification follow. |
291 | + . |
292 | + TERMS AND CONDITIONS |
293 | + . |
294 | + 0. Definitions. |
295 | + . |
296 | + "This License" refers to version 3 of the GNU Affero General Public License. |
297 | + . |
298 | + "Copyright" also means copyright-like laws that apply to other kinds of |
299 | + works, such as semiconductor masks. |
300 | + . |
301 | + "The Program" refers to any copyrightable work licensed under this |
302 | + License. Each licensee is addressed as "you". "Licensees" and |
303 | + "recipients" may be individuals or organizations. |
304 | + . |
305 | + To "modify" a work means to copy from or adapt all or part of the work |
306 | + in a fashion requiring copyright permission, other than the making of an |
307 | + exact copy. The resulting work is called a "modified version" of the |
308 | + earlier work or a work "based on" the earlier work. |
309 | + . |
310 | + A "covered work" means either the unmodified Program or a work based |
311 | + on the Program. |
312 | + . |
313 | + To "propagate" a work means to do anything with it that, without |
314 | + permission, would make you directly or secondarily liable for |
315 | + infringement under applicable copyright law, except executing it on a |
316 | + computer or modifying a private copy. Propagation includes copying, |
317 | + distribution (with or without modification), making available to the |
318 | + public, and in some countries other activities as well. |
319 | + . |
320 | + To "convey" a work means any kind of propagation that enables other |
321 | + parties to make or receive copies. Mere interaction with a user through |
322 | + a computer network, with no transfer of a copy, is not conveying. |
323 | + . |
324 | + An interactive user interface displays "Appropriate Legal Notices" |
325 | + to the extent that it includes a convenient and prominently visible |
326 | + feature that (1) displays an appropriate copyright notice, and (2) |
327 | + tells the user that there is no warranty for the work (except to the |
328 | + extent that warranties are provided), that licensees may convey the |
329 | + work under this License, and how to view a copy of this License. If |
330 | + the interface presents a list of user commands or options, such as a |
331 | + menu, a prominent item in the list meets this criterion. |
332 | + . |
333 | + 1. Source Code. |
334 | + . |
335 | + The "source code" for a work means the preferred form of the work |
336 | + for making modifications to it. "Object code" means any non-source |
337 | + form of a work. |
338 | + . |
339 | + A "Standard Interface" means an interface that either is an official |
340 | + standard defined by a recognized standards body, or, in the case of |
341 | + interfaces specified for a particular programming language, one that |
342 | + is widely used among developers working in that language. |
343 | + . |
344 | + The "System Libraries" of an executable work include anything, other |
345 | + than the work as a whole, that (a) is included in the normal form of |
346 | + packaging a Major Component, but which is not part of that Major |
347 | + Component, and (b) serves only to enable use of the work with that |
348 | + Major Component, or to implement a Standard Interface for which an |
349 | + implementation is available to the public in source code form. A |
350 | + "Major Component", in this context, means a major essential component |
351 | + (kernel, window system, and so on) of the specific operating system |
352 | + (if any) on which the executable work runs, or a compiler used to |
353 | + produce the work, or an object code interpreter used to run it. |
354 | + . |
355 | + The "Corresponding Source" for a work in object code form means all |
356 | + the source code needed to generate, install, and (for an executable |
357 | + work) run the object code and to modify the work, including scripts to |
358 | + control those activities. However, it does not include the work's |
359 | + System Libraries, or general-purpose tools or generally available free |
360 | + programs which are used unmodified in performing those activities but |
361 | + which are not part of the work. For example, Corresponding Source |
362 | + includes interface definition files associated with source files for |
363 | + the work, and the source code for shared libraries and dynamically |
364 | + linked subprograms that the work is specifically designed to require, |
365 | + such as by intimate data communication or control flow between those |
366 | + subprograms and other parts of the work. |
367 | + . |
368 | + The Corresponding Source need not include anything that users |
369 | + can regenerate automatically from other parts of the Corresponding |
370 | + Source. |
371 | + . |
372 | + The Corresponding Source for a work in source code form is that |
373 | + same work. |
374 | + . |
375 | + 2. Basic Permissions. |
376 | + . |
377 | + All rights granted under this License are granted for the term of |
378 | + copyright on the Program, and are irrevocable provided the stated |
379 | + conditions are met. This License explicitly affirms your unlimited |
380 | + permission to run the unmodified Program. The output from running a |
381 | + covered work is covered by this License only if the output, given its |
382 | + content, constitutes a covered work. This License acknowledges your |
383 | + rights of fair use or other equivalent, as provided by copyright law. |
384 | + . |
385 | + You may make, run and propagate covered works that you do not |
386 | + convey, without conditions so long as your license otherwise remains |
387 | + in force. You may convey covered works to others for the sole purpose |
388 | + of having them make modifications exclusively for you, or provide you |
389 | + with facilities for running those works, provided that you comply with |
390 | + the terms of this License in conveying all material for which you do |
391 | + not control copyright. Those thus making or running the covered works |
392 | + for you must do so exclusively on your behalf, under your direction |
393 | + and control, on terms that prohibit them from making any copies of |
394 | + your copyrighted material outside their relationship with you. |
395 | + . |
396 | + Conveying under any other circumstances is permitted solely under |
397 | + the conditions stated below. Sublicensing is not allowed; section 10 |
398 | + makes it unnecessary. |
399 | + . |
400 | + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. |
401 | + . |
402 | + No covered work shall be deemed part of an effective technological |
403 | + measure under any applicable law fulfilling obligations under article |
404 | + 11 of the WIPO copyright treaty adopted on 20 December 1996, or |
405 | + similar laws prohibiting or restricting circumvention of such |
406 | + measures. |
407 | + . |
408 | + When you convey a covered work, you waive any legal power to forbid |
409 | + circumvention of technological measures to the extent such circumvention |
410 | + is effected by exercising rights under this License with respect to |
411 | + the covered work, and you disclaim any intention to limit operation or |
412 | + modification of the work as a means of enforcing, against the work's |
413 | + users, your or third parties' legal rights to forbid circumvention of |
414 | + technological measures. |
415 | + . |
416 | + 4. Conveying Verbatim Copies. |
417 | + . |
418 | + You may convey verbatim copies of the Program's source code as you |
419 | + receive it, in any medium, provided that you conspicuously and |
420 | + appropriately publish on each copy an appropriate copyright notice; |
421 | + keep intact all notices stating that this License and any |
422 | + non-permissive terms added in accord with section 7 apply to the code; |
423 | + keep intact all notices of the absence of any warranty; and give all |
424 | + recipients a copy of this License along with the Program. |
425 | + . |
426 | + You may charge any price or no price for each copy that you convey, |
427 | + and you may offer support or warranty protection for a fee. |
428 | + . |
429 | + 5. Conveying Modified Source Versions. |
430 | + . |
431 | + You may convey a work based on the Program, or the modifications to |
432 | + produce it from the Program, in the form of source code under the |
433 | + terms of section 4, provided that you also meet all of these conditions: |
434 | + . |
435 | + a) The work must carry prominent notices stating that you modified |
436 | + it, and giving a relevant date. |
437 | + . |
438 | + b) The work must carry prominent notices stating that it is |
439 | + released under this License and any conditions added under section |
440 | + 7. This requirement modifies the requirement in section 4 to |
441 | + "keep intact all notices". |
442 | + . |
443 | + c) You must license the entire work, as a whole, under this |
444 | + License to anyone who comes into possession of a copy. This |
445 | + License will therefore apply, along with any applicable section 7 |
446 | + additional terms, to the whole of the work, and all its parts, |
447 | + regardless of how they are packaged. This License gives no |
448 | + permission to license the work in any other way, but it does not |
449 | + invalidate such permission if you have separately received it. |
450 | + . |
451 | + d) If the work has interactive user interfaces, each must display |
452 | + Appropriate Legal Notices; however, if the Program has interactive |
453 | + interfaces that do not display Appropriate Legal Notices, your |
454 | + work need not make them do so. |
455 | + . |
456 | + A compilation of a covered work with other separate and independent |
457 | + works, which are not by their nature extensions of the covered work, |
458 | + and which are not combined with it such as to form a larger program, |
459 | + in or on a volume of a storage or distribution medium, is called an |
460 | + "aggregate" if the compilation and its resulting copyright are not |
461 | + used to limit the access or legal rights of the compilation's users |
462 | + beyond what the individual works permit. Inclusion of a covered work |
463 | + in an aggregate does not cause this License to apply to the other |
464 | + parts of the aggregate. |
465 | + . |
466 | + 6. Conveying Non-Source Forms. |
467 | + . |
468 | + You may convey a covered work in object code form under the terms |
469 | + of sections 4 and 5, provided that you also convey the |
470 | + machine-readable Corresponding Source under the terms of this License, |
471 | + in one of these ways: |
472 | + . |
473 | + a) Convey the object code in, or embodied in, a physical product |
474 | + (including a physical distribution medium), accompanied by the |
475 | + Corresponding Source fixed on a durable physical medium |
476 | + customarily used for software interchange. |
477 | + . |
478 | + b) Convey the object code in, or embodied in, a physical product |
479 | + (including a physical distribution medium), accompanied by a |
480 | + written offer, valid for at least three years and valid for as |
481 | + long as you offer spare parts or customer support for that product |
482 | + model, to give anyone who possesses the object code either (1) a |
483 | + copy of the Corresponding Source for all the software in the |
484 | + product that is covered by this License, on a durable physical |
485 | + medium customarily used for software interchange, for a price no |
486 | + more than your reasonable cost of physically performing this |
487 | + conveying of source, or (2) access to copy the |
488 | + Corresponding Source from a network server at no charge. |
489 | + . |
490 | + c) Convey individual copies of the object code with a copy of the |
491 | + written offer to provide the Corresponding Source. This |
492 | + alternative is allowed only occasionally and noncommercially, and |
493 | + only if you received the object code with such an offer, in accord |
494 | + with subsection 6b. |
495 | + . |
496 | + d) Convey the object code by offering access from a designated |
497 | + place (gratis or for a charge), and offer equivalent access to the |
498 | + Corresponding Source in the same way through the same place at no |
499 | + further charge. You need not require recipients to copy the |
500 | + Corresponding Source along with the object code. If the place to |
501 | + copy the object code is a network server, the Corresponding Source |
502 | + may be on a different server (operated by you or a third party) |
503 | + that supports equivalent copying facilities, provided you maintain |
504 | + clear directions next to the object code saying where to find the |
505 | + Corresponding Source. Regardless of what server hosts the |
506 | + Corresponding Source, you remain obligated to ensure that it is |
507 | + available for as long as needed to satisfy these requirements. |
508 | + . |
509 | + e) Convey the object code using peer-to-peer transmission, provided |
510 | + you inform other peers where the object code and Corresponding |
511 | + Source of the work are being offered to the general public at no |
512 | + charge under subsection 6d. |
513 | + . |
514 | + A separable portion of the object code, whose source code is excluded |
515 | + from the Corresponding Source as a System Library, need not be |
516 | + included in conveying the object code work. |
517 | + . |
518 | + A "User Product" is either (1) a "consumer product", which means any |
519 | + tangible personal property which is normally used for personal, family, |
520 | + or household purposes, or (2) anything designed or sold for incorporation |
521 | + into a dwelling. In determining whether a product is a consumer product, |
522 | + doubtful cases shall be resolved in favor of coverage. For a particular |
523 | + product received by a particular user, "normally used" refers to a |
524 | + typical or common use of that class of product, regardless of the status |
525 | + of the particular user or of the way in which the particular user |
526 | + actually uses, or expects or is expected to use, the product. A product |
527 | + is a consumer product regardless of whether the product has substantial |
528 | + commercial, industrial or non-consumer uses, unless such uses represent |
529 | + the only significant mode of use of the product. |
530 | + . |
531 | + "Installation Information" for a User Product means any methods, |
532 | + procedures, authorization keys, or other information required to install |
533 | + and execute modified versions of a covered work in that User Product from |
534 | + a modified version of its Corresponding Source. The information must |
535 | + suffice to ensure that the continued functioning of the modified object |
536 | + code is in no case prevented or interfered with solely because |
537 | + modification has been made. |
538 | + . |
539 | + If you convey an object code work under this section in, or with, or |
540 | + specifically for use in, a User Product, and the conveying occurs as |
541 | + part of a transaction in which the right of possession and use of the |
542 | + User Product is transferred to the recipient in perpetuity or for a |
543 | + fixed term (regardless of how the transaction is characterized), the |
544 | + Corresponding Source conveyed under this section must be accompanied |
545 | + by the Installation Information. But this requirement does not apply |
546 | + if neither you nor any third party retains the ability to install |
547 | + modified object code on the User Product (for example, the work has |
548 | + been installed in ROM). |
549 | + . |
550 | + The requirement to provide Installation Information does not include a |
551 | + requirement to continue to provide support service, warranty, or updates |
552 | + for a work that has been modified or installed by the recipient, or for |
553 | + the User Product in which it has been modified or installed. Access to a |
554 | + network may be denied when the modification itself materially and |
555 | + adversely affects the operation of the network or violates the rules and |
556 | + protocols for communication across the network. |
557 | + . |
558 | + Corresponding Source conveyed, and Installation Information provided, |
559 | + in accord with this section must be in a format that is publicly |
560 | + documented (and with an implementation available to the public in |
561 | + source code form), and must require no special password or key for |
562 | + unpacking, reading or copying. |
563 | + . |
564 | + 7. Additional Terms. |
565 | + . |
566 | + "Additional permissions" are terms that supplement the terms of this |
567 | + License by making exceptions from one or more of its conditions. |
568 | + Additional permissions that are applicable to the entire Program shall |
569 | + be treated as though they were included in this License, to the extent |
570 | + that they are valid under applicable law. If additional permissions |
571 | + apply only to part of the Program, that part may be used separately |
572 | + under those permissions, but the entire Program remains governed by |
573 | + this License without regard to the additional permissions. |
574 | + . |
575 | + When you convey a copy of a covered work, you may at your option |
576 | + remove any additional permissions from that copy, or from any part of |
577 | + it. (Additional permissions may be written to require their own |
578 | + removal in certain cases when you modify the work.) You may place |
579 | + additional permissions on material, added by you to a covered work, |
580 | + for which you have or can give appropriate copyright permission. |
581 | + . |
582 | + Notwithstanding any other provision of this License, for material you |
583 | + add to a covered work, you may (if authorized by the copyright holders of |
584 | + that material) supplement the terms of this License with terms: |
585 | + . |
586 | + a) Disclaiming warranty or limiting liability differently from the |
587 | + terms of sections 15 and 16 of this License; or |
588 | + . |
589 | + b) Requiring preservation of specified reasonable legal notices or |
590 | + author attributions in that material or in the Appropriate Legal |
591 | + Notices displayed by works containing it; or |
592 | + . |
593 | + c) Prohibiting misrepresentation of the origin of that material, or |
594 | + requiring that modified versions of such material be marked in |
595 | + reasonable ways as different from the original version; or |
596 | + . |
597 | + d) Limiting the use for publicity purposes of names of licensors or |
598 | + authors of the material; or |
599 | + . |
600 | + e) Declining to grant rights under trademark law for use of some |
601 | + trade names, trademarks, or service marks; or |
602 | + . |
603 | + f) Requiring indemnification of licensors and authors of that |
604 | + material by anyone who conveys the material (or modified versions of |
605 | + it) with contractual assumptions of liability to the recipient, for |
606 | + any liability that these contractual assumptions directly impose on |
607 | + those licensors and authors. |
608 | + . |
609 | + All other non-permissive additional terms are considered "further |
610 | + restrictions" within the meaning of section 10. If the Program as you |
611 | + received it, or any part of it, contains a notice stating that it is |
612 | + governed by this License along with a term that is a further |
613 | + restriction, you may remove that term. If a license document contains |
614 | + a further restriction but permits relicensing or conveying under this |
615 | + License, you may add to a covered work material governed by the terms |
616 | + of that license document, provided that the further restriction does |
617 | + not survive such relicensing or conveying. |
618 | + . |
619 | + If you add terms to a covered work in accord with this section, you |
620 | + must place, in the relevant source files, a statement of the |
621 | + additional terms that apply to those files, or a notice indicating |
622 | + where to find the applicable terms. |
623 | + . |
624 | + Additional terms, permissive or non-permissive, may be stated in the |
625 | + form of a separately written license, or stated as exceptions; |
626 | + the above requirements apply either way. |
627 | + . |
628 | + 8. Termination. |
629 | + . |
630 | + You may not propagate or modify a covered work except as expressly |
631 | + provided under this License. Any attempt otherwise to propagate or |
632 | + modify it is void, and will automatically terminate your rights under |
633 | + this License (including any patent licenses granted under the third |
634 | + paragraph of section 11). |
635 | + . |
636 | + However, if you cease all violation of this License, then your |
637 | + license from a particular copyright holder is reinstated (a) |
638 | + provisionally, unless and until the copyright holder explicitly and |
639 | + finally terminates your license, and (b) permanently, if the copyright |
640 | + holder fails to notify you of the violation by some reasonable means |
641 | + prior to 60 days after the cessation. |
642 | + . |
643 | + Moreover, your license from a particular copyright holder is |
644 | + reinstated permanently if the copyright holder notifies you of the |
645 | + violation by some reasonable means, this is the first time you have |
646 | + received notice of violation of this License (for any work) from that |
647 | + copyright holder, and you cure the violation prior to 30 days after |
648 | + your receipt of the notice. |
649 | + . |
650 | + Termination of your rights under this section does not terminate the |
651 | + licenses of parties who have received copies or rights from you under |
652 | + this License. If your rights have been terminated and not permanently |
653 | + reinstated, you do not qualify to receive new licenses for the same |
654 | + material under section 10. |
655 | + . |
656 | + 9. Acceptance Not Required for Having Copies. |
657 | + . |
658 | + You are not required to accept this License in order to receive or |
659 | + run a copy of the Program. Ancillary propagation of a covered work |
660 | + occurring solely as a consequence of using peer-to-peer transmission |
661 | + to receive a copy likewise does not require acceptance. However, |
662 | + nothing other than this License grants you permission to propagate or |
663 | + modify any covered work. These actions infringe copyright if you do |
664 | + not accept this License. Therefore, by modifying or propagating a |
665 | + covered work, you indicate your acceptance of this License to do so. |
666 | + . |
667 | + 10. Automatic Licensing of Downstream Recipients. |
668 | + . |
669 | + Each time you convey a covered work, the recipient automatically |
670 | + receives a license from the original licensors, to run, modify and |
671 | + propagate that work, subject to this License. You are not responsible |
672 | + for enforcing compliance by third parties with this License. |
673 | + . |
674 | + An "entity transaction" is a transaction transferring control of an |
675 | + organization, or substantially all assets of one, or subdividing an |
676 | + organization, or merging organizations. If propagation of a covered |
677 | + work results from an entity transaction, each party to that |
678 | + transaction who receives a copy of the work also receives whatever |
679 | + licenses to the work the party's predecessor in interest had or could |
680 | + give under the previous paragraph, plus a right to possession of the |
681 | + Corresponding Source of the work from the predecessor in interest, if |
682 | + the predecessor has it or can get it with reasonable efforts. |
683 | + . |
684 | + You may not impose any further restrictions on the exercise of the |
685 | + rights granted or affirmed under this License. For example, you may |
686 | + not impose a license fee, royalty, or other charge for exercise of |
687 | + rights granted under this License, and you may not initiate litigation |
688 | + (including a cross-claim or counterclaim in a lawsuit) alleging that |
689 | + any patent claim is infringed by making, using, selling, offering for |
690 | + sale, or importing the Program or any portion of it. |
691 | + . |
692 | + 11. Patents. |
693 | + . |
694 | + A "contributor" is a copyright holder who authorizes use under this |
695 | + License of the Program or a work on which the Program is based. The |
696 | + work thus licensed is called the contributor's "contributor version". |
697 | + . |
698 | + A contributor's "essential patent claims" are all patent claims |
699 | + owned or controlled by the contributor, whether already acquired or |
700 | + hereafter acquired, that would be infringed by some manner, permitted |
701 | + by this License, of making, using, or selling its contributor version, |
702 | + but do not include claims that would be infringed only as a |
703 | + consequence of further modification of the contributor version. For |
704 | + purposes of this definition, "control" includes the right to grant |
705 | + patent sublicenses in a manner consistent with the requirements of |
706 | + this License. |
707 | + . |
708 | + Each contributor grants you a non-exclusive, worldwide, royalty-free |
709 | + patent license under the contributor's essential patent claims, to |
710 | + make, use, sell, offer for sale, import and otherwise run, modify and |
711 | + propagate the contents of its contributor version. |
712 | + . |
713 | + In the following three paragraphs, a "patent license" is any express |
714 | + agreement or commitment, however denominated, not to enforce a patent |
715 | + (such as an express permission to practice a patent or covenant not to |
716 | + sue for patent infringement). To "grant" such a patent license to a |
717 | + party means to make such an agreement or commitment not to enforce a |
718 | + patent against the party. |
719 | + . |
720 | + If you convey a covered work, knowingly relying on a patent license, |
721 | + and the Corresponding Source of the work is not available for anyone |
722 | + to copy, free of charge and under the terms of this License, through a |
723 | + publicly available network server or other readily accessible means, |
724 | + then you must either (1) cause the Corresponding Source to be so |
725 | + available, or (2) arrange to deprive yourself of the benefit of the |
726 | + patent license for this particular work, or (3) arrange, in a manner |
727 | + consistent with the requirements of this License, to extend the patent |
728 | + license to downstream recipients. "Knowingly relying" means you have |
729 | + actual knowledge that, but for the patent license, your conveying the |
730 | + covered work in a country, or your recipient's use of the covered work |
731 | + in a country, would infringe one or more identifiable patents in that |
732 | + country that you have reason to believe are valid. |
733 | + . |
734 | + If, pursuant to or in connection with a single transaction or |
735 | + arrangement, you convey, or propagate by procuring conveyance of, a |
736 | + covered work, and grant a patent license to some of the parties |
737 | + receiving the covered work authorizing them to use, propagate, modify |
738 | + or convey a specific copy of the covered work, then the patent license |
739 | + you grant is automatically extended to all recipients of the covered |
740 | + work and works based on it. |
741 | + . |
742 | + A patent license is "discriminatory" if it does not include within |
743 | + the scope of its coverage, prohibits the exercise of, or is |
744 | + conditioned on the non-exercise of one or more of the rights that are |
745 | + specifically granted under this License. You may not convey a covered |
746 | + work if you are a party to an arrangement with a third party that is |
747 | + in the business of distributing software, under which you make payment |
748 | + to the third party based on the extent of your activity of conveying |
749 | + the work, and under which the third party grants, to any of the |
750 | + parties who would receive the covered work from you, a discriminatory |
751 | + patent license (a) in connection with copies of the covered work |
752 | + conveyed by you (or copies made from those copies), or (b) primarily |
753 | + for and in connection with specific products or compilations that |
754 | + contain the covered work, unless you entered into that arrangement, |
755 | + or that patent license was granted, prior to 28 March 2007. |
756 | + . |
757 | + Nothing in this License shall be construed as excluding or limiting |
758 | + any implied license or other defenses to infringement that may |
759 | + otherwise be available to you under applicable patent law. |
760 | + . |
761 | + 12. No Surrender of Others' Freedom. |
762 | + . |
763 | + If conditions are imposed on you (whether by court order, agreement or |
764 | + otherwise) that contradict the conditions of this License, they do not |
765 | + excuse you from the conditions of this License. If you cannot convey a |
766 | + covered work so as to satisfy simultaneously your obligations under this |
767 | + License and any other pertinent obligations, then as a consequence you may |
768 | + not convey it at all. For example, if you agree to terms that obligate you |
769 | + to collect a royalty for further conveying from those to whom you convey |
770 | + the Program, the only way you could satisfy both those terms and this |
771 | + License would be to refrain entirely from conveying the Program. |
772 | + . |
773 | + 13. Remote Network Interaction; Use with the GNU General Public License. |
774 | + . |
775 | + Notwithstanding any other provision of this License, if you modify the |
776 | + Program, your modified version must prominently offer all users |
777 | + interacting with it remotely through a computer network (if your version |
778 | + supports such interaction) an opportunity to receive the Corresponding |
779 | + Source of your version by providing access to the Corresponding Source |
780 | + from a network server at no charge, through some standard or customary |
781 | + means of facilitating copying of software. This Corresponding Source |
782 | + shall include the Corresponding Source for any work covered by version 3 |
783 | + of the GNU General Public License that is incorporated pursuant to the |
784 | + following paragraph. |
785 | + . |
786 | + Notwithstanding any other provision of this License, you have |
787 | + permission to link or combine any covered work with a work licensed |
788 | + under version 3 of the GNU General Public License into a single |
789 | + combined work, and to convey the resulting work. The terms of this |
790 | + License will continue to apply to the part which is the covered work, |
791 | + but the work with which it is combined will remain governed by version |
792 | + 3 of the GNU General Public License. |
793 | + . |
794 | + 14. Revised Versions of this License. |
795 | + . |
796 | + The Free Software Foundation may publish revised and/or new versions of |
797 | + the GNU Affero General Public License from time to time. Such new versions |
798 | + will be similar in spirit to the present version, but may differ in detail to |
799 | + address new problems or concerns. |
800 | + . |
801 | + Each version is given a distinguishing version number. If the |
802 | + Program specifies that a certain numbered version of the GNU Affero General |
803 | + Public License "or any later version" applies to it, you have the |
804 | + option of following the terms and conditions either of that numbered |
805 | + version or of any later version published by the Free Software |
806 | + Foundation. If the Program does not specify a version number of the |
807 | + GNU Affero General Public License, you may choose any version ever published |
808 | + by the Free Software Foundation. |
809 | + . |
810 | + If the Program specifies that a proxy can decide which future |
811 | + versions of the GNU Affero General Public License can be used, that proxy's |
812 | + public statement of acceptance of a version permanently authorizes you |
813 | + to choose that version for the Program. |
814 | + . |
815 | + Later license versions may give you additional or different |
816 | + permissions. However, no additional obligations are imposed on any |
817 | + author or copyright holder as a result of your choosing to follow a |
818 | + later version. |
819 | + . |
820 | + 15. Disclaimer of Warranty. |
821 | + . |
822 | + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY |
823 | + APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT |
824 | + HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY |
825 | + OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, |
826 | + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
827 | + PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM |
828 | + IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF |
829 | + ALL NECESSARY SERVICING, REPAIR OR CORRECTION. |
830 | + . |
831 | + 16. Limitation of Liability. |
832 | + . |
833 | + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING |
834 | + WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS |
835 | + THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY |
836 | + GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE |
837 | + USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF |
838 | + DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD |
839 | + PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), |
840 | + EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF |
841 | + SUCH DAMAGES. |
842 | + . |
843 | + 17. Interpretation of Sections 15 and 16. |
844 | + . |
845 | + If the disclaimer of warranty and limitation of liability provided |
846 | + above cannot be given local legal effect according to their terms, |
847 | + reviewing courts shall apply local law that most closely approximates |
848 | + an absolute waiver of all civil liability in connection with the |
849 | + Program, unless a warranty or assumption of liability accompanies a |
850 | + copy of the Program in return for a fee. |
851 | + . |
852 | + END OF TERMS AND CONDITIONS |
853 | + . |
854 | + How to Apply These Terms to Your New Programs |
855 | + . |
856 | + If you develop a new program, and you want it to be of the greatest |
857 | + possible use to the public, the best way to achieve this is to make it |
858 | + free software which everyone can redistribute and change under these terms. |
859 | + . |
860 | + To do so, attach the following notices to the program. It is safest |
861 | + to attach them to the start of each source file to most effectively |
862 | + state the exclusion of warranty; and each file should have at least |
863 | + the "copyright" line and a pointer to where the full notice is found. |
864 | + . |
865 | + <one line to give the program's name and a brief idea of what it does.> |
866 | + Copyright (C) <year> <name of author> |
867 | + . |
868 | + This program is free software: you can redistribute it and/or modify |
869 | + it under the terms of the GNU Affero General Public License as published by |
870 | + the Free Software Foundation, either version 3 of the License, or |
871 | + (at your option) any later version. |
872 | + . |
873 | + This program is distributed in the hope that it will be useful, |
874 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
875 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
876 | + GNU Affero General Public License for more details. |
877 | + . |
878 | + You should have received a copy of the GNU Affero General Public License |
879 | + along with this program. If not, see <http://www.gnu.org/licenses/>. |
880 | + . |
881 | + Also add information on how to contact you by electronic and paper mail. |
882 | + . |
883 | + If your software can interact with users remotely through a computer |
884 | + network, you should also make sure that it provides a way for users to |
885 | + get its source. For example, if your program is a web application, its |
886 | + interface could display a "Source" link that leads users to an archive |
887 | + of the code. There are many ways you could offer source, and different |
888 | + solutions will be better for different programs; see section 13 for the |
889 | + specific requirements. |
890 | + . |
891 | + You should also get your employer (if you work as a programmer) or school, |
892 | + if any, to sign a "copyright disclaimer" for the program, if necessary. |
893 | + For more information on this, and how to apply and follow the GNU AGPL, see |
894 | + <http://www.gnu.org/licenses/>. |
895 | |
896 | === modified file 'debian/docs' |
897 | --- debian/docs 2013-10-18 09:45:28 +0000 |
898 | +++ debian/docs 2016-01-24 19:17:27 +0000 |
899 | @@ -0,0 +1,1 @@ |
900 | +README.rst |
901 | |
902 | === added file 'debian/juju-quickstart.desktop' |
903 | --- debian/juju-quickstart.desktop 1970-01-01 00:00:00 +0000 |
904 | +++ debian/juju-quickstart.desktop 2016-01-24 19:17:27 +0000 |
905 | @@ -0,0 +1,13 @@ |
906 | +[Desktop Entry] |
907 | +Name=Juju Quickstart |
908 | +Comment=Easy configuration of Juju environments |
909 | +Exec=juju-quickstart |
910 | +Icon=juju-quickstart |
911 | +Terminal=true |
912 | +Type=Application |
913 | +StartupNotify=true |
914 | +Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;X-Unity-Settings-Panel; |
915 | +OnlyShowIn=GNOME;Unity; |
916 | +X-Unity-Settings-Panel=juju-quickstart |
917 | +X-GNOME-Settings-Panel=juju-quickstart |
918 | +X-Ubuntu-Gettext-Domain=juju-quickstart |
919 | |
920 | === modified file 'debian/juju-quickstart.install' |
921 | --- debian/juju-quickstart.install 2013-10-18 09:45:28 +0000 |
922 | +++ debian/juju-quickstart.install 2016-01-24 19:17:27 +0000 |
923 | @@ -1,1 +1,3 @@ |
924 | quickstart/* /usr/share/pyshared/quickstart |
925 | +debian/juju-quickstart.desktop /usr/share/applications/ |
926 | +debian/juju-quickstart.svg /usr/share/icons/hicolor/scalable/apps/ |
927 | |
928 | === added file 'debian/juju-quickstart.svg' |
929 | --- debian/juju-quickstart.svg 1970-01-01 00:00:00 +0000 |
930 | +++ debian/juju-quickstart.svg 2016-01-24 19:17:27 +0000 |
931 | @@ -0,0 +1,257 @@ |
932 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
933 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
934 | + |
935 | +<svg |
936 | + xmlns:dc="http://purl.org/dc/elements/1.1/" |
937 | + xmlns:cc="http://creativecommons.org/ns#" |
938 | + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
939 | + xmlns:svg="http://www.w3.org/2000/svg" |
940 | + xmlns="http://www.w3.org/2000/svg" |
941 | + xmlns:xlink="http://www.w3.org/1999/xlink" |
942 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
943 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
944 | + width="96" |
945 | + height="96" |
946 | + id="svg6517" |
947 | + version="1.1" |
948 | + inkscape:version="0.48+devel r12277" |
949 | + sodipodi:docname="juju_gui.svg"> |
950 | + <defs |
951 | + id="defs6519"> |
952 | + <linearGradient |
953 | + id="linearGradient4123"> |
954 | + <stop |
955 | + style="stop-color:#dd4814;stop-opacity:1;" |
956 | + offset="0" |
957 | + id="stop4125" /> |
958 | + <stop |
959 | + style="stop-color:#ef774d;stop-opacity:1;" |
960 | + offset="1" |
961 | + id="stop4127" /> |
962 | + </linearGradient> |
963 | + <linearGradient |
964 | + id="linearGradient4176"> |
965 | + <stop |
966 | + id="stop4178" |
967 | + offset="0" |
968 | + style="stop-color:#505050;stop-opacity:1;" /> |
969 | + <stop |
970 | + id="stop4180" |
971 | + offset="1" |
972 | + style="stop-color:#646464;stop-opacity:1;" /> |
973 | + </linearGradient> |
974 | + <clipPath |
975 | + clipPathUnits="userSpaceOnUse" |
976 | + id="clipPath4046-4"> |
977 | + <g |
978 | + style="fill:#ff00ff;fill-opacity:1;stroke:none" |
979 | + inkscape:label="Layer 1" |
980 | + id="g4048-1" |
981 | + transform="matrix(0,-0.69444445,0.69379664,0,36.812604,681)"> |
982 | + <path |
983 | + sodipodi:nodetypes="sssssssss" |
984 | + inkscape:connector-curvature="0" |
985 | + id="path4050-4" |
986 | + d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 l 0,-50.73846 c 0,-40.86086 5.8378378,-46.69808 46.702703,-46.69808 z" |
987 | + style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline" /> |
988 | + </g> |
989 | + </clipPath> |
990 | + <linearGradient |
991 | + inkscape:collect="always" |
992 | + xlink:href="#Background" |
993 | + id="linearGradient6461-2" |
994 | + gradientUnits="userSpaceOnUse" |
995 | + x1="0" |
996 | + y1="970.29498" |
997 | + x2="144" |
998 | + y2="970.29498" |
999 | + gradientTransform="matrix(0,-0.66666669,0.6660448,0,-866.25992,731.29077)" /> |
1000 | + <linearGradient |
1001 | + id="Background"> |
1002 | + <stop |
1003 | + id="stop4178-8" |
1004 | + offset="0" |
1005 | + style="stop-color:#b8b8b8;stop-opacity:1" /> |
1006 | + <stop |
1007 | + id="stop4180-1" |
1008 | + offset="1" |
1009 | + style="stop-color:#c9c9c9;stop-opacity:1" /> |
1010 | + </linearGradient> |
1011 | + <filter |
1012 | + style="color-interpolation-filters:sRGB" |
1013 | + inkscape:label="Inner Shadow" |
1014 | + id="filter1121"> |
1015 | + <feFlood |
1016 | + flood-opacity="0.59999999999999998" |
1017 | + flood-color="rgb(0,0,0)" |
1018 | + result="flood" |
1019 | + id="feFlood1123" /> |
1020 | + <feComposite |
1021 | + in="flood" |
1022 | + in2="SourceGraphic" |
1023 | + operator="out" |
1024 | + result="composite1" |
1025 | + id="feComposite1125" /> |
1026 | + <feGaussianBlur |
1027 | + in="composite1" |
1028 | + stdDeviation="1" |
1029 | + result="blur" |
1030 | + id="feGaussianBlur1127" /> |
1031 | + <feOffset |
1032 | + dx="0" |
1033 | + dy="2" |
1034 | + result="offset" |
1035 | + id="feOffset1129" /> |
1036 | + <feComposite |
1037 | + in="offset" |
1038 | + in2="SourceGraphic" |
1039 | + operator="atop" |
1040 | + result="composite2" |
1041 | + id="feComposite1131" /> |
1042 | + </filter> |
1043 | + <filter |
1044 | + style="color-interpolation-filters:sRGB" |
1045 | + inkscape:label="Drop Shadow" |
1046 | + id="filter950"> |
1047 | + <feFlood |
1048 | + flood-opacity="0.25" |
1049 | + flood-color="rgb(0,0,0)" |
1050 | + result="flood" |
1051 | + id="feFlood952" /> |
1052 | + <feComposite |
1053 | + in="flood" |
1054 | + in2="SourceGraphic" |
1055 | + operator="in" |
1056 | + result="composite1" |
1057 | + id="feComposite954" /> |
1058 | + <feGaussianBlur |
1059 | + in="composite1" |
1060 | + stdDeviation="1" |
1061 | + result="blur" |
1062 | + id="feGaussianBlur956" /> |
1063 | + <feOffset |
1064 | + dx="0" |
1065 | + dy="1" |
1066 | + result="offset" |
1067 | + id="feOffset958" /> |
1068 | + <feComposite |
1069 | + in="SourceGraphic" |
1070 | + in2="offset" |
1071 | + operator="over" |
1072 | + result="composite2" |
1073 | + id="feComposite960" /> |
1074 | + </filter> |
1075 | + <clipPath |
1076 | + clipPathUnits="userSpaceOnUse" |
1077 | + id="clipPath6452"> |
1078 | + <path |
1079 | + inkscape:connector-curvature="0" |
1080 | + id="path6454" |
1081 | + d="m 668,615 0,33 82,0 L 750,615 z m 24,17 0,-13 18.16435,-0.0804 0,13 L 726,632 l 0,13 -17.94589,0 0,-13" |
1082 | + style="color:#000000;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
1083 | + sodipodi:nodetypes="ccccccccccccc" /> |
1084 | + </clipPath> |
1085 | + <clipPath |
1086 | + clipPathUnits="userSpaceOnUse" |
1087 | + id="clipPath1431"> |
1088 | + <path |
1089 | + inkscape:connector-curvature="0" |
1090 | + id="path1433" |
1091 | + d="m 668,615 0,33 82,0 L 750,615 z m 24,17 0,-13 14.62581,0 0,13 19.37419,0 0,13 -14.72903,0 0,-13" |
1092 | + style="color:#000000;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
1093 | + sodipodi:nodetypes="ccccccccccccc" /> |
1094 | + </clipPath> |
1095 | + </defs> |
1096 | + <sodipodi:namedview |
1097 | + id="base" |
1098 | + pagecolor="#ffffff" |
1099 | + bordercolor="#666666" |
1100 | + borderopacity="1.0" |
1101 | + inkscape:pageopacity="0.0" |
1102 | + inkscape:pageshadow="2" |
1103 | + inkscape:zoom="1.335144" |
1104 | + inkscape:cx="-376.94629" |
1105 | + inkscape:cy="67.615404" |
1106 | + inkscape:document-units="px" |
1107 | + inkscape:current-layer="use3202-7" |
1108 | + showgrid="false" |
1109 | + fit-margin-top="0" |
1110 | + fit-margin-left="0" |
1111 | + fit-margin-right="0" |
1112 | + fit-margin-bottom="0" |
1113 | + inkscape:window-width="1920" |
1114 | + inkscape:window-height="1029" |
1115 | + inkscape:window-x="0" |
1116 | + inkscape:window-y="24" |
1117 | + inkscape:window-maximized="1"> |
1118 | + <inkscape:grid |
1119 | + type="xygrid" |
1120 | + id="grid891" /> |
1121 | + </sodipodi:namedview> |
1122 | + <metadata |
1123 | + id="metadata6522"> |
1124 | + <rdf:RDF> |
1125 | + <cc:Work |
1126 | + rdf:about=""> |
1127 | + <dc:format>image/svg+xml</dc:format> |
1128 | + <dc:type |
1129 | + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
1130 | + <dc:title></dc:title> |
1131 | + </cc:Work> |
1132 | + </rdf:RDF> |
1133 | + </metadata> |
1134 | + <g |
1135 | + inkscape:label="Layer 1" |
1136 | + inkscape:groupmode="layer" |
1137 | + id="layer1" |
1138 | + transform="translate(268,-635.29076)"> |
1139 | + <g |
1140 | + id="use3202-7" |
1141 | + style="display:inline" |
1142 | + transform="matrix(0.96000003,0,0,0.96000003,-901.60002,77.530748)"> |
1143 | + <path |
1144 | + sodipodi:nodetypes="sssssssss" |
1145 | + inkscape:connector-curvature="0" |
1146 | + id="path6455" |
1147 | + d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z" |
1148 | + style="fill:#dd4814;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)" |
1149 | + transform="matrix(0.69444445,0,0,0.69379664,660,-42.187394)" /> |
1150 | + <g |
1151 | + id="g921" |
1152 | + style=""> |
1153 | + <path |
1154 | + transform="matrix(1.0416666,0,0,1.0416666,660,580.99999)" |
1155 | + d="m 24,78 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 C 23.104569,76 24,76.895431 24,78 Z" |
1156 | + sodipodi:ry="2" |
1157 | + sodipodi:rx="2" |
1158 | + sodipodi:cy="78" |
1159 | + sodipodi:cx="22" |
1160 | + id="path911" |
1161 | + style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
1162 | + sodipodi:type="arc" /> |
1163 | + <path |
1164 | + sodipodi:nodetypes="cssssc" |
1165 | + inkscape:connector-curvature="0" |
1166 | + id="rect913" |
1167 | + transform="matrix(1.0416666,0,0,1.0416666,660,580.99999)" |
1168 | + d="m 35,56 0,10 c 0,3.324003 2.675997,6 6,6 l 1,0 c 3.324003,0 6,-2.675997 6,-6 l 0,-10" |
1169 | + style="color:#000000;fill:none;stroke:#ffffff;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> |
1170 | + <path |
1171 | + style="color:#000000;fill:none;stroke:#ffffff;stroke-width:4.16666651;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
1172 | + d="m 682.91668,658.08331 0,-25.00001 c 0,-3.4625 2.7875,-6.25 6.25,-6.25 l 1.04167,0 c 3.4625,0 6.25,2.7875 6.25,6.25 l 0,4.16668" |
1173 | + id="path919" |
1174 | + inkscape:connector-curvature="0" |
1175 | + sodipodi:nodetypes="cssssc" /> |
1176 | + </g> |
1177 | + <use |
1178 | + x="0" |
1179 | + y="0" |
1180 | + xlink:href="#g921" |
1181 | + id="use926" |
1182 | + transform="translate(27.083334,-27.08333)" |
1183 | + width="96" |
1184 | + height="96" |
1185 | + style="" /> |
1186 | + </g> |
1187 | + </g> |
1188 | +</svg> |
1189 | |
1190 | === added file 'debian/pydist-overrides' |
1191 | --- debian/pydist-overrides 1970-01-01 00:00:00 +0000 |
1192 | +++ debian/pydist-overrides 2016-01-24 19:17:27 +0000 |
1193 | @@ -0,0 +1,1 @@ |
1194 | +websocket-client python-websocket |
1195 | |
1196 | === modified file 'debian/rules' |
1197 | --- debian/rules 2013-10-18 10:38:48 +0000 |
1198 | +++ debian/rules 2016-01-24 19:17:27 +0000 |
1199 | @@ -11,3 +11,12 @@ |
1200 | |
1201 | %: |
1202 | dh $@ --with python2 --buildsystem=python_distutils |
1203 | + |
1204 | +override_dh_auto_test: |
1205 | +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) |
1206 | + set -e; for ver in $(shell pyversions -rv); do \ |
1207 | + nosetests-$$ver quickstart; \ |
1208 | + done; |
1209 | +else |
1210 | + @echo "** tests disabled" |
1211 | +endif |