changeset
Correct and improve code logic, build configuration, and appearance:
Wed, 27 Jul 2011 23:10:09 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 27 Jul 2011 23:10:09 +0200
- changeset 14
- 1bc8dc17e9c9
- parent 13
- 8fd77655ff43
- child 15
- af9725334e07
Correct and improve code logic, build configuration, and appearance:
Increase delay of hand placement, correct SVG icon file blocky
transperency, correct build release utility tarball logic, and
modify Gnome desktop file to be portable.
| docs/bugs.txt | file | annotate | diff | comparison | revisions | |
| docs/changelog.txt | file | annotate | diff | comparison | revisions | |
| docs/readme.txt | file | annotate | diff | comparison | revisions | |
| docs/release.sh | file | annotate | diff | comparison | revisions | |
| icons/schachuhr.svg | file | annotate | diff | comparison | revisions | |
| pkgs/appup/schachuhr.spec | file | annotate | diff | comparison | revisions | |
| pkgs/packaging.txt | file | annotate | diff | comparison | revisions | |
| pkgs/rpm/schachuhr.spec | file | annotate | diff | comparison | revisions | |
| pkgs/schachuhr.desktop | file | annotate | diff | comparison | revisions | |
| version.cpp | file | annotate | diff | comparison | revisions |
1.1 --- a/docs/bugs.txt Wed Jul 27 23:08:32 2011 +0200 1.2 +++ b/docs/bugs.txt Wed Jul 27 23:10:09 2011 +0200 1.3 @@ -10,3 +10,4 @@ 1.4 1.5 #01 Both subclock pause in relation to about dialog is flawed. 1.6 #02 Project name is inadequate. Consider renaming to 'Pendule'. 1.7 + #03 There are problems with the SVG icon file after ungrouping.
2.1 --- a/docs/changelog.txt Wed Jul 27 23:08:32 2011 +0200 2.2 +++ b/docs/changelog.txt Wed Jul 27 23:10:09 2011 +0200 2.3 @@ -12,8 +12,11 @@ 2.4 2.5 00000000 Release version 1.0.0 2.6 2.7 - 20110700 Release version 0.6.2 2.8 + 20110726 Release version 0.6.2 2.9 Increase delay of hand placement 2.10 + Correct SVG icon file blocky transperency 2.11 + Correct build release utility tarball logic 2.12 + Modify Gnome desktop file to be portable 2.13 2.14 20110708 Release version 0.6.1 2.15 Correct packaging dependencies
3.1 --- a/docs/readme.txt Wed Jul 27 23:08:32 2011 +0200 3.2 +++ b/docs/readme.txt Wed Jul 27 23:10:09 2011 +0200 3.3 @@ -5,7 +5,7 @@ 3.4 |____/ \___||_| |_| \__,_| \___||_| |_| \___/ |_| |_||_| 3.5 3.6 Europalab SchachUhr - Game clock graphical user interface client 3.7 - Version 0.6.1 (08-Jul-2011) 3.8 + Version 0.6.2 (26-Jul-2011) 3.9 3.10 ABSTRACT 3.11
4.1 --- a/docs/release.sh Wed Jul 27 23:08:32 2011 +0200 4.2 +++ b/docs/release.sh Wed Jul 27 23:10:09 2011 +0200 4.3 @@ -37,9 +37,8 @@ 4.4 echo "+++ rolling" 4.5 V=`shtool version -l c -d short version.cpp` 4.6 shtool tarball -o schachuhr-${V}.tar.gz -d schachuhr-${V} \ 4.7 - -e '\.hg,\.hgignore,\.[ao]$,^\.,*.tar.gz,^#.*,.*~$,*.bak' \ 4.8 - -e 'release\.sh,schuhr_stub.cpp,schuhr_stub.h,schuhr_scrap' \ 4.9 - -c 'gzip --best' . 4.10 + -e '\.hg,\.hgignore,\.[ao]\$,^\.,*.tar.gz,^#.*,.*~$,*.bak,release\.sh,schuhr_stub.cpp,schuhr_stub.h,schuhr_scrap,share' \ 4.11 + -c 'gzip --best' . 4.12 ls -l schachuhr-${V}.tar.gz 4.13 echo "+++ testing" 4.14 gunzip <schachuhr-${V}.tar.gz | tar tvf - | head -10
5.1 --- a/icons/schachuhr.svg Wed Jul 27 23:08:32 2011 +0200 5.2 +++ b/icons/schachuhr.svg Wed Jul 27 23:10:09 2011 +0200 5.3 @@ -281,7 +281,7 @@ 5.4 y1="1345.1019" 5.5 x2="1355.2506" 5.6 y2="1542.6782" 5.7 - id="linearGradient4087" 5.8 + id="linearGradient9733" 5.9 xlink:href="#linearGradient7256" 5.10 gradientUnits="userSpaceOnUse" 5.11 gradientTransform="matrix(0.60372891,0,0,0.57288061,-150.02325,-41.248831)" /> 5.12 @@ -290,7 +290,7 @@ 5.13 y1="879.85883" 5.14 x2="1403.9305" 5.15 y2="1131.8402" 5.16 - id="linearGradient4089" 5.17 + id="linearGradient9735" 5.18 xlink:href="#linearGradient7244" 5.19 gradientUnits="userSpaceOnUse" 5.20 gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.21 @@ -299,7 +299,7 @@ 5.22 y1="1111.4475" 5.23 x2="1273.0583" 5.24 y2="1116.0872" 5.25 - id="linearGradient4091" 5.26 + id="linearGradient9737" 5.27 xlink:href="#linearGradient4691" 5.28 gradientUnits="userSpaceOnUse" 5.29 gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.30 @@ -308,7 +308,7 @@ 5.31 y1="548.56799" 5.32 x2="876.20795" 5.33 y2="986.50342" 5.34 - id="linearGradient4093" 5.35 + id="linearGradient9739" 5.36 xlink:href="#linearGradient4691" 5.37 gradientUnits="userSpaceOnUse" 5.38 gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.39 @@ -317,7 +317,7 @@ 5.40 y1="1291.7611" 5.41 x2="636.3595" 5.42 y2="958.69025" 5.43 - id="linearGradient4095" 5.44 + id="linearGradient9741" 5.45 xlink:href="#linearGradient3938" 5.46 gradientUnits="userSpaceOnUse" /> 5.47 <linearGradient 5.48 @@ -325,7 +325,7 @@ 5.49 y1="184.14882" 5.50 x2="615.64362" 5.51 y2="587.89166" 5.52 - id="linearGradient4097" 5.53 + id="linearGradient9743" 5.54 xlink:href="#linearGradient3607" 5.55 gradientUnits="userSpaceOnUse" 5.56 gradientTransform="translate(17.964441,749.97923)" /> 5.57 @@ -334,7 +334,7 @@ 5.58 y1="582.27679" 5.59 x2="615.1073" 5.60 y2="195.55014" 5.61 - id="linearGradient4099" 5.62 + id="linearGradient9745" 5.63 xlink:href="#linearGradient3622" 5.64 gradientUnits="userSpaceOnUse" 5.65 gradientTransform="translate(17.964441,749.97923)" /> 5.66 @@ -343,7 +343,7 @@ 5.67 y1="1001.8262" 5.68 x2="671.58014" 5.69 y2="1021.4627" 5.70 - id="linearGradient4101" 5.71 + id="linearGradient9747" 5.72 xlink:href="#linearGradient3914" 5.73 gradientUnits="userSpaceOnUse" /> 5.74 <linearGradient 5.75 @@ -351,7 +351,7 @@ 5.76 y1="1001.8262" 5.77 x2="671.58014" 5.78 y2="1021.4627" 5.79 - id="linearGradient4103" 5.80 + id="linearGradient9749" 5.81 xlink:href="#linearGradient3914" 5.82 gradientUnits="userSpaceOnUse" /> 5.83 <radialGradient 5.84 @@ -360,7 +360,7 @@ 5.85 r="13.352726" 5.86 fx="671.47308" 5.87 fy="1010.2418" 5.88 - id="radialGradient4105" 5.89 + id="radialGradient9751" 5.90 xlink:href="#linearGradient3928" 5.91 gradientUnits="userSpaceOnUse" 5.92 gradientTransform="matrix(0.91737615,0.01340318,-0.01230074,0.84191949,67.906409,150.69966)" /> 5.93 @@ -369,7 +369,7 @@ 5.94 y1="720.80994" 5.95 x2="646.90668" 5.96 y2="953.65582" 5.97 - id="linearGradient4107" 5.98 + id="linearGradient9753" 5.99 xlink:href="#linearGradient3987" 5.100 gradientUnits="userSpaceOnUse" 5.101 gradientTransform="translate(0,152.36218)" /> 5.102 @@ -378,7 +378,7 @@ 5.103 y1="1291.7611" 5.104 x2="636.3595" 5.105 y2="958.69025" 5.106 - id="linearGradient4109" 5.107 + id="linearGradient9755" 5.108 xlink:href="#linearGradient3938" 5.109 gradientUnits="userSpaceOnUse" 5.110 gradientTransform="translate(500,0)" /> 5.111 @@ -387,7 +387,7 @@ 5.112 y1="184.14882" 5.113 x2="615.64362" 5.114 y2="587.89166" 5.115 - id="linearGradient4111" 5.116 + id="linearGradient9757" 5.117 xlink:href="#linearGradient3607" 5.118 gradientUnits="userSpaceOnUse" 5.119 gradientTransform="translate(517.96444,749.97923)" /> 5.120 @@ -396,7 +396,7 @@ 5.121 y1="582.27679" 5.122 x2="615.1073" 5.123 y2="195.55014" 5.124 - id="linearGradient4113" 5.125 + id="linearGradient9759" 5.126 xlink:href="#linearGradient3622" 5.127 gradientUnits="userSpaceOnUse" 5.128 gradientTransform="translate(517.96444,749.97923)" /> 5.129 @@ -405,7 +405,7 @@ 5.130 y1="1001.8262" 5.131 x2="671.58014" 5.132 y2="1021.4627" 5.133 - id="linearGradient4115" 5.134 + id="linearGradient9761" 5.135 xlink:href="#linearGradient3914" 5.136 gradientUnits="userSpaceOnUse" /> 5.137 <linearGradient 5.138 @@ -413,7 +413,7 @@ 5.139 y1="1001.8262" 5.140 x2="671.58014" 5.141 y2="1021.4627" 5.142 - id="linearGradient4117" 5.143 + id="linearGradient9763" 5.144 xlink:href="#linearGradient3914" 5.145 gradientUnits="userSpaceOnUse" /> 5.146 <radialGradient 5.147 @@ -422,7 +422,7 @@ 5.148 r="13.352726" 5.149 fx="671.47308" 5.150 fy="1010.2418" 5.151 - id="radialGradient4119" 5.152 + id="radialGradient9765" 5.153 xlink:href="#linearGradient3928" 5.154 gradientUnits="userSpaceOnUse" 5.155 gradientTransform="matrix(0.91737615,0.01340318,-0.01230074,0.84191949,67.906409,150.69966)" /> 5.156 @@ -431,7 +431,7 @@ 5.157 y1="720.80994" 5.158 x2="646.90668" 5.159 y2="953.65582" 5.160 - id="linearGradient4121" 5.161 + id="linearGradient9767" 5.162 xlink:href="#linearGradient3987" 5.163 gradientUnits="userSpaceOnUse" 5.164 gradientTransform="translate(499.83263,152.53009)" /> 5.165 @@ -440,7 +440,7 @@ 5.166 y1="1345.1019" 5.167 x2="1355.2506" 5.168 y2="1542.6782" 5.169 - id="linearGradient4123" 5.170 + id="linearGradient9769" 5.171 xlink:href="#linearGradient7256-2" 5.172 gradientUnits="userSpaceOnUse" 5.173 gradientTransform="matrix(0.60372891,0,0,0.57288061,-150.02325,-41.248831)" /> 5.174 @@ -449,7 +449,7 @@ 5.175 y1="879.85883" 5.176 x2="1403.9305" 5.177 y2="1131.8402" 5.178 - id="linearGradient4125" 5.179 + id="linearGradient9771" 5.180 xlink:href="#linearGradient7244-5" 5.181 gradientUnits="userSpaceOnUse" 5.182 gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.183 @@ -458,7 +458,7 @@ 5.184 y1="1111.4475" 5.185 x2="1273.0583" 5.186 y2="1116.0872" 5.187 - id="linearGradient4127" 5.188 + id="linearGradient9773" 5.189 xlink:href="#linearGradient4691-7" 5.190 gradientUnits="userSpaceOnUse" 5.191 gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.192 @@ -467,7 +467,7 @@ 5.193 y1="548.56799" 5.194 x2="876.20795" 5.195 y2="986.50342" 5.196 - id="linearGradient4129" 5.197 + id="linearGradient9775" 5.198 xlink:href="#linearGradient4691-7" 5.199 gradientUnits="userSpaceOnUse" 5.200 gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.201 @@ -476,7 +476,7 @@ 5.202 y1="1291.7611" 5.203 x2="636.3595" 5.204 y2="958.69025" 5.205 - id="linearGradient4131" 5.206 + id="linearGradient9777" 5.207 xlink:href="#linearGradient3938-6" 5.208 gradientUnits="userSpaceOnUse" /> 5.209 <linearGradient 5.210 @@ -484,7 +484,7 @@ 5.211 y1="184.14882" 5.212 x2="615.64362" 5.213 y2="587.89166" 5.214 - id="linearGradient4133" 5.215 + id="linearGradient9779" 5.216 xlink:href="#linearGradient3607-9" 5.217 gradientUnits="userSpaceOnUse" 5.218 gradientTransform="translate(17.964441,749.97923)" /> 5.219 @@ -493,7 +493,7 @@ 5.220 y1="582.27679" 5.221 x2="615.1073" 5.222 y2="195.55014" 5.223 - id="linearGradient4135" 5.224 + id="linearGradient9781" 5.225 xlink:href="#linearGradient3622-1" 5.226 gradientUnits="userSpaceOnUse" 5.227 gradientTransform="translate(17.964441,749.97923)" /> 5.228 @@ -502,7 +502,7 @@ 5.229 y1="1001.8262" 5.230 x2="671.58014" 5.231 y2="1021.4627" 5.232 - id="linearGradient4137" 5.233 + id="linearGradient9783" 5.234 xlink:href="#linearGradient3914-9" 5.235 gradientUnits="userSpaceOnUse" /> 5.236 <linearGradient 5.237 @@ -510,7 +510,7 @@ 5.238 y1="1001.8262" 5.239 x2="671.58014" 5.240 y2="1021.4627" 5.241 - id="linearGradient4139" 5.242 + id="linearGradient9785" 5.243 xlink:href="#linearGradient3914-9" 5.244 gradientUnits="userSpaceOnUse" /> 5.245 <radialGradient 5.246 @@ -519,7 +519,7 @@ 5.247 r="13.352726" 5.248 fx="671.47308" 5.249 fy="1010.2418" 5.250 - id="radialGradient4141" 5.251 + id="radialGradient9787" 5.252 xlink:href="#linearGradient3928-3" 5.253 gradientUnits="userSpaceOnUse" 5.254 gradientTransform="matrix(0.91737615,0.01340318,-0.01230074,0.84191949,67.906409,150.69966)" /> 5.255 @@ -528,7 +528,7 @@ 5.256 y1="720.80994" 5.257 x2="646.90668" 5.258 y2="953.65582" 5.259 - id="linearGradient4143" 5.260 + id="linearGradient9789" 5.261 xlink:href="#linearGradient3987-3" 5.262 gradientUnits="userSpaceOnUse" 5.263 gradientTransform="translate(0,152.36218)" /> 5.264 @@ -537,7 +537,7 @@ 5.265 y1="1291.7611" 5.266 x2="636.3595" 5.267 y2="958.69025" 5.268 - id="linearGradient4145" 5.269 + id="linearGradient9791" 5.270 xlink:href="#linearGradient3938-6" 5.271 gradientUnits="userSpaceOnUse" 5.272 gradientTransform="translate(500,0)" /> 5.273 @@ -546,7 +546,7 @@ 5.274 y1="184.14882" 5.275 x2="615.64362" 5.276 y2="587.89166" 5.277 - id="linearGradient4147" 5.278 + id="linearGradient9793" 5.279 xlink:href="#linearGradient3607-9" 5.280 gradientUnits="userSpaceOnUse" 5.281 gradientTransform="translate(517.96444,749.97923)" /> 5.282 @@ -555,7 +555,7 @@ 5.283 y1="582.27679" 5.284 x2="615.1073" 5.285 y2="195.55014" 5.286 - id="linearGradient4149" 5.287 + id="linearGradient9795" 5.288 xlink:href="#linearGradient3622-1" 5.289 gradientUnits="userSpaceOnUse" 5.290 gradientTransform="translate(517.96444,749.97923)" /> 5.291 @@ -564,7 +564,7 @@ 5.292 y1="1001.8262" 5.293 x2="671.58014" 5.294 y2="1021.4627" 5.295 - id="linearGradient4151" 5.296 + id="linearGradient9797" 5.297 xlink:href="#linearGradient3914-9" 5.298 gradientUnits="userSpaceOnUse" /> 5.299 <linearGradient 5.300 @@ -572,7 +572,7 @@ 5.301 y1="1001.8262" 5.302 x2="671.58014" 5.303 y2="1021.4627" 5.304 - id="linearGradient4153" 5.305 + id="linearGradient9799" 5.306 xlink:href="#linearGradient3914-9" 5.307 gradientUnits="userSpaceOnUse" /> 5.308 <radialGradient 5.309 @@ -581,7 +581,7 @@ 5.310 r="13.352726" 5.311 fx="671.47308" 5.312 fy="1010.2418" 5.313 - id="radialGradient4155" 5.314 + id="radialGradient9801" 5.315 xlink:href="#linearGradient3928-3" 5.316 gradientUnits="userSpaceOnUse" 5.317 gradientTransform="matrix(0.91737615,0.01340318,-0.01230074,0.84191949,67.906409,150.69966)" /> 5.318 @@ -590,7 +590,7 @@ 5.319 y1="720.80994" 5.320 x2="646.90668" 5.321 y2="953.65582" 5.322 - id="linearGradient4157" 5.323 + id="linearGradient9803" 5.324 xlink:href="#linearGradient3987-3" 5.325 gradientUnits="userSpaceOnUse" 5.326 gradientTransform="translate(499.83263,152.53009)" /> 5.327 @@ -599,7 +599,166 @@ 5.328 y1="1345.1019" 5.329 x2="1355.2506" 5.330 y2="1542.6782" 5.331 - id="linearGradient4886" 5.332 + id="linearGradient10287" 5.333 + xlink:href="#linearGradient7256" 5.334 + gradientUnits="userSpaceOnUse" 5.335 + gradientTransform="matrix(0.60372891,0,0,0.57288061,-150.02325,-41.248831)" /> 5.336 + <linearGradient 5.337 + x1="357.19443" 5.338 + y1="879.85883" 5.339 + x2="1403.9305" 5.340 + y2="1131.8402" 5.341 + id="linearGradient10289" 5.342 + xlink:href="#linearGradient7244" 5.343 + gradientUnits="userSpaceOnUse" 5.344 + gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.345 + <linearGradient 5.346 + x1="1765.4191" 5.347 + y1="1111.4475" 5.348 + x2="1273.0583" 5.349 + y2="1116.0872" 5.350 + id="linearGradient10291" 5.351 + xlink:href="#linearGradient4691" 5.352 + gradientUnits="userSpaceOnUse" 5.353 + gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.354 + <linearGradient 5.355 + x1="846.18408" 5.356 + y1="548.56799" 5.357 + x2="876.20795" 5.358 + y2="986.50342" 5.359 + id="linearGradient10293" 5.360 + xlink:href="#linearGradient4691" 5.361 + gradientUnits="userSpaceOnUse" 5.362 + gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.363 + <linearGradient 5.364 + x1="632.02515" 5.365 + y1="1291.7611" 5.366 + x2="636.3595" 5.367 + y2="958.69025" 5.368 + id="linearGradient10295" 5.369 + xlink:href="#linearGradient3938" 5.370 + gradientUnits="userSpaceOnUse" /> 5.371 + <linearGradient 5.372 + x1="614.19434" 5.373 + y1="184.14882" 5.374 + x2="615.64362" 5.375 + y2="587.89166" 5.376 + id="linearGradient10297" 5.377 + xlink:href="#linearGradient3607" 5.378 + gradientUnits="userSpaceOnUse" 5.379 + gradientTransform="translate(17.964441,749.97923)" /> 5.380 + <linearGradient 5.381 + x1="615.32367" 5.382 + y1="582.27679" 5.383 + x2="615.1073" 5.384 + y2="195.55014" 5.385 + id="linearGradient10299" 5.386 + xlink:href="#linearGradient3622" 5.387 + gradientUnits="userSpaceOnUse" 5.388 + gradientTransform="translate(17.964441,749.97923)" /> 5.389 + <linearGradient 5.390 + x1="671.50629" 5.391 + y1="1001.8262" 5.392 + x2="671.58014" 5.393 + y2="1021.4627" 5.394 + id="linearGradient10301" 5.395 + xlink:href="#linearGradient3914" 5.396 + gradientUnits="userSpaceOnUse" /> 5.397 + <linearGradient 5.398 + x1="671.50629" 5.399 + y1="1001.8262" 5.400 + x2="671.58014" 5.401 + y2="1021.4627" 5.402 + id="linearGradient10303" 5.403 + xlink:href="#linearGradient3914" 5.404 + gradientUnits="userSpaceOnUse" /> 5.405 + <radialGradient 5.406 + cx="671.47308" 5.407 + cy="1010.2418" 5.408 + r="13.352726" 5.409 + fx="671.47308" 5.410 + fy="1010.2418" 5.411 + id="radialGradient10305" 5.412 + xlink:href="#linearGradient3928" 5.413 + gradientUnits="userSpaceOnUse" 5.414 + gradientTransform="matrix(0.91737615,0.01340318,-0.01230074,0.84191949,67.906409,150.69966)" /> 5.415 + <linearGradient 5.416 + x1="448.48141" 5.417 + y1="720.80994" 5.418 + x2="646.90668" 5.419 + y2="953.65582" 5.420 + id="linearGradient10307" 5.421 + xlink:href="#linearGradient3987" 5.422 + gradientUnits="userSpaceOnUse" 5.423 + gradientTransform="translate(0,152.36218)" /> 5.424 + <linearGradient 5.425 + x1="632.02515" 5.426 + y1="1291.7611" 5.427 + x2="636.3595" 5.428 + y2="958.69025" 5.429 + id="linearGradient10309" 5.430 + xlink:href="#linearGradient3938" 5.431 + gradientUnits="userSpaceOnUse" 5.432 + gradientTransform="translate(500,0)" /> 5.433 + <linearGradient 5.434 + x1="614.19434" 5.435 + y1="184.14882" 5.436 + x2="615.64362" 5.437 + y2="587.89166" 5.438 + id="linearGradient10311" 5.439 + xlink:href="#linearGradient3607" 5.440 + gradientUnits="userSpaceOnUse" 5.441 + gradientTransform="translate(517.96444,749.97923)" /> 5.442 + <linearGradient 5.443 + x1="615.32367" 5.444 + y1="582.27679" 5.445 + x2="615.1073" 5.446 + y2="195.55014" 5.447 + id="linearGradient10313" 5.448 + xlink:href="#linearGradient3622" 5.449 + gradientUnits="userSpaceOnUse" 5.450 + gradientTransform="translate(517.96444,749.97923)" /> 5.451 + <linearGradient 5.452 + x1="671.50629" 5.453 + y1="1001.8262" 5.454 + x2="671.58014" 5.455 + y2="1021.4627" 5.456 + id="linearGradient10315" 5.457 + xlink:href="#linearGradient3914" 5.458 + gradientUnits="userSpaceOnUse" /> 5.459 + <linearGradient 5.460 + x1="671.50629" 5.461 + y1="1001.8262" 5.462 + x2="671.58014" 5.463 + y2="1021.4627" 5.464 + id="linearGradient10317" 5.465 + xlink:href="#linearGradient3914" 5.466 + gradientUnits="userSpaceOnUse" /> 5.467 + <radialGradient 5.468 + cx="671.47308" 5.469 + cy="1010.2418" 5.470 + r="13.352726" 5.471 + fx="671.47308" 5.472 + fy="1010.2418" 5.473 + id="radialGradient10319" 5.474 + xlink:href="#linearGradient3928" 5.475 + gradientUnits="userSpaceOnUse" 5.476 + gradientTransform="matrix(0.91737615,0.01340318,-0.01230074,0.84191949,67.906409,150.69966)" /> 5.477 + <linearGradient 5.478 + x1="448.48141" 5.479 + y1="720.80994" 5.480 + x2="646.90668" 5.481 + y2="953.65582" 5.482 + id="linearGradient10321" 5.483 + xlink:href="#linearGradient3987" 5.484 + gradientUnits="userSpaceOnUse" 5.485 + gradientTransform="translate(499.83263,152.53009)" /> 5.486 + <linearGradient 5.487 + x1="437.37033" 5.488 + y1="1345.1019" 5.489 + x2="1355.2506" 5.490 + y2="1542.6782" 5.491 + id="linearGradient10323" 5.492 xlink:href="#linearGradient7256-2" 5.493 gradientUnits="userSpaceOnUse" 5.494 gradientTransform="matrix(0.60372891,0,0,0.57288061,-150.02325,-41.248831)" /> 5.495 @@ -608,7 +767,7 @@ 5.496 y1="879.85883" 5.497 x2="1403.9305" 5.498 y2="1131.8402" 5.499 - id="linearGradient4888" 5.500 + id="linearGradient10325" 5.501 xlink:href="#linearGradient7244-5" 5.502 gradientUnits="userSpaceOnUse" 5.503 gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.504 @@ -617,7 +776,7 @@ 5.505 y1="1111.4475" 5.506 x2="1273.0583" 5.507 y2="1116.0872" 5.508 - id="linearGradient4890" 5.509 + id="linearGradient10327" 5.510 xlink:href="#linearGradient4691-7" 5.511 gradientUnits="userSpaceOnUse" 5.512 gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.513 @@ -626,7 +785,7 @@ 5.514 y1="548.56799" 5.515 x2="876.20795" 5.516 y2="986.50342" 5.517 - id="linearGradient4892" 5.518 + id="linearGradient10329" 5.519 xlink:href="#linearGradient4691-7" 5.520 gradientUnits="userSpaceOnUse" 5.521 gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.522 @@ -635,7 +794,7 @@ 5.523 y1="1291.7611" 5.524 x2="636.3595" 5.525 y2="958.69025" 5.526 - id="linearGradient4894" 5.527 + id="linearGradient10331" 5.528 xlink:href="#linearGradient3938-6" 5.529 gradientUnits="userSpaceOnUse" /> 5.530 <linearGradient 5.531 @@ -643,7 +802,7 @@ 5.532 y1="184.14882" 5.533 x2="615.64362" 5.534 y2="587.89166" 5.535 - id="linearGradient4896" 5.536 + id="linearGradient10333" 5.537 xlink:href="#linearGradient3607-9" 5.538 gradientUnits="userSpaceOnUse" 5.539 gradientTransform="translate(17.964441,749.97923)" /> 5.540 @@ -652,7 +811,7 @@ 5.541 y1="582.27679" 5.542 x2="615.1073" 5.543 y2="195.55014" 5.544 - id="linearGradient4898" 5.545 + id="linearGradient10335" 5.546 xlink:href="#linearGradient3622-1" 5.547 gradientUnits="userSpaceOnUse" 5.548 gradientTransform="translate(17.964441,749.97923)" /> 5.549 @@ -661,7 +820,7 @@ 5.550 y1="1001.8262" 5.551 x2="671.58014" 5.552 y2="1021.4627" 5.553 - id="linearGradient4900" 5.554 + id="linearGradient10337" 5.555 xlink:href="#linearGradient3914-9" 5.556 gradientUnits="userSpaceOnUse" /> 5.557 <linearGradient 5.558 @@ -669,7 +828,7 @@ 5.559 y1="1001.8262" 5.560 x2="671.58014" 5.561 y2="1021.4627" 5.562 - id="linearGradient4902" 5.563 + id="linearGradient10339" 5.564 xlink:href="#linearGradient3914-9" 5.565 gradientUnits="userSpaceOnUse" /> 5.566 <radialGradient 5.567 @@ -678,7 +837,7 @@ 5.568 r="13.352726" 5.569 fx="671.47308" 5.570 fy="1010.2418" 5.571 - id="radialGradient4904" 5.572 + id="radialGradient10341" 5.573 xlink:href="#linearGradient3928-3" 5.574 gradientUnits="userSpaceOnUse" 5.575 gradientTransform="matrix(0.91737615,0.01340318,-0.01230074,0.84191949,67.906409,150.69966)" /> 5.576 @@ -687,7 +846,7 @@ 5.577 y1="720.80994" 5.578 x2="646.90668" 5.579 y2="953.65582" 5.580 - id="linearGradient4906" 5.581 + id="linearGradient10343" 5.582 xlink:href="#linearGradient3987-3" 5.583 gradientUnits="userSpaceOnUse" 5.584 gradientTransform="translate(0,152.36218)" /> 5.585 @@ -696,7 +855,7 @@ 5.586 y1="1291.7611" 5.587 x2="636.3595" 5.588 y2="958.69025" 5.589 - id="linearGradient4908" 5.590 + id="linearGradient10345" 5.591 xlink:href="#linearGradient3938-6" 5.592 gradientUnits="userSpaceOnUse" 5.593 gradientTransform="translate(500,0)" /> 5.594 @@ -705,7 +864,7 @@ 5.595 y1="184.14882" 5.596 x2="615.64362" 5.597 y2="587.89166" 5.598 - id="linearGradient4910" 5.599 + id="linearGradient10347" 5.600 xlink:href="#linearGradient3607-9" 5.601 gradientUnits="userSpaceOnUse" 5.602 gradientTransform="translate(517.96444,749.97923)" /> 5.603 @@ -714,7 +873,7 @@ 5.604 y1="582.27679" 5.605 x2="615.1073" 5.606 y2="195.55014" 5.607 - id="linearGradient4912" 5.608 + id="linearGradient10349" 5.609 xlink:href="#linearGradient3622-1" 5.610 gradientUnits="userSpaceOnUse" 5.611 gradientTransform="translate(517.96444,749.97923)" /> 5.612 @@ -723,7 +882,7 @@ 5.613 y1="1001.8262" 5.614 x2="671.58014" 5.615 y2="1021.4627" 5.616 - id="linearGradient4914" 5.617 + id="linearGradient10351" 5.618 xlink:href="#linearGradient3914-9" 5.619 gradientUnits="userSpaceOnUse" /> 5.620 <linearGradient 5.621 @@ -731,7 +890,7 @@ 5.622 y1="1001.8262" 5.623 x2="671.58014" 5.624 y2="1021.4627" 5.625 - id="linearGradient4916" 5.626 + id="linearGradient10353" 5.627 xlink:href="#linearGradient3914-9" 5.628 gradientUnits="userSpaceOnUse" /> 5.629 <radialGradient 5.630 @@ -740,7 +899,7 @@ 5.631 r="13.352726" 5.632 fx="671.47308" 5.633 fy="1010.2418" 5.634 - id="radialGradient4918" 5.635 + id="radialGradient10355" 5.636 xlink:href="#linearGradient3928-3" 5.637 gradientUnits="userSpaceOnUse" 5.638 gradientTransform="matrix(0.91737615,0.01340318,-0.01230074,0.84191949,67.906409,150.69966)" /> 5.639 @@ -749,46 +908,169 @@ 5.640 y1="720.80994" 5.641 x2="646.90668" 5.642 y2="953.65582" 5.643 - id="linearGradient4920" 5.644 + id="linearGradient10357" 5.645 xlink:href="#linearGradient3987-3" 5.646 gradientUnits="userSpaceOnUse" 5.647 gradientTransform="translate(499.83263,152.53009)" /> 5.648 <linearGradient 5.649 + x1="437.37033" 5.650 + y1="1345.1019" 5.651 + x2="1355.2506" 5.652 + y2="1542.6782" 5.653 + id="linearGradient10839" 5.654 + xlink:href="#linearGradient7256-2" 5.655 + gradientUnits="userSpaceOnUse" 5.656 + gradientTransform="matrix(0.60372891,0,0,0.57288061,-150.02325,-41.248831)" /> 5.657 + <linearGradient 5.658 + x1="357.19443" 5.659 + y1="879.85883" 5.660 + x2="1403.9305" 5.661 + y2="1131.8402" 5.662 + id="linearGradient10841" 5.663 + xlink:href="#linearGradient7244-5" 5.664 + gradientUnits="userSpaceOnUse" 5.665 + gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.666 + <linearGradient 5.667 + x1="1765.4191" 5.668 + y1="1111.4475" 5.669 + x2="1273.0583" 5.670 + y2="1116.0872" 5.671 + id="linearGradient10843" 5.672 + xlink:href="#linearGradient4691-7" 5.673 + gradientUnits="userSpaceOnUse" 5.674 + gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.675 + <linearGradient 5.676 x1="846.18408" 5.677 y1="548.56799" 5.678 x2="876.20795" 5.679 y2="986.50342" 5.680 - id="linearGradient5155" 5.681 + id="linearGradient10845" 5.682 xlink:href="#linearGradient4691-7" 5.683 gradientUnits="userSpaceOnUse" 5.684 - gradientTransform="matrix(0.57288061,0,0,0.39813396,-170.18135,-981.0081)" /> 5.685 + gradientTransform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" /> 5.686 <linearGradient 5.687 - x1="1765.4191" 5.688 - y1="1111.4475" 5.689 - x2="1273.0583" 5.690 - y2="1116.0872" 5.691 - id="linearGradient5158" 5.692 - xlink:href="#linearGradient4691-7" 5.693 + x1="632.02515" 5.694 + y1="1291.7611" 5.695 + x2="636.3595" 5.696 + y2="958.69025" 5.697 + id="linearGradient10847" 5.698 + xlink:href="#linearGradient3938-6" 5.699 + gradientUnits="userSpaceOnUse" /> 5.700 + <linearGradient 5.701 + x1="614.19434" 5.702 + y1="184.14882" 5.703 + x2="615.64362" 5.704 + y2="587.89166" 5.705 + id="linearGradient10849" 5.706 + xlink:href="#linearGradient3607-9" 5.707 gradientUnits="userSpaceOnUse" 5.708 - gradientTransform="matrix(0.57288061,0,0,0.39813396,-170.18135,-981.0081)" /> 5.709 + gradientTransform="translate(17.964441,749.97923)" /> 5.710 <linearGradient 5.711 - x1="357.19443" 5.712 - y1="879.85883" 5.713 - x2="1403.9305" 5.714 - y2="1131.8402" 5.715 - id="linearGradient5162" 5.716 - xlink:href="#linearGradient7244-5" 5.717 + x1="615.32367" 5.718 + y1="582.27679" 5.719 + x2="615.1073" 5.720 + y2="195.55014" 5.721 + id="linearGradient10851" 5.722 + xlink:href="#linearGradient3622-1" 5.723 gradientUnits="userSpaceOnUse" 5.724 - gradientTransform="matrix(0.57288061,0,0,-0.39813396,-170.18135,981.0081)" /> 5.725 + gradientTransform="translate(17.964441,749.97923)" /> 5.726 <linearGradient 5.727 - x1="437.37033" 5.728 - y1="1345.1019" 5.729 - x2="1355.2506" 5.730 - y2="1542.6782" 5.731 - id="linearGradient5165" 5.732 - xlink:href="#linearGradient7256-2" 5.733 + x1="671.50629" 5.734 + y1="1001.8262" 5.735 + x2="671.58014" 5.736 + y2="1021.4627" 5.737 + id="linearGradient10853" 5.738 + xlink:href="#linearGradient3914-9" 5.739 + gradientUnits="userSpaceOnUse" /> 5.740 + <linearGradient 5.741 + x1="671.50629" 5.742 + y1="1001.8262" 5.743 + x2="671.58014" 5.744 + y2="1021.4627" 5.745 + id="linearGradient10855" 5.746 + xlink:href="#linearGradient3914-9" 5.747 + gradientUnits="userSpaceOnUse" /> 5.748 + <radialGradient 5.749 + cx="671.47308" 5.750 + cy="1010.2418" 5.751 + r="13.352726" 5.752 + fx="671.47308" 5.753 + fy="1010.2418" 5.754 + id="radialGradient10857" 5.755 + xlink:href="#linearGradient3928-3" 5.756 gradientUnits="userSpaceOnUse" 5.757 - gradientTransform="matrix(0.60372891,0,0,0.75161865,-201.44913,-1450.9025)" /> 5.758 + gradientTransform="matrix(0.91737615,0.01340318,-0.01230074,0.84191949,67.906409,150.69966)" /> 5.759 + <linearGradient 5.760 + x1="448.48141" 5.761 + y1="720.80994" 5.762 + x2="646.90668" 5.763 + y2="953.65582" 5.764 + id="linearGradient10859" 5.765 + xlink:href="#linearGradient3987-3" 5.766 + gradientUnits="userSpaceOnUse" 5.767 + gradientTransform="translate(0,152.36218)" /> 5.768 + <linearGradient 5.769 + x1="632.02515" 5.770 + y1="1291.7611" 5.771 + x2="636.3595" 5.772 + y2="958.69025" 5.773 + id="linearGradient10861" 5.774 + xlink:href="#linearGradient3938-6" 5.775 + gradientUnits="userSpaceOnUse" 5.776 + gradientTransform="translate(500,0)" /> 5.777 + <linearGradient 5.778 + x1="614.19434" 5.779 + y1="184.14882" 5.780 + x2="615.64362" 5.781 + y2="587.89166" 5.782 + id="linearGradient10863" 5.783 + xlink:href="#linearGradient3607-9" 5.784 + gradientUnits="userSpaceOnUse" 5.785 + gradientTransform="translate(517.96444,749.97923)" /> 5.786 + <linearGradient 5.787 + x1="615.32367" 5.788 + y1="582.27679" 5.789 + x2="615.1073" 5.790 + y2="195.55014" 5.791 + id="linearGradient10865" 5.792 + xlink:href="#linearGradient3622-1" 5.793 + gradientUnits="userSpaceOnUse" 5.794 + gradientTransform="translate(517.96444,749.97923)" /> 5.795 + <linearGradient 5.796 + x1="671.50629" 5.797 + y1="1001.8262" 5.798 + x2="671.58014" 5.799 + y2="1021.4627" 5.800 + id="linearGradient10867" 5.801 + xlink:href="#linearGradient3914-9" 5.802 + gradientUnits="userSpaceOnUse" /> 5.803 + <linearGradient 5.804 + x1="671.50629" 5.805 + y1="1001.8262" 5.806 + x2="671.58014" 5.807 + y2="1021.4627" 5.808 + id="linearGradient10869" 5.809 + xlink:href="#linearGradient3914-9" 5.810 + gradientUnits="userSpaceOnUse" /> 5.811 + <radialGradient 5.812 + cx="671.47308" 5.813 + cy="1010.2418" 5.814 + r="13.352726" 5.815 + fx="671.47308" 5.816 + fy="1010.2418" 5.817 + id="radialGradient10871" 5.818 + xlink:href="#linearGradient3928-3" 5.819 + gradientUnits="userSpaceOnUse" 5.820 + gradientTransform="matrix(0.91737615,0.01340318,-0.01230074,0.84191949,67.906409,150.69966)" /> 5.821 + <linearGradient 5.822 + x1="448.48141" 5.823 + y1="720.80994" 5.824 + x2="646.90668" 5.825 + y2="953.65582" 5.826 + id="linearGradient10873" 5.827 + xlink:href="#linearGradient3987-3" 5.828 + gradientUnits="userSpaceOnUse" 5.829 + gradientTransform="translate(499.83263,152.53009)" /> 5.830 </defs> 5.831 <metadata 5.832 id="metadata8251"> 5.833 @@ -803,7 +1085,7 @@ 5.834 </rdf:RDF> 5.835 </metadata> 5.836 <g 5.837 - id="g5410"> 5.838 + id="g10875"> 5.839 <g 5.840 transform="translate(-51.425426,-398.43028)" 5.841 id="g3582"> 5.842 @@ -827,11 +1109,11 @@ 5.843 x="75.997749" 5.844 y="731.40265" 5.845 id="rect4687" 5.846 - style="fill:url(#linearGradient4087);fill-opacity:1;stroke:none" /> 5.847 + style="fill:url(#linearGradient10287);fill-opacity:1;stroke:none" /> 5.848 <path 5.849 d="m 51.425876,398.43101 0,378.04678 44.290832,0 0,-91.59811 579.970012,0 0,91.59811 44.29083,0 0,-378.04678 -668.551674,0 z" 5.850 id="rect4678" 5.851 - style="fill:url(#linearGradient4089);fill-opacity:1;stroke:none" /> 5.852 + style="fill:url(#linearGradient10289);fill-opacity:1;stroke:none" /> 5.853 <rect 5.854 width="579.96918" 5.855 height="290.18356" 5.856 @@ -845,14 +1127,14 @@ 5.857 x="95.71653" 5.858 y="446.0827" 5.859 id="rect4699" 5.860 - style="fill:url(#linearGradient4091);fill-opacity:1;stroke:none" /> 5.861 + style="fill:url(#linearGradient10291);fill-opacity:1;stroke:none" /> 5.862 <rect 5.863 width="579.96918" 5.864 height="290.18356" 5.865 x="95.71653" 5.866 y="446.0827" 5.867 id="rect4689" 5.868 - style="fill:url(#linearGradient4093);fill-opacity:1;stroke:none" /> 5.869 + style="fill:url(#linearGradient10293);fill-opacity:1;stroke:none" /> 5.870 <g 5.871 transform="matrix(0.36328554,0,0,0.36328554,70.367205,460.40965)" 5.872 id="g4664"> 5.873 @@ -931,7 +1213,7 @@ 5.874 <path 5.875 d="m 632.18348,902.86724 c -120.84331,0 -218.83103,97.95586 -218.83103,218.79916 0,120.8434 97.98772,218.8311 218.83103,218.8311 120.84332,0 218.7992,-97.9877 218.7992,-218.8311 0,-120.8433 -97.95588,-218.79916 -218.7992,-218.79916 z m 0,14.58236 c 112.78709,0 204.21684,91.4297 204.21684,204.2168 0,112.7871 -91.42975,204.2168 -204.21684,204.2168 -112.78709,0 -204.24867,-91.4297 -204.24867,-204.2168 0,-112.7871 91.46158,-204.2168 204.24867,-204.2168 z" 5.876 id="path3936" 5.877 - style="fill:url(#linearGradient4095);fill-opacity:1;stroke:none" /> 5.878 + style="fill:url(#linearGradient10295);fill-opacity:1;stroke:none" /> 5.879 <path 5.880 d="m 1092.351,959.73004 a 121.48483,121.48483 0 1 1 -242.96967,0 121.48483,121.48483 0 1 1 242.96967,0 z" 5.881 transform="matrix(1.7083333,0,0,1.7083333,-1026.3954,-517.85645)" 5.882 @@ -944,16 +1226,16 @@ 5.883 <path 5.884 d="m 632.18319,906.91673 c -118.60693,0 -214.78125,96.14307 -214.78125,214.74997 0,118.607 96.17432,214.7813 214.78125,214.7813 118.60693,0 214.75,-96.1743 214.75,-214.7813 0,-118.6069 -96.14307,-214.74997 -214.75,-214.74997 z m 0,14.3125 c 110.6998,0 200.4375,89.73767 200.4375,200.43747 0,110.6998 -89.7377,200.4375 -200.4375,200.4375 -110.6998,0 -200.46875,-89.7377 -200.46875,-200.4375 0,-110.6998 89.76895,-200.43747 200.46875,-200.43747 z" 5.885 id="path2830" 5.886 - style="fill:url(#linearGradient4097);fill-opacity:1;stroke:none" /> 5.887 + style="fill:url(#linearGradient10297);fill-opacity:1;stroke:none" /> 5.888 <path 5.889 d="m 632.15194,912.22923 c -115.67463,0 -209.4375,93.76287 -209.4375,209.43747 0,115.6747 93.76287,209.4688 209.4375,209.4688 115.67463,0 209.46875,-93.7941 209.46875,-209.4688 0,-115.6746 -93.79412,-209.43747 -209.46875,-209.43747 z m 0,4.3125 c 113.30249,0 205.15625,91.82247 205.15625,205.12497 0,113.3025 -91.85376,205.1563 -205.15625,205.1563 -113.30249,0 -205.125,-91.8538 -205.125,-205.1563 0,-113.3025 91.82251,-205.12497 205.125,-205.12497 z" 5.890 id="path3617" 5.891 - style="fill:url(#linearGradient4099);fill-opacity:1;stroke:none" /> 5.892 + style="fill:url(#linearGradient10299);fill-opacity:1;stroke:none" /> 5.893 <path 5.894 d="m 683.64264,1010.2418 a 12.169555,12.169555 0 1 1 -24.33911,0 12.169555,12.169555 0 1 1 24.33911,0 z" 5.895 transform="matrix(1.3487236,0,0,1.3487236,-273.46404,-240.85463)" 5.896 id="path3912" 5.897 - style="fill:url(#linearGradient4101);fill-opacity:1;stroke:none" /> 5.898 + style="fill:url(#linearGradient10301);fill-opacity:1;stroke:none" /> 5.899 <path 5.900 d="m 681.1859,1021.8304 -17.71958,18.4568 -29.49524,68.879 c -5.26928,-0.5881 -10.5508,2.1242 -12.99952,7.1656 -3.1092,6.4012 -0.44525,14.0971 5.95598,17.2063 6.40126,3.1092 14.09711,0.4456 17.20633,-5.956 2.44689,-5.0377 1.30866,-10.8692 -2.40454,-14.6475 l 35.90422,-65.7661 3.55235,-25.3381 z" 5.901 id="path3959" 5.902 @@ -1502,12 +1784,12 @@ 5.903 d="m 683.64264,1010.2418 a 12.169555,12.169555 0 1 1 -24.33911,0 12.169555,12.169555 0 1 1 24.33911,0 z" 5.904 transform="matrix(0.78254715,0,0,-0.78254715,106.70821,1912.2442)" 5.905 id="path3922" 5.906 - style="fill:url(#linearGradient4103);fill-opacity:1;stroke:none" /> 5.907 + style="fill:url(#linearGradient10303);fill-opacity:1;stroke:none" /> 5.908 <path 5.909 d="m 683.64264,1010.2418 a 12.169555,12.169555 0 1 1 -24.33911,0 12.169555,12.169555 0 1 1 24.33911,0 z" 5.910 transform="matrix(0.51218281,0,0,0.51218281,288.2506,604.25387)" 5.911 id="path3926" 5.912 - style="fill:url(#radialGradient4105);fill-opacity:1;stroke:#000000;stroke-width:2.36634254;stroke-miterlimit:4;stroke-dasharray:none" /> 5.913 + style="fill:url(#radialGradient10305);fill-opacity:1;stroke:#000000;stroke-width:2.36634254;stroke-miterlimit:4;stroke-dasharray:none" /> 5.914 <g 5.915 transform="matrix(-0.03363013,-0.99943435,0.99943435,-0.03363013,439.07107,419.98951)" 5.916 id="g3697"> 5.917 @@ -1540,7 +1822,7 @@ 5.918 <path 5.919 d="m 632.15625,921.23718 c -105.14471,0 -191.35195,80.95762 -199.75,183.93752 59.72496,-8.1431 134.53818,-22.1043 187.15625,-44.7188 54.90698,-23.5981 107.56174,-61.03031 144.03125,-90.12497 -35.18915,-30.58377 -81.15448,-49.09375 -131.4375,-49.09375 z" 5.920 id="path3982" 5.921 - style="fill:url(#linearGradient4107);fill-opacity:1;stroke:none" /> 5.922 + style="fill:url(#linearGradient10307);fill-opacity:1;stroke:none" /> 5.923 <g 5.924 transform="translate(10.123736,640.88189)" 5.925 id="g4015"> 5.926 @@ -1572,7 +1854,7 @@ 5.927 <path 5.928 d="m 1132.1835,902.86724 c -120.8433,0 -218.83105,97.95586 -218.83105,218.79916 0,120.8434 97.98775,218.8311 218.83105,218.8311 120.8433,0 218.7992,-97.9877 218.7992,-218.8311 0,-120.8433 -97.9559,-218.79916 -218.7992,-218.79916 z m 0,14.58236 c 112.7871,0 204.2168,91.4297 204.2168,204.2168 0,112.7871 -91.4297,204.2168 -204.2168,204.2168 -112.7871,0 -204.24869,-91.4297 -204.24869,-204.2168 0,-112.7871 91.46159,-204.2168 204.24869,-204.2168 z" 5.929 id="path4135" 5.930 - style="fill:url(#linearGradient4109);fill-opacity:1;stroke:none" /> 5.931 + style="fill:url(#linearGradient10309);fill-opacity:1;stroke:none" /> 5.932 <path 5.933 d="m 1092.351,959.73004 a 121.48483,121.48483 0 1 1 -242.96967,0 121.48483,121.48483 0 1 1 242.96967,0 z" 5.934 transform="matrix(1.7083333,0,0,1.7083333,-526.3954,-517.85645)" 5.935 @@ -1581,11 +1863,11 @@ 5.936 <path 5.937 d="m 1132.1832,906.91673 c -118.6069,0 -214.78126,96.14307 -214.78126,214.74997 0,118.607 96.17436,214.7813 214.78126,214.7813 118.6069,0 214.75,-96.1743 214.75,-214.7813 0,-118.6069 -96.1431,-214.74997 -214.75,-214.74997 z m 0,14.3125 c 110.6998,0 200.4375,89.73767 200.4375,200.43747 0,110.6998 -89.7377,200.4375 -200.4375,200.4375 -110.6998,0 -200.46876,-89.7377 -200.46876,-200.4375 0,-110.6998 89.76896,-200.43747 200.46876,-200.43747 z" 5.938 id="path4139" 5.939 - style="fill:url(#linearGradient4111);fill-opacity:1;stroke:none" /> 5.940 + style="fill:url(#linearGradient10311);fill-opacity:1;stroke:none" /> 5.941 <path 5.942 d="m 1132.1519,912.22923 c -115.6746,0 -209.43746,93.76287 -209.43746,209.43747 0,115.6747 93.76286,209.4688 209.43746,209.4688 115.6747,0 209.4688,-93.7941 209.4688,-209.4688 0,-115.6746 -93.7941,-209.43747 -209.4688,-209.43747 z m 0,4.3125 c 113.3025,0 205.1563,91.82247 205.1563,205.12497 0,113.3025 -91.8538,205.1563 -205.1563,205.1563 -113.3025,0 -205.12496,-91.8538 -205.12496,-205.1563 0,-113.3025 91.82246,-205.12497 205.12496,-205.12497 z" 5.943 id="path4141" 5.944 - style="fill:url(#linearGradient4113);fill-opacity:1;stroke:none" /> 5.945 + style="fill:url(#linearGradient10313);fill-opacity:1;stroke:none" /> 5.946 <path 5.947 d="m 1189.2879,1026.3353 -19.2953,16.8025 -35.5217,65.9735 c -5.1959,-1.0558 -10.6983,1.1746 -13.587,5.9773 -3.6678,6.0985 -1.7014,14.0012 4.3976,17.669 6.0983,3.6679 14.001,1.7014 17.6689,-4.3973 2.8865,-4.7994 2.2731,-10.7091 -1.0883,-14.8037 l 41.6275,-62.3012 5.7983,-24.9201 z" 5.948 id="path4608" 5.949 @@ -1594,7 +1876,7 @@ 5.950 d="m 683.64264,1010.2418 a 12.169555,12.169555 0 1 1 -24.33911,0 12.169555,12.169555 0 1 1 24.33911,0 z" 5.951 transform="matrix(1.3487236,0,0,1.3487236,226.53596,-240.85463)" 5.952 id="path4145" 5.953 - style="fill:url(#linearGradient4115);fill-opacity:1;stroke:none" /> 5.954 + style="fill:url(#linearGradient10315);fill-opacity:1;stroke:none" /> 5.955 <path 5.956 d="m 1184.5309,1023.6329 -18.4365,17.7407 -32.1992,67.6572 c -5.2419,-0.7963 -10.6267,1.7048 -13.2731,6.6452 -3.3602,6.2732 -1.0035,14.0684 5.2702,17.4286 6.2731,3.3603 14.0683,1.0035 17.4285,-5.27 2.6445,-4.9369 1.7381,-10.8088 -1.8226,-14.7313 l 38.48,-64.2929 4.5527,-25.1775 z" 5.957 id="path4151" 5.958 @@ -2174,12 +2456,12 @@ 5.959 d="m 683.64264,1010.2418 a 12.169555,12.169555 0 1 1 -24.33911,0 12.169555,12.169555 0 1 1 24.33911,0 z" 5.960 transform="matrix(0.78254715,0,0,-0.78254715,606.70821,1912.2442)" 5.961 id="path4319" 5.962 - style="fill:url(#linearGradient4117);fill-opacity:1;stroke:none" /> 5.963 + style="fill:url(#linearGradient10317);fill-opacity:1;stroke:none" /> 5.964 <path 5.965 d="m 683.64264,1010.2418 a 12.169555,12.169555 0 1 1 -24.33911,0 12.169555,12.169555 0 1 1 24.33911,0 z" 5.966 transform="matrix(0.51218281,0,0,0.51218281,788.2506,604.25387)" 5.967 id="path4321" 5.968 - style="fill:url(#radialGradient4119);fill-opacity:1;stroke:#000000;stroke-width:2.36634254;stroke-miterlimit:4;stroke-dasharray:none" /> 5.969 + style="fill:url(#radialGradient10319);fill-opacity:1;stroke:#000000;stroke-width:2.36634254;stroke-miterlimit:4;stroke-dasharray:none" /> 5.970 <path 5.971 d="m 1132.1563,920.58093 c -111.0611,0 -201.0938,90.03267 -201.0938,201.09377 0,1.3381 0.0365,2.6681 0.0625,4 2.13352,-109.2124 91.3083,-197.09377 201.0313,-197.09377 109.7229,0 198.8977,87.88137 201.0312,197.09377 0.026,-1.3319 0.062,-2.6619 0.062,-4 0,-111.0611 -90.0327,-201.09377 -201.0937,-201.09377 z" 5.972 id="path4333" 5.973 @@ -2211,67 +2493,62 @@ 5.974 <path 5.975 d="m 1131.9888,921.40509 c -105.1448,0 -191.35188,80.95771 -199.74988,183.93761 59.7249,-8.1431 134.53798,-22.1043 187.15608,-44.7188 54.907,-23.5981 107.5617,-61.03043 144.0313,-90.12506 -35.1892,-30.58377 -81.1545,-49.09375 -131.4375,-49.09375 z" 5.976 id="path4335" 5.977 - style="fill:url(#linearGradient4121);fill-opacity:1;stroke:none" /> 5.978 + style="fill:url(#linearGradient10321);fill-opacity:1;stroke:none" /> 5.979 </g> 5.980 </g> 5.981 <g 5.982 - id="g5169"> 5.983 + transform="matrix(1,0,0,-0.76853832,-51.425876,974.79896)" 5.984 + id="g5366" 5.985 + style="opacity:0.5"> 5.986 <rect 5.987 width="36.088806" 5.988 - height="214.32498" 5.989 - x="605.72803" 5.990 - y="-646.38898" 5.991 - transform="scale(1,-1)" 5.992 + height="308.39526" 5.993 + x="657.15393" 5.994 + y="430.3757" 5.995 id="rect5368" 5.996 - style="opacity:0.5;fill:#a16c3c;fill-opacity:1;stroke:none" /> 5.997 + style="fill:#a16c3c;fill-opacity:1;stroke:none" /> 5.998 <rect 5.999 width="36.088806" 5.1000 - height="220.02512" 5.1001 - x="20.105106" 5.1002 - y="-648.66901" 5.1003 - transform="scale(1,-1)" 5.1004 + height="316.59726" 5.1005 + x="71.530983" 5.1006 + y="427.09494" 5.1007 id="rect5370" 5.1008 - style="opacity:0.5;fill:#a16c3c;fill-opacity:1;stroke:none" /> 5.1009 + style="fill:#a16c3c;fill-opacity:1;stroke:none" /> 5.1010 <rect 5.1011 width="612.9278" 5.1012 - height="59.138" 5.1013 - x="24.571873" 5.1014 - y="-437.18472" 5.1015 - transform="scale(1,-1)" 5.1016 + height="45.074738" 5.1017 + x="75.997749" 5.1018 + y="731.40265" 5.1019 id="rect5372" 5.1020 - style="opacity:0.5;fill:url(#linearGradient5165);fill-opacity:1;stroke:none" /> 5.1021 + style="fill:url(#linearGradient10839);fill-opacity:1;stroke:none" /> 5.1022 <path 5.1023 - d="m 0,668.58951 0,-290.54248 44.290832,0 0,91.46969 579.970008,0 0,-91.46969 44.29083,0 0,290.54248 z" 5.1024 + d="m 51.425876,398.43101 0,378.04678 44.290832,0 0,-91.59811 579.970012,0 0,91.59811 44.29083,0 0,-378.04678 -668.551674,0 z" 5.1025 id="path5374" 5.1026 - style="opacity:0.5;fill:url(#linearGradient5162);fill-opacity:1;stroke:none" /> 5.1027 + style="fill:url(#linearGradient10841);fill-opacity:1;stroke:none" /> 5.1028 <rect 5.1029 width="579.96918" 5.1030 - height="201.66843" 5.1031 - x="44.290653" 5.1032 - y="-635.47308" 5.1033 - transform="scale(1,-1)" 5.1034 + height="290.18356" 5.1035 + x="95.71653" 5.1036 + y="446.0827" 5.1037 id="rect5376" 5.1038 - style="opacity:0.5;fill:#c8a870;fill-opacity:1;stroke:none" /> 5.1039 + style="fill:#c8a870;fill-opacity:1;stroke:none" /> 5.1040 <rect 5.1041 width="579.96918" 5.1042 - height="201.66843" 5.1043 - x="44.290653" 5.1044 - y="-635.47308" 5.1045 - transform="scale(1,-1)" 5.1046 + height="290.18356" 5.1047 + x="95.71653" 5.1048 + y="446.0827" 5.1049 id="rect5378" 5.1050 - style="opacity:0.5;fill:url(#linearGradient5158);fill-opacity:1;stroke:none" /> 5.1051 + style="fill:url(#linearGradient10843);fill-opacity:1;stroke:none" /> 5.1052 <rect 5.1053 width="579.96918" 5.1054 - height="201.66843" 5.1055 - x="44.290653" 5.1056 - y="-635.47308" 5.1057 - transform="scale(1,-1)" 5.1058 + height="290.18356" 5.1059 + x="95.71653" 5.1060 + y="446.0827" 5.1061 id="rect5380" 5.1062 - style="opacity:0.5;fill:url(#linearGradient5155);fill-opacity:1;stroke:none" /> 5.1063 + style="fill:url(#linearGradient10845);fill-opacity:1;stroke:none" /> 5.1064 <g 5.1065 - transform="matrix(0.36328554,0,0,-0.252472,18.941329,625.51631)" 5.1066 - id="g5382" 5.1067 - style="opacity:0.5"> 5.1068 + transform="matrix(0.36328554,0,0,0.36328554,70.367205,460.40965)" 5.1069 + id="g5382"> 5.1070 <rect 5.1071 width="171.82133" 5.1072 height="40.445869" 5.1073 @@ -2334,21 +2611,20 @@ 5.1074 </g> 5.1075 </g> 5.1076 <path 5.1077 - d="m 668.10408,668.59002 -44.50561,-33.11977 0.66237,0 0,-0.65941 44.30876,32.97047 0.0178,0.80871 -0.4834,0 z" 5.1078 + d="m 719.52996,398.43028 -44.50561,47.6565 0.66237,0 0,0.94884 44.30876,-47.44168 0.0178,-1.16366 -0.4834,0 z" 5.1079 id="path5408" 5.1080 - style="opacity:0.5;fill:#501616;fill-opacity:1;stroke:none" /> 5.1081 + style="fill:#501616;fill-opacity:1;stroke:none" /> 5.1082 <path 5.1083 - d="m 0.483626,668.59002 44.505605,-33.11977 -0.662364,0 0,-0.65941 -44.308764,32.97047 -0.01776,0.80871 0.483397,0 z" 5.1084 + d="m 51.909502,398.43028 44.505605,47.6565 -0.662364,0 0,0.94884 -44.308764,-47.44168 -0.01776,-1.16366 0.483397,0 z" 5.1085 id="path5410" 5.1086 - style="opacity:0.5;fill:#501616;fill-opacity:1;stroke:none" /> 5.1087 + style="fill:#501616;fill-opacity:1;stroke:none" /> 5.1088 <g 5.1089 - transform="matrix(0.57288061,0,0,-0.39813396,-170.18135,981.0081)" 5.1090 - id="g5412" 5.1091 - style="opacity:0.5"> 5.1092 + transform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" 5.1093 + id="g5412"> 5.1094 <path 5.1095 d="m 632.18348,902.86724 c -120.84331,0 -218.83103,97.95586 -218.83103,218.79916 0,120.8434 97.98772,218.8311 218.83103,218.8311 120.84332,0 218.7992,-97.9877 218.7992,-218.8311 0,-120.8433 -97.95588,-218.79916 -218.7992,-218.79916 z m 0,14.58236 c 112.78709,0 204.21684,91.4297 204.21684,204.2168 0,112.7871 -91.42975,204.2168 -204.21684,204.2168 -112.78709,0 -204.24867,-91.4297 -204.24867,-204.2168 0,-112.7871 91.46158,-204.2168 204.24867,-204.2168 z" 5.1096 id="path5414" 5.1097 - style="fill:url(#linearGradient4894);fill-opacity:1;stroke:none" /> 5.1098 + style="fill:url(#linearGradient10847);fill-opacity:1;stroke:none" /> 5.1099 <path 5.1100 d="m 1092.351,959.73004 a 121.48483,121.48483 0 1 1 -242.96967,0 121.48483,121.48483 0 1 1 242.96967,0 z" 5.1101 transform="matrix(1.7083333,0,0,1.7083333,-1026.3954,-517.85645)" 5.1102 @@ -2361,16 +2637,16 @@ 5.1103 <path 5.1104 d="m 632.18319,906.91673 c -118.60693,0 -214.78125,96.14307 -214.78125,214.74997 0,118.607 96.17432,214.7813 214.78125,214.7813 118.60693,0 214.75,-96.1743 214.75,-214.7813 0,-118.6069 -96.14307,-214.74997 -214.75,-214.74997 z m 0,14.3125 c 110.6998,0 200.4375,89.73767 200.4375,200.43747 0,110.6998 -89.7377,200.4375 -200.4375,200.4375 -110.6998,0 -200.46875,-89.7377 -200.46875,-200.4375 0,-110.6998 89.76895,-200.43747 200.46875,-200.43747 z" 5.1105 id="path5420" 5.1106 - style="fill:url(#linearGradient4896);fill-opacity:1;stroke:none" /> 5.1107 + style="fill:url(#linearGradient10849);fill-opacity:1;stroke:none" /> 5.1108 <path 5.1109 d="m 632.15194,912.22923 c -115.67463,0 -209.4375,93.76287 -209.4375,209.43747 0,115.6747 93.76287,209.4688 209.4375,209.4688 115.67463,0 209.46875,-93.7941 209.46875,-209.4688 0,-115.6746 -93.79412,-209.43747 -209.46875,-209.43747 z m 0,4.3125 c 113.30249,0 205.15625,91.82247 205.15625,205.12497 0,113.3025 -91.85376,205.1563 -205.15625,205.1563 -113.30249,0 -205.125,-91.8538 -205.125,-205.1563 0,-113.3025 91.82251,-205.12497 205.125,-205.12497 z" 5.1110 id="path5422" 5.1111 - style="fill:url(#linearGradient4898);fill-opacity:1;stroke:none" /> 5.1112 + style="fill:url(#linearGradient10851);fill-opacity:1;stroke:none" /> 5.1113 <path 5.1114 d="m 683.64264,1010.2418 a 12.169555,12.169555 0 1 1 -24.33911,0 12.169555,12.169555 0 1 1 24.33911,0 z" 5.1115 transform="matrix(1.3487236,0,0,1.3487236,-273.46404,-240.85463)" 5.1116 id="path5424" 5.1117 - style="fill:url(#linearGradient4900);fill-opacity:1;stroke:none" /> 5.1118 + style="fill:url(#linearGradient10853);fill-opacity:1;stroke:none" /> 5.1119 <path 5.1120 d="m 681.1859,1021.8304 -17.71958,18.4568 -29.49524,68.879 c -5.26928,-0.5881 -10.5508,2.1242 -12.99952,7.1656 -3.1092,6.4012 -0.44525,14.0971 5.95598,17.2063 6.40126,3.1092 14.09711,0.4456 17.20633,-5.956 2.44689,-5.0377 1.30866,-10.8692 -2.40454,-14.6475 l 35.90422,-65.7661 3.55235,-25.3381 z" 5.1121 id="path5426" 5.1122 @@ -2919,12 +3195,12 @@ 5.1123 d="m 683.64264,1010.2418 a 12.169555,12.169555 0 1 1 -24.33911,0 12.169555,12.169555 0 1 1 24.33911,0 z" 5.1124 transform="matrix(0.78254715,0,0,-0.78254715,106.70821,1912.2442)" 5.1125 id="path5598" 5.1126 - style="fill:url(#linearGradient4902);fill-opacity:1;stroke:none" /> 5.1127 + style="fill:url(#linearGradient10855);fill-opacity:1;stroke:none" /> 5.1128 <path 5.1129 d="m 683.64264,1010.2418 a 12.169555,12.169555 0 1 1 -24.33911,0 12.169555,12.169555 0 1 1 24.33911,0 z" 5.1130 transform="matrix(0.51218281,0,0,0.51218281,288.2506,604.25387)" 5.1131 id="path5600" 5.1132 - style="fill:url(#radialGradient4904);fill-opacity:1;stroke:#000000;stroke-width:2.36634254;stroke-miterlimit:4;stroke-dasharray:none" /> 5.1133 + style="fill:url(#radialGradient10857);fill-opacity:1;stroke:#000000;stroke-width:2.36634254;stroke-miterlimit:4;stroke-dasharray:none" /> 5.1134 <g 5.1135 transform="matrix(-0.03363013,-0.99943435,0.99943435,-0.03363013,439.07107,419.98951)" 5.1136 id="g5602"> 5.1137 @@ -2957,7 +3233,7 @@ 5.1138 <path 5.1139 d="m 632.15625,921.23718 c -105.14471,0 -191.35195,80.95762 -199.75,183.93752 59.72496,-8.1431 134.53818,-22.1043 187.15625,-44.7188 54.90698,-23.5981 107.56174,-61.03031 144.03125,-90.12497 -35.18915,-30.58377 -81.15448,-49.09375 -131.4375,-49.09375 z" 5.1140 id="path5614" 5.1141 - style="fill:url(#linearGradient4906);fill-opacity:1;stroke:none" /> 5.1142 + style="fill:url(#linearGradient10859);fill-opacity:1;stroke:none" /> 5.1143 <g 5.1144 transform="translate(10.123736,640.88189)" 5.1145 id="g5616"> 5.1146 @@ -2984,13 +3260,12 @@ 5.1147 </g> 5.1148 </g> 5.1149 <g 5.1150 - transform="matrix(0.57288061,0,0,-0.39813396,-170.18135,981.0081)" 5.1151 - id="g5628" 5.1152 - style="opacity:0.5"> 5.1153 + transform="matrix(0.57288061,0,0,0.57288061,-118.75547,-51.112533)" 5.1154 + id="g5628"> 5.1155 <path 5.1156 d="m 1132.1835,902.86724 c -120.8433,0 -218.83105,97.95586 -218.83105,218.79916 0,120.8434 97.98775,218.8311 218.83105,218.8311 120.8433,0 218.7992,-97.9877 218.7992,-218.8311 0,-120.8433 -97.9559,-218.79916 -218.7992,-218.79916 z m 0,14.58236 c 112.7871,0 204.2168,91.4297 204.2168,204.2168 0,112.7871 -91.4297,204.2168 -204.2168,204.2168 -112.7871,0 -204.24869,-91.4297 -204.24869,-204.2168 0,-112.7871 91.46159,-204.2168 204.24869,-204.2168 z" 5.1157 id="path5630" 5.1158 - style="fill:url(#linearGradient4908);fill-opacity:1;stroke:none" /> 5.1159 + style="fill:url(#linearGradient10861);fill-opacity:1;stroke:none" /> 5.1160 <path 5.1161 d="m 1092.351,959.73004 a 121.48483,121.48483 0 1 1 -242.96967,0 121.48483,121.48483 0 1 1 242.96967,0 z" 5.1162 transform="matrix(1.7083333,0,0,1.7083333,-526.3954,-517.85645)" 5.1163 @@ -2999,11 +3274,11 @@ 5.1164 <path 5.1165 d="m 1132.1832,906.91673 c -118.6069,0 -214.78126,96.14307 -214.78126,214.74997 0,118.607 96.17436,214.7813 214.78126,214.7813 118.6069,0 214.75,-96.1743 214.75,-214.7813 0,-118.6069 -96.1431,-214.74997 -214.75,-214.74997 z m 0,14.3125 c 110.6998,0 200.4375,89.73767 200.4375,200.43747 0,110.6998 -89.7377,200.4375 -200.4375,200.4375 -110.6998,0 -200.46876,-89.7377 -200.46876,-200.4375 0,-110.6998 89.76896,-200.43747 200.46876,-200.43747 z" 5.1166 id="path5634" 5.1167 - style="fill:url(#linearGradient4910);fill-opacity:1;stroke:none" /> 5.1168 + style="fill:url(#linearGradient10863);fill-opacity:1;stroke:none" /> 5.1169 <path 5.1170 d="m 1132.1519,912.22923 c -115.6746,0 -209.43746,93.76287 -209.43746,209.43747 0,115.6747 93.76286,209.4688 209.43746,209.4688 115.6747,0 209.4688,-93.7941 209.4688,-209.4688 0,-115.6746 -93.7941,-209.43747 -209.4688,-209.43747 z m 0,4.3125 c 113.3025,0 205.1563,91.82247 205.1563,205.12497 0,113.3025 -91.8538,205.1563 -205.1563,205.1563 -113.3025,0 -205.12496,-91.8538 -205.12496,-205.1563 0,-113.3025 91.82246,-205.12497 205.12496,-205.12497 z" 5.1171 id="path5636" 5.1172 - style="fill:url(#linearGradient4912);fill-opacity:1;stroke:none" /> 5.1173 + style="fill:url(#linearGradient10865);fill-opacity:1;stroke:none" /> 5.1174 <path 5.1175 d="m 1189.2879,1026.3353 -19.2953,16.8025 -35.5217,65.9735 c -5.1959,-1.0558 -10.6983,1.1746 -13.587,5.9773 -3.6678,6.0985 -1.7014,14.0012 4.3976,17.669 6.0983,3.6679 14.001,1.7014 17.6689,-4.3973 2.8865,-4.7994 2.2731,-10.7091 -1.0883,-14.8037 l 41.6275,-62.3012 5.7983,-24.9201 z" 5.1176 id="path5638" 5.1177 @@ -3012,7 +3287,7 @@ 5.1178 d="m 683.64264,1010.2418 a 12.169555,12.169555 0 1 1 -24.33911,0 12.169555,12.169555 0 1 1 24.33911,0 z" 5.1179 transform="matrix(1.3487236,0,0,1.3487236,226.53596,-240.85463)" 5.1180 id="path5640" 5.1181 - style="fill:url(#linearGradient4914);fill-opacity:1;stroke:none" /> 5.1182 + style="fill:url(#linearGradient10867);fill-opacity:1;stroke:none" /> 5.1183 <path 5.1184 d="m 1184.5309,1023.6329 -18.4365,17.7407 -32.1992,67.6572 c -5.2419,-0.7963 -10.6267,1.7048 -13.2731,6.6452 -3.3602,6.2732 -1.0035,14.0684 5.2702,17.4286 6.2731,3.3603 14.0683,1.0035 17.4285,-5.27 2.6445,-4.9369 1.7381,-10.8088 -1.8226,-14.7313 l 38.48,-64.2929 4.5527,-25.1775 z" 5.1185 id="path5642" 5.1186 @@ -3592,12 +3867,12 @@ 5.1187 d="m 683.64264,1010.2418 a 12.169555,12.169555 0 1 1 -24.33911,0 12.169555,12.169555 0 1 1 24.33911,0 z" 5.1188 transform="matrix(0.78254715,0,0,-0.78254715,606.70821,1912.2442)" 5.1189 id="path5826" 5.1190 - style="fill:url(#linearGradient4916);fill-opacity:1;stroke:none" /> 5.1191 + style="fill:url(#linearGradient10869);fill-opacity:1;stroke:none" /> 5.1192 <path 5.1193 d="m 683.64264,1010.2418 a 12.169555,12.169555 0 1 1 -24.33911,0 12.169555,12.169555 0 1 1 24.33911,0 z" 5.1194 transform="matrix(0.51218281,0,0,0.51218281,788.2506,604.25387)" 5.1195 id="path5828" 5.1196 - style="fill:url(#radialGradient4918);fill-opacity:1;stroke:#000000;stroke-width:2.36634254;stroke-miterlimit:4;stroke-dasharray:none" /> 5.1197 + style="fill:url(#radialGradient10871);fill-opacity:1;stroke:#000000;stroke-width:2.36634254;stroke-miterlimit:4;stroke-dasharray:none" /> 5.1198 <path 5.1199 d="m 1132.1563,920.58093 c -111.0611,0 -201.0938,90.03267 -201.0938,201.09377 0,1.3381 0.0365,2.6681 0.0625,4 2.13352,-109.2124 91.3083,-197.09377 201.0313,-197.09377 109.7229,0 198.8977,87.88137 201.0312,197.09377 0.026,-1.3319 0.062,-2.6619 0.062,-4 0,-111.0611 -90.0327,-201.09377 -201.0937,-201.09377 z" 5.1200 id="path5830" 5.1201 @@ -3629,7 +3904,7 @@ 5.1202 <path 5.1203 d="m 1131.9888,921.40509 c -105.1448,0 -191.35188,80.95771 -199.74988,183.93761 59.7249,-8.1431 134.53798,-22.1043 187.15608,-44.7188 54.907,-23.5981 107.5617,-61.03043 144.0313,-90.12506 -35.1892,-30.58377 -81.1545,-49.09375 -131.4375,-49.09375 z" 5.1204 id="path5844" 5.1205 - style="fill:url(#linearGradient4920);fill-opacity:1;stroke:none" /> 5.1206 + style="fill:url(#linearGradient10873);fill-opacity:1;stroke:none" /> 5.1207 </g> 5.1208 </g> 5.1209 </g>
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/pkgs/appup/schachuhr.spec Wed Jul 27 23:10:09 2011 +0200 6.3 @@ -0,0 +1,88 @@ 6.4 +## 6.5 +## schachuhr.spec -- RPM Package Specification 6.6 +## Copyright (c) 2011 Michael Schloh von Bennewitz <michael@schloh.com> 6.7 +## 6.8 +## Permission to use, copy, modify, and distribute this software for 6.9 +## any purpose with or without fee is hereby granted, provided that 6.10 +## the above copyright notice and this permission notice appear in all 6.11 +## copies. 6.12 +## 6.13 +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 6.14 +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 6.15 +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 6.16 +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR 6.17 +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 6.18 +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 6.19 +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 6.20 +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 6.21 +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 6.22 +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 6.23 +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 6.24 +## SUCH DAMAGE. 6.25 +## 6.26 + 6.27 +# package information 6.28 +Name: schachuhr 6.29 +Summary: Chess Clock 6.30 +URL: http://schachuhr.europalab.com/ 6.31 +Vendor: Europalab Software 6.32 +Packager: Michael Schloh von Bennewitz 6.33 +Distribution: Michael Schloh von Bennewitz 6.34 +Group: Amusements/Games 6.35 +License: GPL 6.36 +Version: 0.6.2 6.37 +Release: 20110726 6.38 + 6.39 +# list of sources 6.40 +Source0: ftp://ftp.europalab.com/pub/sfw/schachuhr/schachuhr-%{version}.tar.gz 6.41 + 6.42 +# build information 6.43 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root 6.44 +BuildRequires: pkgconfig(QtDeclarative), groff, util-linux-ng 6.45 +Requires: libqtdeclarative4 6.46 +AutoReq: no 6.47 +AutoReqProv: no 6.48 + 6.49 +%description 6.50 + SchachUhr is an electronic representation of a traditional game clock 6.51 + such as those wooden or plastic clocks used in judging a chess match. 6.52 + 6.53 +%prep 6.54 +%setup -q 6.55 + 6.56 +%build 6.57 +qmake 6.58 +make %{?jobs:-j%jobs} 6.59 +groff -t -e -mandoc -Tascii docs/schachuhr.6.tr | col -bx | gzip -9 >docs/schachuhr.6.gz 6.60 + 6.61 +%install 6.62 +rm -rf %{buildroot} 6.63 +mkdir -p %{buildroot}/opt/share/doc/schachuhr 6.64 +mkdir -p %{buildroot}/opt/share/man/man6 6.65 +%make_install INSTALL_ROOT=%{buildroot} 6.66 +cp docs/license.txt %{buildroot}/opt/share/doc/schachuhr/ 6.67 +cp docs/readme.txt %{buildroot}/opt/share/doc/schachuhr/ 6.68 +cp docs/schachuhr.6.gz %{buildroot}/opt/share/man/man6/ 6.69 + 6.70 +%files 6.71 +%defattr(-,root,root,-) 6.72 +%{_bindir}/* 6.73 +%doc %{_datadir}/doc/schachuhr 6.74 +%doc %{_datadir}/man/man6/schachuhr.6.gz 6.75 +%{_datadir}/applications/schachuhr.desktop 6.76 +%{_datadir}/icons/hicolor/scalable/apps/schachuhr.svg 6.77 +%{_datadir}/schachuhr/qml/* 6.78 + 6.79 +%post 6.80 +echo "+------------------------Warning------------------------+" 6.81 +echo "| To pass AppUp validation this binary package must be |" 6.82 +echo "| correctly named: com.<company>.<appname>.rpm |" 6.83 +echo "+-------------------------------------------------------+" 6.84 + 6.85 +%changelog 6.86 +* Tue Jul 26 2011 Michael Schloh von Bennewitz <michael@schloh.com> - 0.6.2 6.87 +- Update version with vendor upstream current release. 6.88 +* Sat Jul 09 2011 Michael Schloh von Bennewitz <michael@schloh.com> - 0.6.1 6.89 +- Correct runtime binary dependencies to not use the pkgconfig framework. 6.90 +* Fri Jul 08 2011 Michael Schloh von Bennewitz <michael@schloh.com> - 0.6.0 6.91 +- Implement initial package specification for initial software release.
7.1 --- a/pkgs/packaging.txt Wed Jul 27 23:08:32 2011 +0200 7.2 +++ b/pkgs/packaging.txt Wed Jul 27 23:10:09 2011 +0200 7.3 @@ -16,3 +16,6 @@ 7.4 platforms like Ubuntu (derives Debian) are not included, as the 7.5 assumption is made that the specifications can be easily adjusted 7.6 to accomodate the required derivations. 7.7 + 7.8 + An exception is made for the Intel AppUp packaging standard, for 7.9 + which a separate package specification is provided in appup/.
8.1 --- a/pkgs/rpm/schachuhr.spec Wed Jul 27 23:08:32 2011 +0200 8.2 +++ b/pkgs/rpm/schachuhr.spec Wed Jul 27 23:10:09 2011 +0200 8.3 @@ -30,8 +30,8 @@ 8.4 Distribution: Michael Schloh von Bennewitz 8.5 Group: Amusements/Games 8.6 License: GPL 8.7 -Version: 0.6.1 8.8 -Release: 20110708 8.9 +Version: 0.6.2 8.10 +Release: 20110726 8.11 8.12 # list of sources 8.13 Source0: ftp://ftp.europalab.com/pub/sfw/schachuhr/schachuhr-%{version}.tar.gz 8.14 @@ -74,5 +74,9 @@ 8.15 %{_datadir}/schachuhr/qml/* 8.16 8.17 %changelog 8.18 +* Tue Jul 26 2011 Michael Schloh von Bennewitz <michael@schloh.com> - 0.6.2 8.19 +- Update version with vendor upstream current release. 8.20 +* Sat Jul 09 2011 Michael Schloh von Bennewitz <michael@schloh.com> - 0.6.1 8.21 +- Correct runtime binary dependencies to not use the pkgconfig framework. 8.22 * Fri Jul 08 2011 Michael Schloh von Bennewitz <michael@schloh.com> - 0.6.0 8.23 - Implement initial package specification for initial software release.
9.1 --- a/pkgs/schachuhr.desktop Wed Jul 27 23:08:32 2011 +0200 9.2 +++ b/pkgs/schachuhr.desktop Wed Jul 27 23:10:09 2011 +0200 9.3 @@ -4,8 +4,10 @@ 9.4 Type=Application 9.5 Terminal=false 9.6 Name=Schachuhr 9.7 -Exec=/usr/bin/schachuhr 9.8 -Icon=/usr/share/icons/hicolor/scalable/apps/schachuhr.svg 9.9 +Exec=schachuhr 9.10 +Comment=Game clock, as commonly used in chess matches. 9.11 +Icon=schachuhr 9.12 +Categories=Game;Clock 9.13 X-Window-Icon=schachuhr 9.14 X-HildonDesk-ShowInToolbar=true 9.15 X-Osso-Type=application/x-executable
10.1 --- a/version.cpp Wed Jul 27 23:08:32 2011 +0200 10.2 +++ b/version.cpp Wed Jul 27 23:10:09 2011 +0200 10.3 @@ -8,7 +8,7 @@ 10.4 #ifndef _VERSION_CPP_ 10.5 #define _VERSION_CPP_ 10.6 10.7 -#define SCHUHR_VERSION 0x006201 10.8 +#define SCHUHR_VERSION 0x006202 10.9 10.10 typedef struct { 10.11 const int v_hex; 10.12 @@ -32,14 +32,14 @@ 10.13 #undef _VERSION_CPP_AS_HEADER_ 10.14 10.15 schuhr_version_t schuhr_version = { 10.16 - 0x006201, 10.17 - "0.6.1", 10.18 - "0.6.1 (08-Jul-2011)", 10.19 - "This is Europalab schachuhr, Version 0.6.1 (08-Jul-2011)", 10.20 - "Europalab schachuhr 0.6.1 (08-Jul-2011)", 10.21 - "Europalab schachuhr/0.6.1", 10.22 - "@(#)Europalab schachuhr 0.6.1 (08-Jul-2011)", 10.23 - "$Id: Europalab schachuhr 0.6.1 (08-Jul-2011) $" 10.24 + 0x006202, 10.25 + "0.6.2", 10.26 + "0.6.2 (26-Jul-2011)", 10.27 + "This is Europalab schachuhr, Version 0.6.2 (26-Jul-2011)", 10.28 + "Europalab schachuhr 0.6.2 (26-Jul-2011)", 10.29 + "Europalab schachuhr/0.6.2", 10.30 + "@(#)Europalab schachuhr 0.6.2 (26-Jul-2011)", 10.31 + "$Id: Europalab schachuhr 0.6.2 (26-Jul-2011) $" 10.32 }; 10.33 10.34 #endif /* _VERSION_CPP_AS_HEADER_ */
