From unknown Sun Apr 26 10:34:32 2026 X-Loop: owner@bugs.x2go.org Subject: Bug#278: [X2Go-Dev] Bug#278: X2Go issue (in src:x2goserver) has been marked as pending for release Reply-To: Mike Gabriel , 278@bugs.x2go.org Resent-From: Mike Gabriel Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Thu, 28 Nov 2013 09:03:01 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: followup 278 X-X2Go-PR-Package: x2goserver X-X2Go-PR-Keywords: pending patch Received: via spool by 278-submit@bugs.x2go.org id=B278.13856285258491 (code B ref 278); Thu, 28 Nov 2013 09:03:01 +0000 Received: (at 278) by bugs.x2go.org; 28 Nov 2013 08:48:45 +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,URIBL_BLOCKED autolearn=ham version=3.3.2 Received: from freya.das-netzwerkteam.de (freya.das-netzwerkteam.de [88.198.48.199]) by ymir (Postfix) with ESMTPS id 68ACF5DA6C for <278@bugs.x2go.org>; Thu, 28 Nov 2013 09:48:44 +0100 (CET) Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98]) by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 007761E947; Thu, 28 Nov 2013 09:48:44 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id ECE4F3C1E6; Thu, 28 Nov 2013 09:48:43 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de Received: from grimnir.das-netzwerkteam.de ([127.0.0.1]) by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ebWo-EzzvSmB; Thu, 28 Nov 2013 09:48:43 +0100 (CET) Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTPSA id BE8823C1E0; Thu, 28 Nov 2013 09:48:43 +0100 (CET) Received: from nocatv2.tng.de (nocatv2.tng.de [213.178.75.58]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP; Thu, 28 Nov 2013 08:48:43 +0000 Date: Thu, 28 Nov 2013 08:48:43 +0000 Message-ID: <20131128084843.Horde.u1M6U3FatcehRPnwWqNPuQ1@mail.das-netzwerkteam.de> From: Mike Gabriel To: Orion Poplawski Cc: 278@bugs.x2go.org References: <20130731070629.810445DB2C@ymir> <529680FD.1050403@cora.nwra.com> In-Reply-To: <529680FD.1050403@cora.nwra.com> User-Agent: Internet Messaging Program (IMP) H5 (6.1.4) Accept-Language: en,de Organization: DAS-NETZWERKTEAM X-Originating-IP: 213.178.75.58 X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 Content-Type: multipart/signed; boundary="=_oyffTFDrPZMUQ8vjpYcRcg2"; protocol="application/pgp-signature"; micalg=pgp-sha1 MIME-Version: 1.0 This message is in MIME format and has been PGP signed. --=_oyffTFDrPZMUQ8vjpYcRcg2 Content-Type: text/plain; charset=ISO-8859-1; format=flowed; DelSp=Yes Content-Disposition: inline On Do 28 Nov 2013 00:32:13 CET, Orion Poplawski wrote: > 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. Indeed. This is not a problem with the .deb packaging logic (as I do not use the Makefile for creating dirs and copying files). So, maybe we should create those folders/files during make install, if they do not yet exist? Or do you want to handle that via x2goserver.spec? Mike -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb --=_oyffTFDrPZMUQ8vjpYcRcg2 Content-Type: application/pgp-signature Content-Description: Digitale PGP-Signatur Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAABAgAGBQJSlwNrAAoJEJr0azAldxsx430P/3DwxLtCJxy+DMLk06wcgWcV EBmk0UQPLOxPv7hb6Z8FEH8rf/d5g73jLIwt8RnF5Kz2spdWuLw52TW9z+baQfS4 VdrnyFai+W3IxFZ0595Zml5soIHT521Py4atn+ZOKwT+J8xaDzrnluhq31gwPQeH 4wy10albJMvpp5+bjjpq7cqrTy/VeZDnlmmkneQGpxCwuZLsvrTePjC1O+/pa3bq YHa0rvL3/0RO9oq53XWvwtM12bzf8TLjQwThw5Qy8ibjl2Dk4YGWAey2kggzDydO AqT20jJ6VwPhErR4ahvKcnq+mmEbIYd3EYoDTQ6BnOyZ4QXk+M56UVq0C5pjjspL zaOIapq0l439AUuxutBlmmSSfEFWHv7eZgi3TTk4LcLx9xDh0S6LLDHa3+t3IAP7 LPTcGjWSiHgtTWDt+CfEeKN8HN6G04fX6GlVcx38pFsFBLh8u0b80mxjOW+WFYme 7uXB6wwd0KrKbi8Hpc5oC/zlgUzGhrIry/8gEpSwoKwOyeUtEAahUyRrX8NcK6MY mghNoUVaQ8AjTcfxA3EGbliz5UqkqArFPIVBE25EiomusGeTqhSTqn2U3Stt5sKO wKmGmYp9gbILAalOegt9Wqi6JxBPmJ/ImaYaeI5v0TW+8Afw0oU6iL5Mh5FNdvlb Os6dg7b+kx2H3oy4DX6f =wmrV -----END PGP SIGNATURE----- --=_oyffTFDrPZMUQ8vjpYcRcg2--