[X2Go-Commits] [x2goplasmabindings] 03/05: debian/rules: add USE_DESKTOP_FILE selector to support older systems.
git-admin at x2go.org
git-admin at x2go.org
Fri Aug 11 05:55:02 CEST 2023
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goplasmabindings.
commit 4e193fd5b3a02d9b0e98f80dbe4f43d35a38e243
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Aug 11 05:24:52 2023 +0200
debian/rules: add USE_DESKTOP_FILE selector to support older systems.
---
debian/changelog | 1 +
debian/rules | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index bdc6b2f..21e0b79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium
+ Fix override_dh_auto_configure rule/dh_auto_configure call.
+ Select Ubuntu 16.04 (Xenial) as the first version to use the Plasma 5
code.
+ + Add USE_DESKTOP_FILE selector to support older systems.
* debian/copyright:
+ Add information for x2goplasmoidkf5.cpp, which is GPL-3.0-only.
+ Add information for package/contents/ui/main.qml.
diff --git a/debian/rules b/debian/rules
index f552160..6171413 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ VENDOR_DEBIAN :=
VENDOR_UBUNTU :=
USE_PLASMA5 := OFF
+USE_DESKTOP_FILE := OFF
# Setting these disables autodetection.
FORCE_VENDOR ?=
@@ -86,6 +87,10 @@ ifeq ($(VENDOR_DEBIAN),yes)
ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER) >= 10 )) && echo '"'"'yes'"'"),yes)
USE_PLASMA5 = ON
endif
+ifeq ($(VENDOR_DEBIAN),yes)
+ ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER) < 12 )) && echo '"'"'yes'"'"),yes)
+ USE_DESKTOP_FILE = ON
+ endif
else
ifeq ($(VENDOR_UBUNTU),yes)
# Example of how to use major and minor as a selector, we currently won't need
@@ -98,6 +103,9 @@ else
ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) >= 16 )) && echo '"'"'yes'"'"),yes)
USE_PLASMA5 = ON
endif
+ ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) < 21 )) && echo '"'"'yes'"'"),yes)
+ USE_DESKTOP_FILE = ON
+ endif
endif
endif
@@ -105,4 +113,4 @@ endif
dh $@
override_dh_auto_configure:
- dh_auto_configure -- -DUSE_PLASMA5=$(USE_PLASMA5)
+ dh_auto_configure -- -DUSE_PLASMA5=$(USE_PLASMA5) -DUSE_DESKTOPFILE=$(USE_DESKTOP_FILE)
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
More information about the x2go-commits
mailing list