[X2go-Commits] x2gothinclient.git - build-main (branch) updated: 1.0.1.7

X2Go dev team git-admin at x2go.org
Wed Jun 13 22:27:09 CEST 2012


The branch, build-main has been updated
       via  9b226f75d415bbd2f1f2b41b53768a255055314e (commit)
       via  bad1fed5bc274116cffcdcfbdc5e2f7b1ed57800 (commit)
       via  ad763461cc0ca7b3b352e82dbf777f7d64e0e97e (commit)
       via  77fd6169b43a5c12f94c99033416d7285fcbd162 (commit)
       via  2ab0aba225b7687322ed54f217c868fd0b8618ad (commit)
       via  6fc7bd3886f07d5ff98db48f723579b610cd81db (commit)
       via  31124b868c8d293a65000ba66f475dedff9d7473 (commit)
      from  8d5416361412b413f4b1fd0e3b49dba92ad6fe27 (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:
 README.howto                                       |  120 +----------
 VERSION                                            |    2 +-
 debian/changelog                                   |   11 +
 debian/copyright                                   |    6 +-
 .../man/x2gothinclient_preptftpboot.8              |   23 +-
 .../share/x2goclient-background.svg                |  228 ++++++++++++--------
 6 files changed, 173 insertions(+), 217 deletions(-)

The diff of changes is:
diff --git a/README.howto b/README.howto
index 66c1de7..ed9eac0 100644
--- a/README.howto
+++ b/README.howto
@@ -1,120 +1,8 @@
 X2go Thin Client Environment
 ============================
 
-This howto is intended for Debian squeeze (and newer Debian versions)
+A detailled installation description is available in the X2Go Wiki:
+http://wiki.x2go.org/doku.php/wiki:components:tce
 
-Server Installation
--------------------
-(use a separate server or VM for providing thin
-client chroots, do not use your production Samba, LDAP, Apache2 etc. server
-for this!!!)
-
- $ apt-get install dhcp atftpd nfs-kernel-server debootstrap
-
-
-Installation Thin Client Environment (TCE)
-
-Choose folder for your TCE chroot (e.g. /opt/x2gothinclient)
-
-Install TCE:
-
- <TODO: REVIEW/FIXME (use aptitude instead of apt-get)>
- $ debootstrap --arch i386 lenny /opt/x2gothinclient http://ftp.de.debian.org/debian/ 
- $ cp /etc/resolv.conf /opt/x2gothinclient/etc/
- $ echo "auto lo
- $ iface lo inet loopback" >> /opt/x2gothinclient/etc/network/interfaces
- $ echo x2gothinclient > /opt/x2gothinclient/etc/hostname
- $ echo "127.0.0.1 localhost" >> /opt/x2gothinclient/etc/hosts
-
-Repeat these steps for any of your X2Go servers:
-
- <TODO: REVIEW/FIXME (use aptitude instead of apt-get)>
- $ echo "192.168.0.1 x2goserver" >> /opt/x2gothinclient/etc/hosts
- $ chroot /opt/x2gothinclient/
- $ echo "deb http://x2go.obviously-nice.de/deb/ lenny main" >> /etc/apt/sources.list
- $ apt-get update
- $ apt-get install locales
- $ dpkg-reconfigure locales
-
-Edit /etc/initramfs-tools/initramfs.conf to boot from NFS:
-
- <TODO: REVIEW/FIXME (use aptitude instead of apt-get)>
- $ apt-get install kernel-image-2.6-686 syslinux 
- $ apt-get install x2gothinclientsystem
- $ cd /usr/share/x2gothinclientsystem/script/
- $ ./x2gothinclient_install.sh
-
-After a successful TCE configuration you now can leave the chroot environment:
-
- $ exit
-
-Server Configuration:
----------------------
-
-atftpd: (e.g. /etc/default/atftpd)
-
-------------------------
-USE_INETD=false
-OPTIONS="--daemon --port 69 --tftpd-timeout 300 --retry-timeout 5     --mcast-port 1758 --mcast-addr 239.239.239.0-255 --mcast-ttl 1 --maxthread 100 --verbose=5  /tftpboot"
-------------------------
-USE_INETD=false
-
-If inetd is not used for aftpd then you can start/stop aftpd with "/etc/init.d/atftpd start|stop".
-
-NOTE! If you intend running aftpd in standalone mode make sure that no other tftpd server is active in inetd/xinetd
-configuration.
-
-The last argv in OPTIONS (s. above) declares the folder for tftp boot. The default is "/tftpboot".
-
- $ mkdir /tftpboot
-
-PXE boot configuration:
-
- $ cp /opt/x2gothinclient/boot/vmlinuz-* /tftpboot/
- $ cp /opt/x2gothinclient/boot/initrd.img-* /tftpboot/
- $ ln -s /tftpboot/vmlinuz-* /tftpboot/vmlinuz
- $ ln -s /tftpboot/initrd.img-* /tftpboot/initrd.img
- $ cp /opt/x2gothinclient/usr/lib/syslinux/pxelinux.0 /tftpboot/
-
-Example: /tftpboot/pxelinux.cfg/default
-
----------------------
-label linux
-kernel vmlinuz
-append root=/dev/nfs nfsroot=192.168.0.1:/opt/x2gothinclient ro initrd=initrd.img ip=dhcp
---------------------
-
-The given ip address 192.168.0.1 refers to the address of the host that your TCE chroot is installed on.
-
-DHCP: 
-
-<TODO/FIXME (update for DHCP3 server + translate into English)>
-Bestimmen Sie in Datei "/etc/default/dhcp" auf welche Interfaces soll dhcpd laufen.
-Beispiel /etc/dhcpd.conf:
---------------------
-group
-{
-    subnet 192.168.0.0 netmask 255.255.255.0 {
-	default-lease-time 720000;
-	max-lease-time 1440000;
-	authoritative;
-	range 192.168.0.10 192.168.0.100;
-	filename "/pxelinux.0";
-	next-server 192.168.0.1;
-    }
-}
---------------------
-
-NFS (/etc/exports):
---------------------
-/opt/x2gothinclient 192.168.0.0/24(ro,async,no_root_squash)
---------------------
-
-X2go Server in LDAP
--------------------
-
-Do not forget to store you X2Go servers in LDAP. Use
-
- $ ldap.addserver <name> <ip>
- 
-to add an X2Go server to the LDAP tree.
+light+love,
+Mike Gabriel
\ No newline at end of file
diff --git a/VERSION b/VERSION
index cd263f0..ff27689 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.1.6
+1.0.1.7
diff --git a/debian/changelog b/debian/changelog
index 592a2b0..1555460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+x2gothinclient (1.0.1.7-0~x2go1) unstable; urgency=low
+
+  * New upstream version (1.0.1.7):
+    - Fix typo in copyright file.
+    - Drop outdated README.howto and point to Wiki page with
+      TCE documentation.
+    - Replace red background with default blue background because
+      of rendering problems and recognizablitity 
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 13 Jun 2012 22:24:15 +0200
+
 x2gothinclient (1.0.1.6-0~x2go2) unstable; urgency=low
 
   * Fix dependency on x2goclient.
diff --git a/debian/copyright b/debian/copyright
index 1c53057..e0c31aa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ on Thu,  10 Dec 2007 18:20:03 +0100.
 
 In 2011 this package has been updated and heavily reworked by
 Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
-Mike Gariel <mike.gabriel at das-netzwerkteam.de>
+Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 
 Upstream Authors: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
@@ -35,13 +35,13 @@ Copyright (C) 2010-2012
 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
 Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
-Mike Gariel <mike.gabriel at das-netzwerkteam.de>
+Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 
 The Debian packaging is (C) 2007-2012,
 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de> 
 Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
-Mike Gariel <mike.gabriel at das-netzwerkteam.de>
+Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 and is licensed under the GPL, see above.
 
diff --git a/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8
index 67ea38d..255803e 100644
--- a/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8
+++ b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8
@@ -30,28 +30,29 @@ obtained from \fI/etc/x2go/x2gothinclient_settings\fR.
 .PP
     1. Make sure your DHCP server's configuration points to:
 .PP
-            next-server <IP-or-hostname-of-this-server>;
-            filename '/pxelinux.0';
+        next-server <IP-or-hostname-of-this-server>;
+        filename '/pxelinux.0';
 .PP
     2. Export the X2Go Thin Client chroot environment via NFSv3:
 .PP
-        Add this line to /etc/exports... (in one line):
+      * Add this line to /etc/exports... (in one line):
 .PP
-            $TC_CHROOT\ <network>/<netmask>(ro,async,no_root_squash,no_subtree_check)
+        $TC_CHROOT\ \\
+\ \ \ \ \ \ \ \ <network>/<netmask>(ro,async,no_root_squash,no_subtree_check)
 .PP
-        ... and then restart your NFS server with:
+      * ... and then restart your NFS server with:
 .PP
-            /etc/init.d/nfs-kernel-server restart
+        /etc/init.d/nfs-kernel-server restart
 .PP
     3. Customize PXE/Syslinux files in $TC_TFTP_BOOT/ (optional):
 .PP
-        - customize PXE boot menu, take a look at
+      * customize PXE boot menu, take a look at
 .PP
-              $TC_TFTP_BOOT/default.cfg
+        $TC_TFTP_BOOT/default.cfg
 .PP
-          and proceed from there on...
-        - use your own boot loader background image: 640x480px,
-          16bit colour depth, file: $TC_TFTP_BOOT/x2go-tce.png
+        and proceed from there on...
+      * use your own boot loader background image: 640x480px,
+        16bit colour depth, file: $TC_TFTP_BOOT/x2go-tce.png
 .SH OPTIONS
 \fBx2gothinclient_pretftpboot\fR has no known options.
 .PP
diff --git a/x2gothinclientmanagement/share/x2goclient-background.svg b/x2gothinclientmanagement/share/x2goclient-background.svg
index e3c6580..c8ef53f 100644
--- a/x2gothinclientmanagement/share/x2goclient-background.svg
+++ b/x2gothinclientmanagement/share/x2goclient-background.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<!-- Creator: CorelDRAW -->
 
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -10,93 +10,134 @@
    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"
-   version="1.0"
-   width="361.04999"
-   height="271.92001"
-   viewBox="0 0 361.244 270.933"
-   id="svg2"
    xml:space="preserve"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="bg-anim.svg"><metadata
-   id="metadata30"><rdf:RDF><cc:Work
+   width="600"
+   height="600"
+   style="fill-rule:evenodd"
+   viewBox="0 0 600.32241 599.85166"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="bg.svg"
+   version="1.0"><metadata
+   id="metadata51"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
+   inkscape:window-height="694"
+   inkscape:window-width="1024"
    inkscape:pageshadow="2"
-   inkscape:window-width="1598"
-   inkscape:window-height="879"
-   id="namedview28"
-   showgrid="false"
-   inkscape:zoom="2"
-   inkscape:cx="132.20018"
-   inkscape:cy="132.38275"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   inkscape:zoom="0.735"
+   inkscape:cx="294.23647"
+   inkscape:cy="309.28923"
    inkscape:window-x="0"
-   inkscape:window-y="19"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="svg2" />
+   inkscape:window-y="25"
+   inkscape:current-layer="svg2"
+   showgrid="true"
+   inkscape:window-maximized="1"><inkscape:grid
+     type="xygrid"
+     id="grid2836"
+     empspacing="5"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true"
+     dotted="true" /></sodipodi:namedview>
  <defs
-   id="defs4"><inkscape:perspective
+   id="defs4"><linearGradient
+   id="linearGradient2877"><stop
+     style="stop-color:#ffffff;stop-opacity:1;"
+     offset="0"
+     id="stop2879" /><stop
+     style="stop-color:#246ed8;stop-opacity:1;"
+     offset="1"
+     id="stop2881" /></linearGradient><linearGradient
+   id="linearGradient2863"><stop
+     style="stop-color:#ffffff;stop-opacity:1;"
+     offset="0"
+     id="stop2865" /><stop
+     style="stop-color:#246ed8;stop-opacity:1;"
+     offset="1"
+     id="stop2867" /></linearGradient><linearGradient
+   id="linearGradient2855"><stop
+     style="stop-color:#ffffff;stop-opacity:1;"
+     offset="0"
+     id="stop2857" /><stop
+     style="stop-color:#246ed8;stop-opacity:1;"
+     offset="1"
+     id="stop2859" /></linearGradient><inkscape:perspective
    sodipodi:type="inkscape:persp3d"
-   inkscape:vp_x="0 : 135.96001 : 1"
+   inkscape:vp_x="0 : 135.5 : 1"
    inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_z="361.04999 : 135.96001 : 1"
-   inkscape:persp3d-origin="180.52499 : 90.640004 : 1"
-   id="perspective32" /><linearGradient
+   inkscape:vp_z="361.04999 : 135.5 : 1"
+   inkscape:persp3d-origin="180.52499 : 90.333333 : 1"
+   id="perspective28" /><linearGradient
+   inkscape:collect="always"
    id="linearGradient2802"><stop
-     style="stop-color:#ffffff;stop-opacity:1"
+     style="stop-color:white;stop-opacity:1;"
      offset="0"
      id="stop2804" /><stop
-     style="stop-color:#ffffff;stop-opacity:0"
+     style="stop-color:white;stop-opacity:0;"
      offset="1"
      id="stop2806" /></linearGradient><linearGradient
    id="linearGradient2852"><stop
-     style="stop-color:#ffffff;stop-opacity:1"
+     style="stop-color:white;stop-opacity:1;"
      offset="0"
      id="stop2854" /><stop
-     style="stop-color:#6699ff;stop-opacity:0"
+     style="stop-color:#69f;stop-opacity:0;"
      offset="1"
      id="stop2856" /></linearGradient><linearGradient
    id="linearGradient2844"><stop
-     style="stop-color:#deeaed;stop-opacity:1"
+     style="stop-color:#deeaed;stop-opacity:1;"
      offset="0"
      id="stop2846" /><stop
-     style="stop-color:#ffffff;stop-opacity:1"
+     style="stop-color:white;stop-opacity:1;"
      offset="1"
      id="stop2848" /></linearGradient><linearGradient
+   inkscape:collect="always"
    id="linearGradient1948"><stop
-     style="stop-color:#b2856b;stop-opacity:0.4235808;"
+     style="stop-color:#69f;stop-opacity:1;"
      offset="0"
      id="stop1950" /><stop
-     style="stop-color:#6699ff;stop-opacity:0"
+     style="stop-color:#69f;stop-opacity:0;"
      offset="1"
      id="stop1952" /></linearGradient>
   <style
    type="text/css"
-   id="style6" />
+   id="style6">
+   
+    .fil1 {fill:#6699FF}
+    .fil0 {fill:white}
+    .fil2 {fill:#6E707F}
+    .fil4 {fill:white}
+    .fil3 {fill:url(#id0)}
+   
+  </style>
   <linearGradient
+   id="id0"
+   gradientUnits="userSpaceOnUse"
    x1="202.494"
    y1="135.464"
    x2="207.00999"
-   y2="135.464"
-   id="id0"
-   gradientUnits="userSpaceOnUse">
+   y2="135.464">
    <stop
-   style="stop-color:#000000;stop-opacity:1"
    offset="0"
+   style="stop-color:black"
    id="stop9" />
    <stop
-   style="stop-color:#6e707f;stop-opacity:1"
    offset="1"
+   style="stop-color:#6E707F"
    id="stop11" />
   </linearGradient>
  
-  
+  <metadata
+   id="CorelCorpID_0Corel-Layer" />
   
   
   
@@ -105,54 +146,69 @@
   
   
  <linearGradient
-   x1="202.494"
-   y1="135.464"
-   x2="207.00999"
-   y2="135.464"
-   id="linearGradient1942"
-   xlink:href="#id0"
-   gradientUnits="userSpaceOnUse" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient1948"
+   id="linearGradient1954"
    x1="107.24445"
    y1="268.11078"
    x2="107.64762"
    y2="207.717"
-   id="linearGradient1954"
-   xlink:href="#linearGradient1948"
    gradientUnits="userSpaceOnUse" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient2802"
+   id="linearGradient2808"
    x1="278.59366"
    y1="-49.590809"
    x2="133.85397"
    y2="120.54888"
-   id="linearGradient2808"
-   xlink:href="#linearGradient2802"
+   gradientUnits="userSpaceOnUse" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient2855"
+   id="linearGradient2861"
+   x1="880.47284"
+   y1="-340.41806"
+   x2="300.16119"
+   y2="219.88284"
+   gradientUnits="userSpaceOnUse" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient2863"
+   id="linearGradient2869"
+   x1="840.45135"
+   y1="-120.29986"
+   x2="340.18271"
+   y2="339.94733"
+   gradientUnits="userSpaceOnUse" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient2877"
+   id="linearGradient2883"
+   x1="760.40839"
+   y1="219.88284"
+   x2="380.20419"
+   y2="480.02255"
    gradientUnits="userSpaceOnUse" /></defs>
-
-
  <rect
-   style="fill:#800000;fill-opacity:1"
-   id="hintergrund"
-   height="270.92899"
-   width="361.23801"
-   y="0.00456294"
-   x="-361.23801"
-   class="fil0"
-   transform="scale(-1,1)">
-	 <animateColor
-   attributeName="fill"
-   attributeType="XML"
-   from="#000000"
-   to="#246ed8"
-   begin="0s"
-   dur="4s"
-   fill="freeze"
-   id="animateColor24" />
- </rect>
-
-
- <path
-   d="M 162.557,0.0045 L 0,0.0045 L 0,57.8027 C 0,146.6071 334.145,182.1287 334.145,270.9327 L 334.145,270.9327 C 334.145,182.1283 162.557,88.8087 162.557,0.0037 L 162.557,0.0045 z "
-   style="fill:url(#linearGradient2808);fill-opacity:1"
-   id="path19" />
- 
- 
-</svg>
\ No newline at end of file
+   style="fill:#246ed8;fill-opacity:1"
+   id="rect15"
+   height="600.32239"
+   width="600.32239"
+   y="-0.235375"
+   x="-3.6313229e-22"
+   class="fil0" />
+<path
+   style="fill:url(#linearGradient2861);fill-opacity:1"
+   d="m 320.17195,-0.235375 280.15044,0 L 0,600.08701 320.17195,-0.235375 z"
+   id="rect2838"
+   sodipodi:nodetypes="cccc" /><path
+   style="fill:url(#linearGradient2869);fill-opacity:1"
+   d="m 600.32239,-0.235375 2e-5,240.128965 L 0,600.08701 600.32239,-0.235375 z"
+   id="rect2841"
+   sodipodi:nodetypes="cccc" /><path
+   sodipodi:nodetypes="cccc"
+   id="path2844"
+   d="m 600.32241,600.08704 0,-360.19345 L 0,600.08701 l 600.32241,3e-5 z"
+   style="fill:url(#linearGradient2883);fill-opacity:1" /><polygon
+   style="fill:url(#linearGradient1954);fill-opacity:1"
+   id="polygon17"
+   points="0,270.933 0,207.717 0,207.717 361.238,207.717 361.238,270.933 "
+   class="fil1"
+   transform="matrix(1.6618473,0,0,1.899254,1.9918569e-5,85.515206)" /></svg>
\ No newline at end of file


hooks/post-receive
-- 
x2gothinclient.git (X2Go Thin Client Environment)

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 "x2gothinclient.git" (X2Go Thin Client Environment).




More information about the x2go-commits mailing list