This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdriveclient. from d4eb086 Merge branch 'master' of ssh://code.x2go.org:32032/srv/git/code.x2go.org/x2gokdriveclient new 48ca468 debian/changelog: move changes to x2gokdriveclient.spec to own subsection. new f962080 x2gokdriveclient.spec: don't use Enhances: tag on CentOS 7 (but all other platforms). new 96e500c debian/changelog: fixup. new 7c17c50 misc: pre-release date update. The 4 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: Makefile.docupload | 2 +- debian/changelog | 33 ++++++++++++++++++--------------- debian/copyright | 4 ++-- man/man1/x2gokdriveclient.1 | 2 +- src/client.cpp | 4 ++-- src/client.h | 4 ++-- src/displayarea.cpp | 4 ++-- src/displayarea.h | 4 ++-- src/extwin.cpp | 4 ++-- src/extwin.h | 4 ++-- src/main.cpp | 4 ++-- src/menuframe.cpp | 4 ++-- src/menuframe.h | 4 ++-- src/screenidentifier.cpp | 4 ++-- src/screenidentifier.h | 4 ++-- src/xcbclip.cpp | 4 ++-- src/xcbclip.h | 4 ++-- x2gokdriveclient.spec | 3 +++ 18 files changed, 51 insertions(+), 45 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit f96208042507b090d2852af848c45a4cd24d43eb Author: Mihai Moldovan <ionic@ionic.de> Date: Fri May 26 19:37:47 2023 +0200 x2gokdriveclient.spec: don't use Enhances: tag on CentOS 7 (but all other platforms). --- debian/changelog | 1 + x2gokdriveclient.spec | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 71ef790..23c7835 100644 --- a/debian/changelog +++ b/debian/changelog @@ -127,5 +127,6 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium triggered for non-existent Qt6 builds. + Add PREFIX to make call. + Add BR: pkgconfig(zlib). + + Don't use Enhances: tag on CentOS 7 (but all other platforms). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 11:10:43 +0200 diff --git a/x2gokdriveclient.spec b/x2gokdriveclient.spec index be97e53..c39a87d 100644 --- a/x2gokdriveclient.spec +++ b/x2gokdriveclient.spec @@ -85,7 +85,10 @@ BuildRequires: redhat-rpm-config BuildRequires: fdupes %endif +# We'll assume that only CentOS 7 does not support the Enhances tag. +%if ! 0%{?rhel} || 0%{?rhel} > 7 Enhances: x2goclient +%endif %if 0%{?el5} # For compatibility with EPEL5 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit 48ca468117e75e0c17f265ddb7ce67532f81c497 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri May 26 19:32:37 2023 +0200 debian/changelog: move changes to x2gokdriveclient.spec to own subsection. --- debian/changelog | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index c25fcbd..71ef790 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,30 +69,20 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium QWidget::setWindowFlag (). Use QWidget::setWindowFlags () with QWidget::windowFlags () and an additional call to show () instead on older platforms. - - x2gokdriveclient.spec: add for RPM support, copied from X2Go Client. - LICENSE: add GPL 3.0 file. - rpm/: add directory and new file x2gokdriveclient-rpmlint, copied from X2Go Client. - LICENSE: rename to COPYING. - LICENSE: copy from X2Go Client and adapt. - AUTHORS: copy from X2Go Client and adapt. - - x2gokdriveclient.spec: thin out, mostly adapt to current source, switch - between Qt 5 and Qt 6 (although Qt 6 is currently untested and only - defined for fake versions of distributions that don't exist yet). - *.{h,cpp}: move to src directory. - Makefile: copy from X2Go Client. - - x2gokdriveclient.spec: fix man page install permissions. - Makefile.man2html: copy from X2Go Client. - Makefile.docupload: copy from X2Go Client. - Makefile.docupload: adapt to this package. - res/txt: create and add .placeholder file. - Makefile: adapt to this package. - - x2gokdriveclient.spec: no need to explicitly install the man pages any - longer, drop. - - x2gokdriveclient.spec: add Enhances: x2goclient. - Makefile: install VERSION file into SHAREDIR/x2go/versions/. - - x2gokdriveclient.spec: add version file to list of installed files. - - x2gokdriveclient.spec: fix package name, whoops. - resources.qrc: move to res/. - res/resources.qrc: remove res/ prefix. - src/{client,extwin,menuframe}.cpp: remove res/ prefix from resource @@ -104,10 +94,6 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - src/{client,extwin,menuframe}.cpp: reference image files via subdirectories. - res/resource.qrc: reference subdirectories. - - x2gokdriveclient.spec: move make_call macro invocation to correct - location. It previously only triggered for non-existent Qt6 builds. - - x2gokdriveclient.spec: add PREFIX to make call. - - x2gokdriveclient.spec: add BR: pkgconfig(zlib). - AUTHORS: actually add file, whoops. - .gitignore: copy from X2Go Client, adapt to this project. * debian/rules: @@ -127,5 +113,19 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Add BD: man2html. * debian/x2gokdriveclient.install: + Remove, we'll handle this differently. + * x2gokdriveclient.spec: + + Add for RPM support, copied from X2Go Client. + + Thin out, mostly adapt to current source, switch between Qt 5 and Qt 6 + (although Qt 6 is currently untested and only defined for fake versions + of distributions that don't exist yet). + + Fix man page install permissions. + + No need to explicitly install the man pages any longer, drop. + + Add Enhances: x2goclient. + + Add version file to list of installed files. + + Fix package name, whoops. + + Move make_call macro invocation to correct location. It previously only + triggered for non-existent Qt6 builds. + + Add PREFIX to make call. + + Add BR: pkgconfig(zlib). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 11:10:43 +0200 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit 7c17c50b56b2ee861723b058a34254808071772c Author: Mihai Moldovan <ionic@ionic.de> Date: Fri May 26 20:01:05 2023 +0200 misc: pre-release date update. --- Makefile.docupload | 2 +- debian/changelog | 1 + debian/copyright | 4 ++-- man/man1/x2gokdriveclient.1 | 2 +- src/client.cpp | 4 ++-- src/client.h | 4 ++-- src/displayarea.cpp | 4 ++-- src/displayarea.h | 4 ++-- src/extwin.cpp | 4 ++-- src/extwin.h | 4 ++-- src/main.cpp | 4 ++-- src/menuframe.cpp | 4 ++-- src/menuframe.h | 4 ++-- src/screenidentifier.cpp | 4 ++-- src/screenidentifier.h | 4 ++-- src/xcbclip.cpp | 4 ++-- src/xcbclip.h | 4 ++-- 17 files changed, 31 insertions(+), 30 deletions(-) diff --git a/Makefile.docupload b/Makefile.docupload index b34de35..bd05489 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile.docupload file - for x2goclient -# Copyright (C) 2010-2020 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3 applies to this file +# Copyright (C) 2010-2023 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3 applies to this file VERSION=$(head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1) DOC_HOST="code.x2go.org" diff --git a/debian/changelog b/debian/changelog index 93be583..4d15548 100644 --- a/debian/changelog +++ b/debian/changelog @@ -97,6 +97,7 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - res/resource.qrc: reference subdirectories. - AUTHORS: actually add file, whoops. - .gitignore: copy from X2Go Client, adapt to this project. + - misc: pre-release date update. * debian/rules: + Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them. Especially needed for C++11 support. diff --git a/debian/copyright b/debian/copyright index 437a25b..853cc11 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,11 +4,11 @@ Upstream-Contact: Oleksandr Shneyder <o.schneydr@phoca-gmbh.de> Source: https://code.x2go.org/releases/source/x2gokdriveclient/ Files: * -Copyright: 2018-2019, Oleksandr Shneyder <o.schneydr@phoca-gmbh.de> +Copyright: 2018-2023, Oleksandr Shneyder <o.schneydr@phoca-gmbh.de> License: GPL-3+ Files: debian/* -Copyright: 2019, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Copyright: 2019-2023, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-3+ License: GPL-3+ diff --git a/man/man1/x2gokdriveclient.1 b/man/man1/x2gokdriveclient.1 index 24cd2d9..8b01708 100644 --- a/man/man1/x2gokdriveclient.1 +++ b/man/man1/x2gokdriveclient.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gokdriveclient 1 "Jun 2019" "Version 0.0.0.1" "X2Go Application" +.TH x2gokdriveclient 1 "May 2023" "Version 0.0.0.1" "X2Go Application" .SH NAME x2gokdriveclient \- Graphical client-side backend for X2Go Server's KDrive-based X-Server backend .SH SYNOPSIS diff --git a/src/client.cpp b/src/client.cpp index b6cc534..79045bc 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1,7 +1,7 @@ /* * QT Client for X2GoKDrive - * Copyright (C) 2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * Copyright (C) 2018 phoca-GmbH + * Copyright (C) 2018-2023 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * Copyright (C) 2018-2023 phoca-GmbH * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/client.h b/src/client.h index fcaf5e3..926360e 100644 --- a/src/client.h +++ b/src/client.h @@ -1,7 +1,7 @@ /* * QT Client for X2GoKDrive - * Copyright (C) 2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * Copyright (C) 2018 phoca-GmbH + * Copyright (C) 2018-2023 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * Copyright (C) 2018-2023 phoca-GmbH * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/displayarea.cpp b/src/displayarea.cpp index 24629fb..9808f58 100644 --- a/src/displayarea.cpp +++ b/src/displayarea.cpp @@ -1,7 +1,7 @@ /* * QT Client for X2GoKDrive - * Copyright (C) 2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * Copyright (C) 2018 phoca-GmbH + * Copyright (C) 2018-2023 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * Copyright (C) 2018-2023 phoca-GmbH * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/displayarea.h b/src/displayarea.h index b573b03..d975bc9 100644 --- a/src/displayarea.h +++ b/src/displayarea.h @@ -1,7 +1,7 @@ /* * QT Client for X2GoKDrive - * Copyright (C) 2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * Copyright (C) 2018 phoca-GmbH + * Copyright (C) 2018-2023 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * Copyright (C) 2018-2023 phoca-GmbH * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/extwin.cpp b/src/extwin.cpp index 4a3c302..8ad340d 100644 --- a/src/extwin.cpp +++ b/src/extwin.cpp @@ -1,7 +1,7 @@ /* * QT Client for X2GoKDrive - * Copyright (C) 2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * Copyright (C) 2018 phoca-GmbH + * Copyright (C) 2018-2023 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * Copyright (C) 2018-2023 phoca-GmbH * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/extwin.h b/src/extwin.h index ab96a1b..b3649ff 100644 --- a/src/extwin.h +++ b/src/extwin.h @@ -1,7 +1,7 @@ /* * QT Client for X2GoKDrive - * Copyright (C) 2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * Copyright (C) 2018 phoca-GmbH + * Copyright (C) 2018-2023 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * Copyright (C) 2018-2023 phoca-GmbH * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main.cpp b/src/main.cpp index c1c8d70..40ff5af 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,7 @@ /* * QT Client for X2GoKDrive - * Copyright (C) 2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * Copyright (C) 2018 phoca-GmbH + * Copyright (C) 2018-2023 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * Copyright (C) 2018-2023 phoca-GmbH * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/menuframe.cpp b/src/menuframe.cpp index 615de04..9261eb2 100644 --- a/src/menuframe.cpp +++ b/src/menuframe.cpp @@ -1,7 +1,7 @@ /* * QT Client for X2GoKDrive - * Copyright (C) 2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * Copyright (C) 2018 phoca-GmbH + * Copyright (C) 2018-2023 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * Copyright (C) 2018-2023 phoca-GmbH * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/menuframe.h b/src/menuframe.h index 8b7862a..6e05b1d 100644 --- a/src/menuframe.h +++ b/src/menuframe.h @@ -1,7 +1,7 @@ /* * QT Client for X2GoKDrive - * Copyright (C) 2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * Copyright (C) 2018 phoca-GmbH + * Copyright (C) 2018-2023 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * Copyright (C) 2018-2023 phoca-GmbH * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/screenidentifier.cpp b/src/screenidentifier.cpp index 3a3ab13..5ade004 100644 --- a/src/screenidentifier.cpp +++ b/src/screenidentifier.cpp @@ -1,7 +1,7 @@ /* * QT Client for X2GoKDrive - * Copyright (C) 2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * Copyright (C) 2018 phoca-GmbH + * Copyright (C) 2018-2023 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * Copyright (C) 2018-2023 phoca-GmbH * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/screenidentifier.h b/src/screenidentifier.h index fbb7f46..21ed1f2 100644 --- a/src/screenidentifier.h +++ b/src/screenidentifier.h @@ -1,7 +1,7 @@ /* * QT Client for X2GoKDrive - * Copyright (C) 2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * Copyright (C) 2018 phoca-GmbH + * Copyright (C) 2018-2023 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * Copyright (C) 2018-2023 phoca-GmbH * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/xcbclip.cpp b/src/xcbclip.cpp index 6adf47c..49f58ab 100644 --- a/src/xcbclip.cpp +++ b/src/xcbclip.cpp @@ -1,7 +1,7 @@ /* * QT Client for X2GoKDrive - * Copyright (C) 2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * Copyright (C) 2018 phoca-GmbH + * Copyright (C) 2018-2023 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * Copyright (C) 2018-2023 phoca-GmbH * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/xcbclip.h b/src/xcbclip.h index 7787e50..0317e4d 100644 --- a/src/xcbclip.h +++ b/src/xcbclip.h @@ -1,7 +1,7 @@ /* * QT Client for X2GoKDrive - * Copyright (C) 2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * Copyright (C) 2018 phoca-GmbH + * Copyright (C) 2018-2023 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * Copyright (C) 2018-2023 phoca-GmbH * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit 96e500c9f5d928cd5e2030457719b160b31abdfc Author: Mihai Moldovan <ionic@ionic.de> Date: Fri May 26 20:00:11 2023 +0200 debian/changelog: fixup. --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 23c7835..93be583 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,7 +50,8 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - add --noresize option to disable size changing of the window for user. - support for sending frames over UDP. Some improvements in detecting of unchanged regions. - - repaint window in rootless mode after move/resize to avoid repaint errors on Windows. + - repaint window in rootless mode after move/resize to avoid repaint + errors on Windows. - hide normal windows with visibility == 2 from taskbar. [ Mike Gabriel ] -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
-
git-admin＠x2go.org