Merge lp:~aisrael/charms/precise/mumble-server/charm-proof into lp:charms/mumble-server
- Precise Pangolin (12.04)
- charm-proof
- Merge into trunk
Proposed by
Adam Israel
Status: | Merged |
---|---|
Merged at revision: | 8 |
Proposed branch: | lp:~aisrael/charms/precise/mumble-server/charm-proof |
Merge into: | lp:charms/mumble-server |
Diff against target: |
353 lines (+294/-18) 6 files modified
config.yaml (+0/-1) hooks/juju-info-relation-changed (+0/-5) hooks/juju-info-relation-departed (+0/-5) hooks/juju-info-relation-joined (+0/-5) icon.svg (+292/-0) metadata.yaml (+2/-2) |
To merge this branch: | bzr merge lp:~aisrael/charms/precise/mumble-server/charm-proof |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
charmers | Pending | ||
Review via email: mp+233847@code.launchpad.net |
Commit message
Description of the change
Add generic icon.svg; removed invalid relations; added categories to metadata.yaml, in order to pass charm proof.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'config.yaml' |
2 | --- config.yaml 2012-05-02 00:44:54 +0000 |
3 | +++ config.yaml 2014-09-09 01:25:09 +0000 |
4 | @@ -3,4 +3,3 @@ |
5 | type: string |
6 | default: unset |
7 | description: Password for Mumble administrative account |
8 | - validator: '.{8,}' |
9 | |
10 | === removed file 'hooks/juju-info-relation-changed' |
11 | --- hooks/juju-info-relation-changed 2012-05-06 06:25:22 +0000 |
12 | +++ hooks/juju-info-relation-changed 1970-01-01 00:00:00 +0000 |
13 | @@ -1,5 +0,0 @@ |
14 | -#!/bin/bash |
15 | -set -ex |
16 | - |
17 | -# Fallback to voip relation when declaring mismatched interface relationship. |
18 | -exec hooks/voip-relation-changed "$@" |
19 | |
20 | === removed file 'hooks/juju-info-relation-departed' |
21 | --- hooks/juju-info-relation-departed 2012-05-06 06:25:22 +0000 |
22 | +++ hooks/juju-info-relation-departed 1970-01-01 00:00:00 +0000 |
23 | @@ -1,5 +0,0 @@ |
24 | -#!/bin/bash |
25 | -set -ex |
26 | - |
27 | -# Fallback to voip relation when declaring mismatched interface relationship. |
28 | -exec hooks/voip-relation-depart "$@" |
29 | |
30 | === removed file 'hooks/juju-info-relation-joined' |
31 | --- hooks/juju-info-relation-joined 2012-05-06 06:25:22 +0000 |
32 | +++ hooks/juju-info-relation-joined 1970-01-01 00:00:00 +0000 |
33 | @@ -1,5 +0,0 @@ |
34 | -#!/bin/bash |
35 | -set -ex |
36 | - |
37 | -# Fallback to voip relation when declaring mismatched interface relationship. |
38 | -exec hooks/voip-relation-joined "$@" |
39 | |
40 | === added file 'icon.svg' |
41 | --- icon.svg 1970-01-01 00:00:00 +0000 |
42 | +++ icon.svg 2014-09-09 01:25:09 +0000 |
43 | @@ -0,0 +1,292 @@ |
44 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
45 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
46 | + |
47 | +<svg |
48 | + xmlns:dc="http://purl.org/dc/elements/1.1/" |
49 | + xmlns:cc="http://creativecommons.org/ns#" |
50 | + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
51 | + xmlns:svg="http://www.w3.org/2000/svg" |
52 | + xmlns="http://www.w3.org/2000/svg" |
53 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
54 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
55 | + width="96" |
56 | + height="96" |
57 | + id="svg6517" |
58 | + version="1.1" |
59 | + inkscape:version="0.48.4 r9939" |
60 | + sodipodi:docname="juju-icon-placeholder-m.svg"> |
61 | + <defs |
62 | + id="defs6519"> |
63 | + <linearGradient |
64 | + id="Background"> |
65 | + <stop |
66 | + id="stop4178" |
67 | + offset="0" |
68 | + style="stop-color:#b8b8b8;stop-opacity:1" /> |
69 | + <stop |
70 | + id="stop4180" |
71 | + offset="1" |
72 | + style="stop-color:#c9c9c9;stop-opacity:1" /> |
73 | + </linearGradient> |
74 | + <filter |
75 | + style="color-interpolation-filters:sRGB;" |
76 | + inkscape:label="Inner Shadow" |
77 | + id="filter1121"> |
78 | + <feFlood |
79 | + flood-opacity="0.59999999999999998" |
80 | + flood-color="rgb(0,0,0)" |
81 | + result="flood" |
82 | + id="feFlood1123" /> |
83 | + <feComposite |
84 | + in="flood" |
85 | + in2="SourceGraphic" |
86 | + operator="out" |
87 | + result="composite1" |
88 | + id="feComposite1125" /> |
89 | + <feGaussianBlur |
90 | + in="composite1" |
91 | + stdDeviation="1" |
92 | + result="blur" |
93 | + id="feGaussianBlur1127" /> |
94 | + <feOffset |
95 | + dx="0" |
96 | + dy="2" |
97 | + result="offset" |
98 | + id="feOffset1129" /> |
99 | + <feComposite |
100 | + in="offset" |
101 | + in2="SourceGraphic" |
102 | + operator="atop" |
103 | + result="composite2" |
104 | + id="feComposite1131" /> |
105 | + </filter> |
106 | + <filter |
107 | + style="color-interpolation-filters:sRGB;" |
108 | + inkscape:label="Drop Shadow" |
109 | + id="filter950"> |
110 | + <feFlood |
111 | + flood-opacity="0.25" |
112 | + flood-color="rgb(0,0,0)" |
113 | + result="flood" |
114 | + id="feFlood952" /> |
115 | + <feComposite |
116 | + in="flood" |
117 | + in2="SourceGraphic" |
118 | + operator="in" |
119 | + result="composite1" |
120 | + id="feComposite954" /> |
121 | + <feGaussianBlur |
122 | + in="composite1" |
123 | + stdDeviation="1" |
124 | + result="blur" |
125 | + id="feGaussianBlur956" /> |
126 | + <feOffset |
127 | + dx="0" |
128 | + dy="1" |
129 | + result="offset" |
130 | + id="feOffset958" /> |
131 | + <feComposite |
132 | + in="SourceGraphic" |
133 | + in2="offset" |
134 | + operator="over" |
135 | + result="composite2" |
136 | + id="feComposite960" /> |
137 | + <feBlend |
138 | + blend="normal" |
139 | + id="feBlend3895" |
140 | + in2="composite2" /> |
141 | + </filter> |
142 | + <clipPath |
143 | + clipPathUnits="userSpaceOnUse" |
144 | + id="clipPath873"> |
145 | + <g |
146 | + transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)" |
147 | + id="g875" |
148 | + inkscape:label="Layer 1" |
149 | + style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"> |
150 | + <path |
151 | + style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline" |
152 | + 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" |
153 | + id="path877" |
154 | + inkscape:connector-curvature="0" |
155 | + sodipodi:nodetypes="sssssssss" /> |
156 | + </g> |
157 | + </clipPath> |
158 | + <filter |
159 | + inkscape:collect="always" |
160 | + id="filter891" |
161 | + inkscape:label="Badge Shadow"> |
162 | + <feGaussianBlur |
163 | + inkscape:collect="always" |
164 | + stdDeviation="0.71999962" |
165 | + id="feGaussianBlur893" /> |
166 | + </filter> |
167 | + </defs> |
168 | + <sodipodi:namedview |
169 | + id="base" |
170 | + pagecolor="#ffffff" |
171 | + bordercolor="#666666" |
172 | + borderopacity="1.0" |
173 | + inkscape:pageopacity="0.0" |
174 | + inkscape:pageshadow="2" |
175 | + inkscape:zoom="8.1490724" |
176 | + inkscape:cx="6.3116087" |
177 | + inkscape:cy="46.975739" |
178 | + inkscape:document-units="px" |
179 | + inkscape:current-layer="layer3" |
180 | + showgrid="true" |
181 | + fit-margin-top="0" |
182 | + fit-margin-left="0" |
183 | + fit-margin-right="0" |
184 | + fit-margin-bottom="0" |
185 | + inkscape:window-width="1849" |
186 | + inkscape:window-height="1218" |
187 | + inkscape:window-x="123" |
188 | + inkscape:window-y="68" |
189 | + inkscape:window-maximized="0" |
190 | + showborder="true" |
191 | + showguides="true" |
192 | + inkscape:guide-bbox="true" |
193 | + inkscape:showpageshadow="false"> |
194 | + <inkscape:grid |
195 | + type="xygrid" |
196 | + id="grid821" /> |
197 | + <sodipodi:guide |
198 | + orientation="1,0" |
199 | + position="16,48" |
200 | + id="guide823" /> |
201 | + <sodipodi:guide |
202 | + orientation="0,1" |
203 | + position="64,80" |
204 | + id="guide825" /> |
205 | + <sodipodi:guide |
206 | + orientation="1,0" |
207 | + position="80,40" |
208 | + id="guide827" /> |
209 | + <sodipodi:guide |
210 | + orientation="0,1" |
211 | + position="64,16" |
212 | + id="guide829" /> |
213 | + </sodipodi:namedview> |
214 | + <metadata |
215 | + id="metadata6522"> |
216 | + <rdf:RDF> |
217 | + <cc:Work |
218 | + rdf:about=""> |
219 | + <dc:format>image/svg+xml</dc:format> |
220 | + <dc:type |
221 | + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
222 | + <dc:title /> |
223 | + </cc:Work> |
224 | + </rdf:RDF> |
225 | + </metadata> |
226 | + <g |
227 | + inkscape:label="BACKGROUND" |
228 | + inkscape:groupmode="layer" |
229 | + id="layer1" |
230 | + transform="translate(268,-635.29076)" |
231 | + style="display:inline"> |
232 | + <path |
233 | + style="fill:#333333;fill-opacity:0.93333334000000001;stroke:none;display:inline;filter:url(#filter1121);opacity:0.7" |
234 | + d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z" |
235 | + id="path6455" |
236 | + inkscape:connector-curvature="0" |
237 | + sodipodi:nodetypes="sssssssss" /> |
238 | + </g> |
239 | + <g |
240 | + inkscape:groupmode="layer" |
241 | + id="layer3" |
242 | + inkscape:label="PLACEHOLDER LETTER" |
243 | + style="display:inline"> |
244 | + <text |
245 | + xml:space="preserve" |
246 | + style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter950);font-family:Sans" |
247 | + x="24.809601" |
248 | + y="62.952" |
249 | + id="text3891" |
250 | + sodipodi:linespacing="125%"><tspan |
251 | + sodipodi:role="line" |
252 | + id="tspan3893" |
253 | + x="24.809601" |
254 | + y="62.952" |
255 | + style="font-size:56px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium">m</tspan></text> |
256 | + <rect |
257 | + style="opacity:0.7;fill:none;stroke:none" |
258 | + id="rect3021" |
259 | + width="64" |
260 | + height="64" |
261 | + x="17.197599" |
262 | + y="16" /> |
263 | + </g> |
264 | + <g |
265 | + inkscape:groupmode="layer" |
266 | + id="layer2" |
267 | + inkscape:label="BADGE" |
268 | + style="display:none" |
269 | + sodipodi:insensitive="true"> |
270 | + <g |
271 | + style="display:inline" |
272 | + transform="translate(-340.00001,-581)" |
273 | + id="g4394" |
274 | + clip-path="none"> |
275 | + <g |
276 | + id="g855"> |
277 | + <g |
278 | + inkscape:groupmode="maskhelper" |
279 | + id="g870" |
280 | + clip-path="url(#clipPath873)" |
281 | + style="opacity:0.6;filter:url(#filter891)"> |
282 | + <path |
283 | + transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)" |
284 | + d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" |
285 | + sodipodi:ry="12" |
286 | + sodipodi:rx="12" |
287 | + sodipodi:cy="552.36218" |
288 | + sodipodi:cx="252" |
289 | + id="path844" |
290 | + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
291 | + sodipodi:type="arc" /> |
292 | + </g> |
293 | + <g |
294 | + id="g862"> |
295 | + <path |
296 | + sodipodi:type="arc" |
297 | + style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
298 | + id="path4398" |
299 | + sodipodi:cx="252" |
300 | + sodipodi:cy="552.36218" |
301 | + sodipodi:rx="12" |
302 | + sodipodi:ry="12" |
303 | + d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" |
304 | + transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" /> |
305 | + <path |
306 | + transform="matrix(1.25,0,0,1.25,33,-100.45273)" |
307 | + d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" |
308 | + sodipodi:ry="12" |
309 | + sodipodi:rx="12" |
310 | + sodipodi:cy="552.36218" |
311 | + sodipodi:cx="252" |
312 | + id="path4400" |
313 | + style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
314 | + sodipodi:type="arc" /> |
315 | + <path |
316 | + sodipodi:type="star" |
317 | + style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
318 | + id="path4459" |
319 | + sodipodi:sides="5" |
320 | + sodipodi:cx="666.19574" |
321 | + sodipodi:cy="589.50385" |
322 | + sodipodi:r1="7.2431178" |
323 | + sodipodi:r2="4.3458705" |
324 | + sodipodi:arg1="1.0471976" |
325 | + sodipodi:arg2="1.6755161" |
326 | + inkscape:flatsided="false" |
327 | + inkscape:rounded="0.1" |
328 | + inkscape:randomized="0" |
329 | + d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z" |
330 | + transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" /> |
331 | + </g> |
332 | + </g> |
333 | + </g> |
334 | + </g> |
335 | +</svg> |
336 | |
337 | === modified file 'metadata.yaml' |
338 | --- metadata.yaml 2012-06-18 16:30:15 +0000 |
339 | +++ metadata.yaml 2014-09-09 01:25:09 +0000 |
340 | @@ -6,11 +6,11 @@ |
341 | channel list. A tree of channel is automatically created for all juju |
342 | service units that start a relationship with the mumber-server service. |
343 | maintainer: Kees Cook <kees@ubuntu.com> |
344 | +categories: |
345 | +- misc |
346 | provides: |
347 | voip-client: |
348 | interface: mumble |
349 | requires: |
350 | voip: |
351 | interface: mumble |
352 | - juju-info: |
353 | - interface: juju-info |