This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goplasmabindings. from 0bc59e0 CMakeLists.txt: rework building of org.x2go.plasmoid library in Plasma5 mode, based upon QML. new e4b0b64 debian/changelog: move changes to x2goplasmabindings.spec to own section. new 6aad0d4 x2goplasmabindings.spec: add BRs on kf5umbrella for *SuSE-based systems and kf5-rpm-macros for RedHat-based systems to get ECMQmlModule support. new eb21968 debian/control: add BD for extra-cmake-modules for ECMQmlModule support. The 3 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 | 29 ++++++++++++++++------------- debian/control | 1 + x2goplasmabindings.spec | 6 ++++++ 3 files changed, 23 insertions(+), 13 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goplasmabindings. commit 6aad0d4f14cc79f286a750a62360031f0b67538a Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Aug 7 21:05:24 2023 +0200 x2goplasmabindings.spec: add BRs on kf5umbrella for *SuSE-based systems and kf5-rpm-macros for RedHat-based systems to get ECMQmlModule support. --- debian/changelog | 2 ++ x2goplasmabindings.spec | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 91e324c..669b1ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium + Add cmake(Qt5{,Quick,Core}) BRs. + Fix License: tag, add COPYING and COPYING.GPL3 to either %license or %doc macros in %files section. + + Add BRs on kf5umbrella for *SuSE-based systems and kf5-rpm-macros for + RedHat-based systems to get ECMQmlModule support. * debian/control: + Adapt description to also mention KDE 5. + Build-Depend on libkf5plasma-dev and libkf5i18n-dev, with a fallback to diff --git a/x2goplasmabindings.spec b/x2goplasmabindings.spec index 4ee098a..0c13c3f 100644 --- a/x2goplasmabindings.spec +++ b/x2goplasmabindings.spec @@ -34,6 +34,12 @@ BuildRequires: cmake(KF5I18n) BuildRequires: cmake(Qt5) BuildRequires: cmake(Qt5Quick) BuildRequires: cmake(Qt5Core) +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: kf5-rpm-macros +%endif +%if 0%{?suse_version} +BuildRequires: kf5umbrella +%endif %else %if 0%{?rhel} BuildRequires: kdelibs4-devel -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goplasmabindings. commit e4b0b6409fd7f12a9b4446034e9d1cd699f6ab90 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Aug 7 21:03:57 2023 +0200 debian/changelog: move changes to x2goplasmabindings.spec to own section. --- debian/changelog | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index c99979e..91e324c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,6 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (3.0.2.3): - - x2goplasmabindings.spec: prepare for Plasma 5 support. - po/CMakeLists.txt: add reverse domain name notation to catalog name. - CMakeLists.txt: add support for Plasma 5, rename plasmoid to org.x2go.plasmoid where applicable. @@ -14,16 +13,6 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - CMakeLists.txt: rename project to plasma_applet_org.x2go.plasmoid. - /: add package/metadata.json, created with desktoptojson (mostly) with an unknown key removed. - - x2goplasmabindings.spec: stop duplicating Group tag. - - x2goplasmabindings.spec: fix typo in %else directive. - - x2goplasmabindings.spec: use cmake()-based BR where appropriate, add - KF5I18n BR. - - x2goplasmabindings.spec: fix short description. - - x2goplasmabindings.spec: pass -DUSE_PLASMA5=OFF if we build for KDE 4 - and add a guard comment to fix potential problems in the future. - - x2goplasmabindings.spec: support older KDE4-only RHEL-based - distributions by depending upon kdelibs4-devel. - - x2goplasmabindings.spec: add cmake(Qt5{,Quick,Core}) BRs. - CMakeLists.txt: fix Qt5 package name. - CMakeLists.txt: include ECMInstallIcons module. - /: add plasma_compat.h, defining the helper macro @@ -37,13 +26,24 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - /: add x2goplasmoidkf5.cpp, developed by Robert Tari, C++ part of a new KF5-based implementation. - /: add COPYING.GPL3. - - x2goplasmabindings.spec: fix License: tag, add COPYING and COPYING.GPL3 - to either %license or %doc macros in %files section. - CMakeLists.txt: only build x2goplasmoidkf5.cpp in Plasma5 mode. - package/metadata.json: add Robert Tari to authors. - package/contents/ui: add main.qml, also provided by Robert Tari. - CMakeLists.txt: rework building of org.x2go.plasmoid library in Plasma5 mode, based upon QML. + * x2goplasmabindings.spec: + + Prepare for Plasma 5 support. + + Stop duplicating Group tag. + + Fix typo in %else directive. + + Use cmake()-based BR where appropriate, add KF5I18n BR. + + Fix short description. + + Pass -DUSE_PLASMA5=OFF if we build for KDE 4 and add a guard comment to + fix potential problems in the future. + + Support older KDE4-only RHEL-based distributions by depending upon + kdelibs4-devel. + + Add cmake(Qt5{,Quick,Core}) BRs. + + Fix License: tag, add COPYING and COPYING.GPL3 to either %license or + %doc macros in %files section. * debian/control: + Adapt description to also mention KDE 5. + Build-Depend on libkf5plasma-dev and libkf5i18n-dev, with a fallback to -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goplasmabindings. commit eb21968c7ef7fe405c3dd43e8ec206e0ddd127fd Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Aug 7 21:09:33 2023 +0200 debian/control: add BD for extra-cmake-modules for ECMQmlModule support. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 669b1ad..79b9c54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium kdelibs5-dev, which doesn't exist any longer past-buster. + Pull in lsb-release as BD, needed for debian/rules. + Add BD for qtdeclarative5-dev and qtbase5-dev or qtbase5-gles-dev. + + Add BD for extra-cmake-modules for ECMQmlModule support. * debian/rules: + Add Plasma 4/5 bridge based on distro version and pass down to build system. diff --git a/debian/control b/debian/control index 8b44344..121c8d1 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: libkf5plasma-dev | kdelibs5-dev, qtdeclarative5-dev, qtbase5-dev | qtbase5-gles-dev, + extra-cmake-modules Standards-Version: 3.9.5 Homepage: https://code.x2go.org/releases/source/x2goplasmabindings Vcs-Git: git://code.x2g.org/x2goplasmabindings.git -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
-
git-admin＠x2go.org