This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdriveclient. from 1145be7 res/resource.qrc: reference subdirectories. new 3b7d0a0 debian/rules: don't install x2gokdriveclient binary manually, the Makefile does that for us. new 1c78e27 x2gokdriveclient.spec: move make_call macro invocation to correct location. 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 | 4 ++++ debian/rules | 5 ----- x2gokdriveclient.spec | 2 +- 3 files changed, 5 insertions(+), 6 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 3b7d0a01a09f3e5fd0baaf7f8e5cee83d1ba4603 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 24 18:21:28 2023 +0100 debian/rules: don't install x2gokdriveclient binary manually, the Makefile does that for us. --- debian/changelog | 2 ++ debian/rules | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25da032..7656e1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -107,6 +107,8 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium 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. * debian/copyright: + Change the source license to GPL-3+. + Change license for debian/* to GPL-3+ as well, after asking Mike Gabriel diff --git a/debian/rules b/debian/rules index d7c0b0a..56b7106 100755 --- a/debian/rules +++ b/debian/rules @@ -26,11 +26,6 @@ override_dh_auto_configure: override_dh_auto_build: dh_auto_build -override_dh_install: - mkdir -p $(CURDIR)/debian/x2gokdriveclient/usr/bin/ - install -m 644 x2gokdriveclient $(CURDIR)/debian/x2gokdriveclient/usr/bin/ - dh_install - override_dh_clean: dh_auto_clean rm -f res/txt/changelog -- 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 1c78e27f0ad284f6a8bd2a86b1c3394925db8ab0 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 24 18:25:12 2023 +0100 x2gokdriveclient.spec: move make_call macro invocation to correct location. It previously only triggered for non-existent Qt6 builds. --- debian/changelog | 2 ++ x2gokdriveclient.spec | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7656e1c..43f4fd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,6 +102,8 @@ 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. * debian/rules: + Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them. Especially needed for C++11 support. diff --git a/x2gokdriveclient.spec b/x2gokdriveclient.spec index 3c413d1..b706196 100644 --- a/x2gokdriveclient.spec +++ b/x2gokdriveclient.spec @@ -138,8 +138,8 @@ export 'PATH=%{_qt6_bindir}:'"${PATH}" export 'PATH=%{_libqt6_bindir}:'"${PATH}" %endif %endif -%{make_call} %endif +%{make_call} %install -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
-
git-admin＠x2go.org