Merge lp:~tvansteenburgh/charms/precise/drupal6/fix-proof into lp:~lynxman/charms/precise/drupal6/trunk

Proposed by Tim Van Steenburgh
Status: Needs review
Proposed branch: lp:~tvansteenburgh/charms/precise/drupal6/fix-proof
Merge into: lp:~lynxman/charms/precise/drupal6/trunk
Diff against target: 315 lines (+295/-1)
2 files modified
icon.svg (+292/-0)
metadata.yaml (+3/-1)
To merge this branch: bzr merge lp:~tvansteenburgh/charms/precise/drupal6/fix-proof
Reviewer Review Type Date Requested Status
Marc Cluet Pending
Review via email: mp+234193@code.launchpad.net

Description of the change

Fix proof, add icon.

To post a comment you must log in.

Unmerged revisions

14. By Tim Van Steenburgh

Fix proof, add icon

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

Subscribers

People subscribed via source and target branches

to all changes: