The branch, build-main has been updated via 2647cbe5a04b3589e875404cb2de198dab7a55dc (commit) via 40e652da24c28db62036d1c6512574e84c2b187d (commit) via 7f58ba0fafe7e2ad58d5c06a0b44d3d8dac541a9 (commit) from a80a66a717fa53396e285eec23825bf38095d8a0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 8 ++ svg/x2gologo.svg | 342 +++++++++++++++++++++++++++++++++++++++++++++++++++++- version.h | 2 +- x2goplugin.rc | 10 +- 5 files changed, 356 insertions(+), 8 deletions(-) mode change 120000 => 100644 svg/x2gologo.svg The diff of changes is: diff --git a/VERSION b/VERSION index fd5e525..bbf753a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.0.0 +4.0.0.1 diff --git a/debian/changelog b/debian/changelog index 639874c..2ee9910 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2goclient (4.0.0.1-0~x2go1) unstable; urgency=low + + * Bugfix release (4.0.0.1): + - Replace symlink at svg/x2gologo.svg with copied file. Fixes + tarball release esp. for MS Windows builds. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 02 Jan 2013 12:19:01 +0100 + x2goclient (4.0.0.0-0~x2go1) unstable; urgency=low [ Christoffer Krakou ] diff --git a/svg/x2gologo.svg b/svg/x2gologo.svg deleted file mode 120000 index 5cf2c8f..0000000 --- a/svg/x2gologo.svg +++ /dev/null @@ -1 +0,0 @@ -../x2go-logos/x2go-logo.svg \ No newline at end of file diff --git a/svg/x2gologo.svg b/svg/x2gologo.svg new file mode 100644 index 0000000..c88606a --- /dev/null +++ b/svg/x2gologo.svg @@ -0,0 +1,341 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.48.3.1 r9886" + width="128" + height="128" + sodipodi:docname="x2go-logo.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.0" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <metadata + id="metadata87"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title>x2go Logo</dc:title> + <dc:date>12.06.2007</dc:date> + <dc:creator> + <cc:Agent> + <dc:title>Heinz-M. Graesing</dc:title> + </cc:Agent> + </dc:creator> + <dc:rights> + <cc:Agent> + <dc:title>obviously-nice</dc:title> + </cc:Agent> + </dc:rights> + <dc:publisher> + <cc:Agent> + <dc:title>obviously-nice</dc:title> + </cc:Agent> + </dc:publisher> + <dc:source>http://www.x2go.org/artwork</dc:source> + <dc:language>DE</dc:language> + <dc:subject> + <rdf:Bag> + <rdf:li>Logo</rdf:li> + </rdf:Bag> + </dc:subject> + <cc:license + rdf:resource="http://www.gnu.org/licenses/gpl-2.0.txt" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs85"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 64 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="128 : 64 : 1" + inkscape:persp3d-origin="64 : 42.666667 : 1" + id="perspective46" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient4472" + id="radialGradient4478" + cx="44.602337" + cy="44.941875" + fx="44.602337" + fy="44.941875" + r="35.79092" + gradientTransform="matrix(1,0,0,1.15885,67.847226,-18.98329)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient4472"> + <stop + style="stop-color: rgb(23, 118, 255); stop-opacity: 1;" + offset="0" + id="stop4474" /> + <stop + id="stop4564" + offset="1" + style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" /> + </linearGradient> + <radialGradient + r="35.79092" + fy="44.941875" + fx="44.602337" + cy="44.941875" + cx="44.602337" + gradientTransform="matrix(1.5430561,0,0,1.7881705,-4.7786,-14.363356)" + gradientUnits="userSpaceOnUse" + id="radialGradient3195" + xlink:href="#linearGradient4472" + inkscape:collect="always" /> + </defs> + <sodipodi:namedview + inkscape:window-height="1056" + inkscape:window-width="1855" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + showgrid="true" + inkscape:object-nodes="true" + inkscape:grid-points="true" + inkscape:guide-points="true" + width="128px" + height="128px" + inkscape:zoom="3.82" + inkscape:cx="64" + inkscape:cy="64" + inkscape:window-x="65" + inkscape:window-y="24" + inkscape:current-layer="svg2" + inkscape:window-maximized="1"> + <inkscape:grid + id="GridFromPre046Settings" + type="xygrid" + originx="0px" + originy="0px" + spacingx="1px" + spacingy="1px" + color="#0000ff" + empcolor="#0000ff" + opacity="0.2" + empopacity="0.4" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + dotted="true" /> + </sodipodi:namedview> + <path + style="fill:#ffffff;fill-opacity:1;stroke:none" + d="m 9.9375,2.03125 c -4.3962933,0 -8,3.5724569 -8,7.96875 l 0,108.0625 c 0,4.39629 3.6037067,8 8,8 l 108.0625,0 c 4.3963,0 7.96875,-3.60371 7.96875,-8 l 0,-108.0625 c 0,-4.3962931 -3.57245,-7.96875 -7.96875,-7.96875 z" + id="rect3043" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <path + sodipodi:nodetypes="cssccssccccssccssc" + inkscape:connector-curvature="0" + id="path3045" + d="M 9.0087977,0 C 4.0359413,0 0,4.0359413 0,9.0087977 L 0,118.9912 C 0,123.96406 4.0359413,128 9.0087977,128 L 118.9912,128 C 123.96406,128 128,123.96406 128,118.9912 L 128,9.0087977 C 128,4.0359413 123.96406,0 118.9912,0 82.330401,0 45.669599,0 9.0087977,0 z m 0.9384164,2.0332356 c 36.0143369,0 72.0286739,0 108.0430059,0 4.3963,0 7.97654,3.5802463 7.97654,7.9765394 l 0,108.043015 c 0,4.39629 -3.58024,8.00782 -7.97654,8.00782 l -108.0430059,0 c -4.3962933,0 -8.0078202,-3.61153 -8.0078202,-8.00782 l 0,-108.043015 c 0,-4.3962931 3.6115269,-7.9765394 8.0078202,-7.9765394 z" + style="fill:#4d4d4d" /> + <g + style="fill:#4d4d4d" + id="g4" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 90,977.626 13.32,-25.776 c 0.936,-2.52 1.368,-4.32 1.368,-5.256 0,-1.512 -0.504,-2.664 -1.44,-3.312 -1.008,-0.72 -2.736,-1.08 -5.184,-1.08 l 0,-2.376 22.104,0 0,2.376 c -3.024,0 -5.184,0.648 -6.696,1.944 -1.512,1.296 -3.6,4.752 -6.48,10.368 l -14.616,28.44 18.432,41.544 c 1.872,3.888 3.528,6.624 4.968,8.136 1.44,1.44 3.168,2.232 5.112,2.232 l 0,2.304 -26.352,0 0,-2.304 c 2.376,0 4.032,-0.288 5.04,-0.936 1.008,-0.576 1.512,-1.584 1.512,-2.88 0,-1.224 -0.72,-3.384 -2.016,-6.552 l -12.96,-29.016 -14.832,29.016 c -1.368,2.448 -2.088,4.464 -2.088,5.976 0,2.952 2.16,4.392 6.48,4.392 l 0,2.304 -19.944,0 0,-2.304 c 1.944,0 3.672,-0.648 5.112,-1.872 1.44,-1.224 2.952,-3.312 4.392,-6.408 L 83.736,990.01 67.248,952.498 c -1.728,-4.032 -3.312,-6.696 -4.824,-8.136 -1.584,-1.44 -3.816,-2.16 -6.696,-2.16 l 0,-2.376 28.296,0 0,2.376 c -4.392,0 -6.624,1.512 -6.624,4.536 0,1.512 0.432,3.24 1.296,5.112 L 90,977.626 z" + id="path6" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g8" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,940.474 43.992,-1.224 0,2.448 -43.992,-1.224 z" + id="path10" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g12" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,946.45 43.992,-1.152 0,1.656 5.184,0.072 0.36,0 0.288,0 0.288,0.072 0.288,0 0.288,0.072 0.216,0.072 0.216,0.072 0.216,0.072 0.144,0.072 0.144,0.072 0.144,0.072 0.144,0.072 0.072,0.072 0.144,0.072 0,0.072 0.072,0 -52.2,-1.44 z" + id="path14" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g16" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,952.498 54.288,-1.512 0.216,0.36 0.288,0.576 0.288,0.576 0.288,0.648 0.288,0.648 0.144,0.216 -55.8,-1.512 z" + id="path18" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g20" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,958.474 56.952,-1.584 1.44,3.168 -58.392,-1.584 z" + id="path22" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g24" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,964.45 59.544,-1.584 1.44,3.24 -60.984,-1.656 z" + id="path26" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g28" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,970.498 62.136,-1.728 1.512,3.456 -63.648,-1.728 z" + id="path30" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g32" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,976.474 64.728,-1.8 1.584,3.6 -66.312,-1.8 z" + id="path34" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g36" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,982.45 67.32,-1.8 1.656,3.672 -68.976,-1.872 z" + id="path38" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g40" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,988.426 69.912,-1.872 1.512,3.312 -0.216,0.504 -71.208,-1.944 z" + id="path42" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g44" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,994.402 70.128,-1.944 -1.944,3.816 -68.184,-1.872 z" + id="path46" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g48" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,1000.378 67.032,-1.8 -1.8,3.6 -65.232,-1.8 z" + id="path50" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g52" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,1006.354 63.936,-1.728 -1.728,3.456 -62.208,-1.728 z" + id="path54" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g56" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,1012.402 60.912,-1.656 -1.728,3.24 -59.184,-1.584 z" + id="path58" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g60" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,1036.378 43.992,-1.224 0,2.448 -43.992,-1.224 z" + id="path62" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g64" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,1030.402 51.12,-1.44 -0.072,0.144 -0.144,0.072 -0.144,0.144 -0.144,0.072 -0.072,0.144 -0.144,0.072 -0.072,0.072 -0.144,0 -0.144,0.072 -0.072,0.072 -0.144,0.072 -0.072,0 -0.144,0.072 -0.144,0 -0.072,0 -0.144,0.072 -0.144,0 -0.144,0 -4.968,0.072 0,1.44 -43.992,-1.152 z" + id="path66" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g68" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,1024.354 54.792,-1.44 -0.792,1.584 -0.288,0.504 -0.216,0.504 -0.216,0.36 -53.28,-1.512 z" + id="path70" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <g + style="fill:#4d4d4d" + id="g72" + transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> + <path + d="m 6.984,1018.378 57.816,-1.584 -1.512,3.096 -56.304,-1.512 z" + id="path74" + style="fill:#4d4d4d" + inkscape:connector-curvature="0" /> + </g> + <path + style="fill:#4d4d4d" + d="M 9.0087977,0 C 4.0359413,0 0,4.0359413 0,9.0087977 L 0,118.9912 C 0,123.96406 4.0359413,128 9.0087977,128 L 118.9912,128 C 123.96406,128 128,123.96406 128,118.9912 L 128,9.0087977 C 128,4.0359413 123.96406,0 118.9912,0 82.330401,0 45.669599,0 9.0087977,0 z m 0.9384164,2.0332356 c 36.0143369,0 72.0286739,0 108.0430059,0 4.3963,0 7.97654,3.5802463 7.97654,7.9765394 l 0,108.043015 c 0,4.39629 -3.58024,8.00782 -7.97654,8.00782 l -108.0430059,0 c -4.3962933,0 -8.0078202,-3.61153 -8.0078202,-8.00782 l 0,-108.043015 c 0,-4.3962931 3.6115269,-7.9765394 8.0078202,-7.9765394 z" + id="path78" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssccssccccssccssc" /> +</svg> diff --git a/version.h b/version.h index e6b40e3..a8921eb 100644 --- a/version.h +++ b/version.h @@ -15,5 +15,5 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#define VERSION "4.0.0.0" +#define VERSION "4.0.0.1" diff --git a/x2goplugin.rc b/x2goplugin.rc index 3e40602..4939012 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 4,0,0,0 - PRODUCTVERSION 4,0,0,0 + FILEVERSION 4,0,0,1 + PRODUCTVERSION 4,0,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "4, 0, 0 ,0\0" + VALUE "FileVersion", "4, 0, 0 ,1\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2012 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 4.0.0.0\0" - VALUE "ProductVersion", "4, 0, 0, 0\0" + VALUE "ProductName", "X2GoClient Plug-in 4.0.0.1\0" + VALUE "ProductVersion", "4, 0, 0, 1\0" END END BLOCK "VarFileInfo" hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).
-
git-admin＠x2go.org