Merge lp:~aisrael/charms/precise/minecraft/charm-proof into lp:charms/minecraft
- Precise Pangolin (12.04)
- charm-proof
- Merge into trunk
Proposed by
Adam Israel
Status: | Merged |
---|---|
Merged at revision: | 29 |
Proposed branch: | lp:~aisrael/charms/precise/minecraft/charm-proof |
Merge into: | lp:charms/minecraft |
Diff against target: |
309 lines (+294/-0) 2 files modified
icon.svg (+292/-0) metadata.yaml (+2/-0) |
To merge this branch: | bzr merge lp:~aisrael/charms/precise/minecraft/charm-proof |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
charmers | Pending | ||
Review via email: mp+233845@code.launchpad.net |
Commit message
Description of the change
Add generic icon.svg and 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 | === added file 'icon.svg' | |||
2 | --- icon.svg 1970-01-01 00:00:00 +0000 | |||
3 | +++ icon.svg 2014-09-09 01:19:34 +0000 | |||
4 | @@ -0,0 +1,292 @@ | |||
5 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
6 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
7 | 3 | |||
8 | 4 | <svg | ||
9 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
10 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
11 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
12 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
13 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
14 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
15 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
16 | 12 | width="96" | ||
17 | 13 | height="96" | ||
18 | 14 | id="svg6517" | ||
19 | 15 | version="1.1" | ||
20 | 16 | inkscape:version="0.48.4 r9939" | ||
21 | 17 | sodipodi:docname="juju-icon-placeholder-m.svg"> | ||
22 | 18 | <defs | ||
23 | 19 | id="defs6519"> | ||
24 | 20 | <linearGradient | ||
25 | 21 | id="Background"> | ||
26 | 22 | <stop | ||
27 | 23 | id="stop4178" | ||
28 | 24 | offset="0" | ||
29 | 25 | style="stop-color:#b8b8b8;stop-opacity:1" /> | ||
30 | 26 | <stop | ||
31 | 27 | id="stop4180" | ||
32 | 28 | offset="1" | ||
33 | 29 | style="stop-color:#c9c9c9;stop-opacity:1" /> | ||
34 | 30 | </linearGradient> | ||
35 | 31 | <filter | ||
36 | 32 | style="color-interpolation-filters:sRGB;" | ||
37 | 33 | inkscape:label="Inner Shadow" | ||
38 | 34 | id="filter1121"> | ||
39 | 35 | <feFlood | ||
40 | 36 | flood-opacity="0.59999999999999998" | ||
41 | 37 | flood-color="rgb(0,0,0)" | ||
42 | 38 | result="flood" | ||
43 | 39 | id="feFlood1123" /> | ||
44 | 40 | <feComposite | ||
45 | 41 | in="flood" | ||
46 | 42 | in2="SourceGraphic" | ||
47 | 43 | operator="out" | ||
48 | 44 | result="composite1" | ||
49 | 45 | id="feComposite1125" /> | ||
50 | 46 | <feGaussianBlur | ||
51 | 47 | in="composite1" | ||
52 | 48 | stdDeviation="1" | ||
53 | 49 | result="blur" | ||
54 | 50 | id="feGaussianBlur1127" /> | ||
55 | 51 | <feOffset | ||
56 | 52 | dx="0" | ||
57 | 53 | dy="2" | ||
58 | 54 | result="offset" | ||
59 | 55 | id="feOffset1129" /> | ||
60 | 56 | <feComposite | ||
61 | 57 | in="offset" | ||
62 | 58 | in2="SourceGraphic" | ||
63 | 59 | operator="atop" | ||
64 | 60 | result="composite2" | ||
65 | 61 | id="feComposite1131" /> | ||
66 | 62 | </filter> | ||
67 | 63 | <filter | ||
68 | 64 | style="color-interpolation-filters:sRGB;" | ||
69 | 65 | inkscape:label="Drop Shadow" | ||
70 | 66 | id="filter950"> | ||
71 | 67 | <feFlood | ||
72 | 68 | flood-opacity="0.25" | ||
73 | 69 | flood-color="rgb(0,0,0)" | ||
74 | 70 | result="flood" | ||
75 | 71 | id="feFlood952" /> | ||
76 | 72 | <feComposite | ||
77 | 73 | in="flood" | ||
78 | 74 | in2="SourceGraphic" | ||
79 | 75 | operator="in" | ||
80 | 76 | result="composite1" | ||
81 | 77 | id="feComposite954" /> | ||
82 | 78 | <feGaussianBlur | ||
83 | 79 | in="composite1" | ||
84 | 80 | stdDeviation="1" | ||
85 | 81 | result="blur" | ||
86 | 82 | id="feGaussianBlur956" /> | ||
87 | 83 | <feOffset | ||
88 | 84 | dx="0" | ||
89 | 85 | dy="1" | ||
90 | 86 | result="offset" | ||
91 | 87 | id="feOffset958" /> | ||
92 | 88 | <feComposite | ||
93 | 89 | in="SourceGraphic" | ||
94 | 90 | in2="offset" | ||
95 | 91 | operator="over" | ||
96 | 92 | result="composite2" | ||
97 | 93 | id="feComposite960" /> | ||
98 | 94 | <feBlend | ||
99 | 95 | blend="normal" | ||
100 | 96 | id="feBlend3895" | ||
101 | 97 | in2="composite2" /> | ||
102 | 98 | </filter> | ||
103 | 99 | <clipPath | ||
104 | 100 | clipPathUnits="userSpaceOnUse" | ||
105 | 101 | id="clipPath873"> | ||
106 | 102 | <g | ||
107 | 103 | transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)" | ||
108 | 104 | id="g875" | ||
109 | 105 | inkscape:label="Layer 1" | ||
110 | 106 | style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"> | ||
111 | 107 | <path | ||
112 | 108 | style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline" | ||
113 | 109 | 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" | ||
114 | 110 | id="path877" | ||
115 | 111 | inkscape:connector-curvature="0" | ||
116 | 112 | sodipodi:nodetypes="sssssssss" /> | ||
117 | 113 | </g> | ||
118 | 114 | </clipPath> | ||
119 | 115 | <filter | ||
120 | 116 | inkscape:collect="always" | ||
121 | 117 | id="filter891" | ||
122 | 118 | inkscape:label="Badge Shadow"> | ||
123 | 119 | <feGaussianBlur | ||
124 | 120 | inkscape:collect="always" | ||
125 | 121 | stdDeviation="0.71999962" | ||
126 | 122 | id="feGaussianBlur893" /> | ||
127 | 123 | </filter> | ||
128 | 124 | </defs> | ||
129 | 125 | <sodipodi:namedview | ||
130 | 126 | id="base" | ||
131 | 127 | pagecolor="#ffffff" | ||
132 | 128 | bordercolor="#666666" | ||
133 | 129 | borderopacity="1.0" | ||
134 | 130 | inkscape:pageopacity="0.0" | ||
135 | 131 | inkscape:pageshadow="2" | ||
136 | 132 | inkscape:zoom="8.1490724" | ||
137 | 133 | inkscape:cx="6.3116087" | ||
138 | 134 | inkscape:cy="46.975739" | ||
139 | 135 | inkscape:document-units="px" | ||
140 | 136 | inkscape:current-layer="layer3" | ||
141 | 137 | showgrid="true" | ||
142 | 138 | fit-margin-top="0" | ||
143 | 139 | fit-margin-left="0" | ||
144 | 140 | fit-margin-right="0" | ||
145 | 141 | fit-margin-bottom="0" | ||
146 | 142 | inkscape:window-width="1849" | ||
147 | 143 | inkscape:window-height="1218" | ||
148 | 144 | inkscape:window-x="123" | ||
149 | 145 | inkscape:window-y="68" | ||
150 | 146 | inkscape:window-maximized="0" | ||
151 | 147 | showborder="true" | ||
152 | 148 | showguides="true" | ||
153 | 149 | inkscape:guide-bbox="true" | ||
154 | 150 | inkscape:showpageshadow="false"> | ||
155 | 151 | <inkscape:grid | ||
156 | 152 | type="xygrid" | ||
157 | 153 | id="grid821" /> | ||
158 | 154 | <sodipodi:guide | ||
159 | 155 | orientation="1,0" | ||
160 | 156 | position="16,48" | ||
161 | 157 | id="guide823" /> | ||
162 | 158 | <sodipodi:guide | ||
163 | 159 | orientation="0,1" | ||
164 | 160 | position="64,80" | ||
165 | 161 | id="guide825" /> | ||
166 | 162 | <sodipodi:guide | ||
167 | 163 | orientation="1,0" | ||
168 | 164 | position="80,40" | ||
169 | 165 | id="guide827" /> | ||
170 | 166 | <sodipodi:guide | ||
171 | 167 | orientation="0,1" | ||
172 | 168 | position="64,16" | ||
173 | 169 | id="guide829" /> | ||
174 | 170 | </sodipodi:namedview> | ||
175 | 171 | <metadata | ||
176 | 172 | id="metadata6522"> | ||
177 | 173 | <rdf:RDF> | ||
178 | 174 | <cc:Work | ||
179 | 175 | rdf:about=""> | ||
180 | 176 | <dc:format>image/svg+xml</dc:format> | ||
181 | 177 | <dc:type | ||
182 | 178 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
183 | 179 | <dc:title /> | ||
184 | 180 | </cc:Work> | ||
185 | 181 | </rdf:RDF> | ||
186 | 182 | </metadata> | ||
187 | 183 | <g | ||
188 | 184 | inkscape:label="BACKGROUND" | ||
189 | 185 | inkscape:groupmode="layer" | ||
190 | 186 | id="layer1" | ||
191 | 187 | transform="translate(268,-635.29076)" | ||
192 | 188 | style="display:inline"> | ||
193 | 189 | <path | ||
194 | 190 | style="fill:#333333;fill-opacity:0.93333334000000001;stroke:none;display:inline;filter:url(#filter1121);opacity:0.7" | ||
195 | 191 | 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" | ||
196 | 192 | id="path6455" | ||
197 | 193 | inkscape:connector-curvature="0" | ||
198 | 194 | sodipodi:nodetypes="sssssssss" /> | ||
199 | 195 | </g> | ||
200 | 196 | <g | ||
201 | 197 | inkscape:groupmode="layer" | ||
202 | 198 | id="layer3" | ||
203 | 199 | inkscape:label="PLACEHOLDER LETTER" | ||
204 | 200 | style="display:inline"> | ||
205 | 201 | <text | ||
206 | 202 | xml:space="preserve" | ||
207 | 203 | 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" | ||
208 | 204 | x="24.809601" | ||
209 | 205 | y="62.952" | ||
210 | 206 | id="text3891" | ||
211 | 207 | sodipodi:linespacing="125%"><tspan | ||
212 | 208 | sodipodi:role="line" | ||
213 | 209 | id="tspan3893" | ||
214 | 210 | x="24.809601" | ||
215 | 211 | y="62.952" | ||
216 | 212 | 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> | ||
217 | 213 | <rect | ||
218 | 214 | style="opacity:0.7;fill:none;stroke:none" | ||
219 | 215 | id="rect3021" | ||
220 | 216 | width="64" | ||
221 | 217 | height="64" | ||
222 | 218 | x="17.197599" | ||
223 | 219 | y="16" /> | ||
224 | 220 | </g> | ||
225 | 221 | <g | ||
226 | 222 | inkscape:groupmode="layer" | ||
227 | 223 | id="layer2" | ||
228 | 224 | inkscape:label="BADGE" | ||
229 | 225 | style="display:none" | ||
230 | 226 | sodipodi:insensitive="true"> | ||
231 | 227 | <g | ||
232 | 228 | style="display:inline" | ||
233 | 229 | transform="translate(-340.00001,-581)" | ||
234 | 230 | id="g4394" | ||
235 | 231 | clip-path="none"> | ||
236 | 232 | <g | ||
237 | 233 | id="g855"> | ||
238 | 234 | <g | ||
239 | 235 | inkscape:groupmode="maskhelper" | ||
240 | 236 | id="g870" | ||
241 | 237 | clip-path="url(#clipPath873)" | ||
242 | 238 | style="opacity:0.6;filter:url(#filter891)"> | ||
243 | 239 | <path | ||
244 | 240 | transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)" | ||
245 | 241 | 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" | ||
246 | 242 | sodipodi:ry="12" | ||
247 | 243 | sodipodi:rx="12" | ||
248 | 244 | sodipodi:cy="552.36218" | ||
249 | 245 | sodipodi:cx="252" | ||
250 | 246 | id="path844" | ||
251 | 247 | 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" | ||
252 | 248 | sodipodi:type="arc" /> | ||
253 | 249 | </g> | ||
254 | 250 | <g | ||
255 | 251 | id="g862"> | ||
256 | 252 | <path | ||
257 | 253 | sodipodi:type="arc" | ||
258 | 254 | 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" | ||
259 | 255 | id="path4398" | ||
260 | 256 | sodipodi:cx="252" | ||
261 | 257 | sodipodi:cy="552.36218" | ||
262 | 258 | sodipodi:rx="12" | ||
263 | 259 | sodipodi:ry="12" | ||
264 | 260 | 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" | ||
265 | 261 | transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" /> | ||
266 | 262 | <path | ||
267 | 263 | transform="matrix(1.25,0,0,1.25,33,-100.45273)" | ||
268 | 264 | 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" | ||
269 | 265 | sodipodi:ry="12" | ||
270 | 266 | sodipodi:rx="12" | ||
271 | 267 | sodipodi:cy="552.36218" | ||
272 | 268 | sodipodi:cx="252" | ||
273 | 269 | id="path4400" | ||
274 | 270 | 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" | ||
275 | 271 | sodipodi:type="arc" /> | ||
276 | 272 | <path | ||
277 | 273 | sodipodi:type="star" | ||
278 | 274 | 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" | ||
279 | 275 | id="path4459" | ||
280 | 276 | sodipodi:sides="5" | ||
281 | 277 | sodipodi:cx="666.19574" | ||
282 | 278 | sodipodi:cy="589.50385" | ||
283 | 279 | sodipodi:r1="7.2431178" | ||
284 | 280 | sodipodi:r2="4.3458705" | ||
285 | 281 | sodipodi:arg1="1.0471976" | ||
286 | 282 | sodipodi:arg2="1.6755161" | ||
287 | 283 | inkscape:flatsided="false" | ||
288 | 284 | inkscape:rounded="0.1" | ||
289 | 285 | inkscape:randomized="0" | ||
290 | 286 | 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" | ||
291 | 287 | transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" /> | ||
292 | 288 | </g> | ||
293 | 289 | </g> | ||
294 | 290 | </g> | ||
295 | 291 | </g> | ||
296 | 292 | </svg> | ||
297 | 0 | 293 | ||
298 | === modified file 'metadata.yaml' | |||
299 | --- metadata.yaml 2012-05-23 16:13:26 +0000 | |||
300 | +++ metadata.yaml 2014-09-09 01:19:34 +0000 | |||
301 | @@ -3,6 +3,8 @@ | |||
302 | 3 | maintainer: Marco Ceppi <marco@ceppi.net> | 3 | maintainer: Marco Ceppi <marco@ceppi.net> |
303 | 4 | description: | | 4 | description: | |
304 | 5 | Will deploy OpenJDK 6 JRE and the latest Minecraft server | 5 | Will deploy OpenJDK 6 JRE and the latest Minecraft server |
305 | 6 | categories: | ||
306 | 7 | - app-servers | ||
307 | 6 | provides: | 8 | provides: |
308 | 7 | server: | 9 | server: |
309 | 8 | interface: minecraft | 10 | interface: minecraft |