[X2Go-Commits] [x2gokdriveclient] 02/02: Merge branch 'master' of ssh://code.x2go.org:32032/srv/git/code.x2go.org/x2gokdriveclient

git-admin at x2go.org git-admin at x2go.org
Fri May 26 19:07:51 CEST 2023


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdriveclient.

commit d4eb0860fe6fd74c092a1d6e12cf84a2b8c7734d
Merge: e780931 bf64f43
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Fri May 26 11:06:46 2023 -0600

    Merge branch 'master' of ssh://code.x2go.org:32032/srv/git/code.x2go.org/x2gokdriveclient

 .gitignore                                       |  40 ++
 AUTHORS                                          |   1 +
 COPYING                                          | 674 +++++++++++++++++++++++
 LICENSE                                          |  15 +
 Makefile                                         | 135 +++++
 Makefile.docupload                               |  18 +
 Makefile.man2html                                |  24 +
 debian/changelog                                 | 123 ++++-
 debian/control                                   |   1 +
 debian/copyright                                 |  22 +-
 debian/rules                                     |  24 +-
 debian/x2gokdriveclient.install                  |   1 -
 res/{ => img/png}/x2goclient.png                 | Bin
 res/{ => img/svg}/application-menu.svg           |   0
 res/{ => img/svg}/minimize.svg                   |   0
 res/{ => img/svg}/network-disconnect.svg         |   0
 res/{ => img/svg}/pin.svg                        |   0
 res/{ => img/svg}/randr.svg                      |   0
 res/{ => img/svg}/view-fullscreen.svg            |   0
 res/{ => img/svg}/view-restore.svg               |   0
 res/{ => img/svg}/view.svg                       |   0
 res/{ => img/svg}/x2gobg.svg                     |   0
 res/{ => img/svg}/x2gologo.svg                   |   0
 res/resources.qrc                                |  14 +
 res/txt/.placeholder                             |   0
 resources.qrc                                    |  14 -
 rpm/x2gokdriveclient-rpmlintrc                   |   1 +
 client.cpp => src/client.cpp                     |  14 +-
 client.h => src/client.h                         |   0
 displayarea.cpp => src/displayarea.cpp           |   0
 displayarea.h => src/displayarea.h               |   0
 extwin.cpp => src/extwin.cpp                     |   2 +-
 extwin.h => src/extwin.h                         |   0
 main.cpp => src/main.cpp                         |   0
 menuframe.cpp => src/menuframe.cpp               |   8 +-
 menuframe.h => src/menuframe.h                   |   0
 screenidentifier.cpp => src/screenidentifier.cpp |   0
 screenidentifier.h => src/screenidentifier.h     |   0
 xcbclip.cpp => src/xcbclip.cpp                   |   0
 xcbclip.h => src/xcbclip.h                       |   0
 x2gokdriveclient.pro                             |  22 +-
 x2gokdriveclient.spec                            | 165 ++++++
 42 files changed, 1227 insertions(+), 91 deletions(-)

diff --cc debian/changelog
index 3dc52f8,b5d5e8c..c25fcbd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -62,7 -50,80 +50,82 @@@ x2gokdriveclient (0.0.0.1-0x2go1) UNREL
      - 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.
 +    - hide normal windows with visibility == 2 from taskbar.
  
+   [ Mike Gabriel ]
+   * Initial release:
+     - client.{cpp|h}: Don't hide Client::slotSelectionChanged on Linux. Older
+       Qt5 version (as found in Debian stretch) choke on the ifdef'ed out
+       code portions when parsing auto-generated moc_client.cpp.
+ 
+   [ Mihai Moldovan ]
+   * Initial release:
+     - x2gokdriveclient.pro: we require C++11, so set this via CONFIG. Mostly
+       for documentation purposes, since this feature should be enabled by
+       default.
+     - x2gokdriveclient.pro: whitespace only.
+     - client.cpp: allow building with Qt 5.8-, which does not support
+       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
+       locations.
+     - res/: move image files to res/img/.
+     - src/{client,extwin,menuframe}.cpp: add img/ prefix to image files.
+     - x2gokdriveclient.pro: adapt to new layout.
+     - res/img/: create svg and img subdirectories, move files to them.
+     - 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:
+     + Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them.
+       Especially needed for C++11 support.
+     + Switch to most of what X2Go Client uses, minus the Qt switching
+       mechanism. We would need a lot more work for that.
+     + Don't install x2gokdriveclient binary manually, the Makefile does that
+       for us.
+     + Try to export PREFIX to not install in the default prefix. We might have
+       to pass it down further, though.
+   * debian/copyright:
+     + Change the source license to GPL-3+.
+     + Change license for debian/* to GPL-3+ as well, after asking Mike Gabriel
+       to relicense and drop GPL-2+ portions.
+   * debian/control:
+     + Add BD: man2html.
+   * debian/x2gokdriveclient.install:
+     + Remove, we'll handle this differently.
+ 
   -- Mike Gabriel <mike.gabriel at 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


More information about the x2go-commits mailing list