This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from ec84072 patches.xorg/: add 1.20.7 files, essentially copied and refreshed from 1.20.6. new e835a48 x2gokdrive{,remote}.c: fix logic flaws. new 1d0b615 debian/control: depend upon libxfont1-dev << 1.5.2 (which is the version in Debian 9/stretch) or fall back to libxfont-dev *and* make sure that the libxfont1-dev version is greater than 1.4.2. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 7 +++++++ debian/control | 4 ++-- x2gokdrive.c | 4 ++-- x2gokdriveremote.c | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit e835a4850de4fa2f6b399efd21e064d7d3e132ba Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jan 20 15:19:39 2020 +0100 x2gokdrive{,remote}.c: fix logic flaws. --- debian/changelog | 1 + x2gokdrive.c | 4 ++-- x2gokdriveremote.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index c0fc1e6..5ed189e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium 1.20.5. - patches.xorg/: add 1.20.7 files, essentially copied and refreshed from 1.20.6. + - x2gokdrive{,remote}.c: fix logic flaws. * debian/control: + Grammar fix. + Remove dependencies that refer to disabled features. diff --git a/x2gokdrive.c b/x2gokdrive.c index 3789fee..8673a6e 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -1082,13 +1082,13 @@ ScreenPtr ephyrCursorScreen; /* screen containing the cursor */ static void ephyrWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) { -#if XORG_VERSION_CURRENT < 11900000 +#if XORG_VERSION_CURRENT >= 11900000 input_lock(); #endif /* XORG_VERSION_CURRENT */ ephyrCursorScreen = pScreen; miPointerWarpCursor(inputInfo.pointer, pScreen, x, y); -#if XORG_VERSION_CURRENT < 11900000 +#if XORG_VERSION_CURRENT >= 11900000 input_unlock(); #endif /* XORG_VERSION_CURRENT */ } diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index 17aaa61..ac524f0 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -1436,7 +1436,7 @@ void *send_frame_thread (void *threadid) //only accept one client, close server socket shutdown(remoteVars.serversock, SHUT_RDWR); close(remoteVars.serversock); -#if XORG_VERSION_CURRENT < 11900000 +#if XORG_VERSION_CURRENT >= 11900000 SetNotifyFd(remoteVars.clientsock, clientReadNotify, X_NOTIFY_READ, NULL); #endif /* XORG_VERSION_CURRENT */ remoteVars.client_connected=TRUE; @@ -1459,7 +1459,7 @@ void *send_frame_thread (void *threadid) if(!remoteVars.client_connected) { EPHYR_DBG ("TCP connection closed\n"); -#if XORG_VERSION_CURRENT < 11900000 +#if XORG_VERSION_CURRENT >= 11900000 RemoveNotifyFd(remoteVars.clientsock); #endif /* XORG_VERSION_CURRENT */ shutdown(remoteVars.clientsock, SHUT_RDWR); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 1d0b61512c43a44fa2e7eae5940ec96673f2e1aa Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jan 20 15:37:07 2020 +0100 debian/control: depend upon libxfont1-dev << 1.5.2 (which is the version in Debian 9/stretch) or fall back to libxfont-dev *and* make sure that the libxfont1-dev version is greater than 1.4.2. This should essentially emulate libxfont1-dev (>> 1.4.2 << 1.5.2) | libxfont-dev (>> 1.4.2) and fix issues with "hello" being picked with subsequent dependencies being dropped (like libunwind, which is usually not optional). --- debian/changelog | 6 ++++++ debian/control | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ed189e..d3a52a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,6 +74,12 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium libXfont2, but Debian 9/stretch uses X.Org Server 1.19.2, which is compatible with libXfont2 (and actually requires it), but also has both packages available. + + Depend upon libxfont1-dev << 1.5.2 (which is the version in Debian + 9/stretch) or fall back to libxfont-dev *and* make sure that the + libxfont1-dev version is greater than 1.4.2. This should essentially + emulate libxfont1-dev (>> 1.4.2 << 1.5.2) | libxfont-dev (>> 1.4.2) and + fix issues with "hello" being picked with subsequent dependencies being + dropped (like libunwind, which is usually not optional). * x2gokdrive.spec: + Drop Debian-style formatting in description. + Typo fixes. diff --git a/debian/control b/debian/control index 9884bfb..abe5957 100644 --- a/debian/control +++ b/debian/control @@ -47,8 +47,8 @@ Build-Depends: xtrans-dev (>= 1.3.2), libxau-dev (>= 1:1.0.5-2), libxdmcp-dev (>= 1:0.99.1), - libxfont1-dev (>= 1.4.2) | hello, - libxfont-dev (>= 1.4.2), + libxfont1-dev (<< 1:1.5.2) | libxfont-dev (>= 1.4.2), + libxfont1-dev (>> 1.4.2) | libxfont-dev (>= 1.4.2), libxkbfile-dev (>= 1:0.99.1), libpixman-1-dev (>= 0.27.2), libpciaccess-dev (>= 0.12.901), -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org