From orion@cora.nwra.com Thu Nov 28 01:17:24 2013 Received: (at 278) by bugs.x2go.org; 28 Nov 2013 00:17:41 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable version=3.3.2 X-Greylist: delayed 2690 seconds by postgrey-1.34 at ymir; Thu, 28 Nov 2013 01:17:24 CET Received: from mail.cora.nwra.com (mercury.cora.nwra.com [4.28.99.165]) by ymir (Postfix) with ESMTPS id 1353D5DA6C; Thu, 28 Nov 2013 01:17:23 +0100 (CET) Received: from pacas.cora.nwra.com (63-228-77-151.hlrn.qwest.net [63.228.77.151]) (authenticated bits=0) by mail.cora.nwra.com (8.14.4/8.14.4) with ESMTP id rARNWFP9003425 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Wed, 27 Nov 2013 16:32:24 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cora.nwra.com; s=default; t=1385595150; bh=0Q0cQXXuXdZMvueJkE399eAKUpfbbqep6boTbKmsY3Y=; h=Message-ID:Date:From:MIME-Version:To:CC:Subject:References: In-Reply-To:Content-Type:Content-Transfer-Encoding; b=IcSRze5smm5DAhTHSXC2gMUBztTQE+ctugs3oSvfV6Ulrpb75FDSTqijjo68qXr+w 9Adx/6OAGk1HppufOTvLfSRg2BcaxMyocQJvA5Z1SynlR74NcGOgHv3mmzJYcdw57x 2lt0ad41AaDPu4/e6kW+ss7BeJUcB6yEckDDkPSc= Message-ID: <529680FD.1050403@cora.nwra.com> Date: Wed, 27 Nov 2013 16:32:13 -0700 From: Orion Poplawski User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Mike Gabriel , 278@bugs.x2go.org, x2go-dev@lists.berlios.de, 278-submitter@bugs.x2go.org CC: control@bugs.x2go.org Subject: Re: [X2Go-Dev] Bug#278: X2Go issue (in src:x2goserver) has been marked as pending for release References: <20130731070629.810445DB2C@ymir> In-Reply-To: <20130731070629.810445DB2C@ymir> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 07/31/2013 01:06 AM, Mike Gabriel wrote: > tag #278 pending > fixed #278 4.0.1.7 > thanks > > Hello, > > X2Go issue #278 (src:x2goserver) reported by you has been > fixed in X2Go Git. You can see the changelog below, and you can > check the diff of the fix at: > > http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=6567318 > > The issue will most likely be fixed in src:x2goserver (4.0.1.7). > > light+love > X2Go Git Admin (on behalf of the sender of this mail) > > --- > commit 6567318201544d31d380a7fabb90de87bfbdb89a > Author: Mike Gabriel > Date: Wed Jul 31 09:06:01 2013 +0200 > > Fine-tune x2goserver-xsession/Makefile: if /etc/X11 has Xsession.d and/or Xsession.options they get symlinked into /etc/x2go. Otherwise Xsession.d and Xsession.options are created under /etc/x2go as empty dir/file. (Fixes: #278). > > diff --git a/debian/changelog b/debian/changelog > index ce613a0..d6b0af6 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -7,6 +7,11 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low > (Fixes: #278). > > [ Mike Gabriel ] > + * New upstream version (4.0.1.7): > + - Fine-tune x2goserver-xsession/Makefile: if /etc/X11 has Xsession.d and/or > + Xsession.options they get symlinked into /etc/x2go. Otherwise Xsession.d > + and Xsession.options are created under /etc/x2go as empty dir/file. > + (Fixes: #278). > * /debian/control: > - Update LONG_DESCRIPTIONS. > XSESSIONDIR ?= /etc/X11/Xsession.d XSESSIONOPTIONFILE ?= /etc/X11/Xsession.options if [ -e $(XSESSIONOPTIONFILE) ]; then $(INSTALL_SYMLINK) $(XSESSIONOPTIONFILE) $(DESTDIR)$(ETCDIR)/Xsession.options; else touch $(DESTDIR)$(ETCDIR)/Xsession.options; fi if [ -d $(XSESSIONDIR) ]; then $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi One unfortunate side effect of this is that XSESSIONDIR/XSESSIONOPTIONFILE needs to be present in the buildroot for these directories to get linked. -- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA/CoRA Division FAX: 303-415-9702 3380 Mitchell Lane orion@cora.nwra.com Boulder, CO 80301 http://www.cora.nwra.com