[X2Go-Commits] [x2gomatebindings] 02/03: debian/: Drop gtk-2.0 / gtk-3 selection logic. MATE is on GTK+-3 since Debian 10 now. Support for earlier Debian version has been dropped.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gomatebindings.

commit b0244c3f930df47f455550bad28c21f2dea26afb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jan 4 19:59:41 2024 +0100

    debian/: Drop gtk-2.0 / gtk-3 selection logic. MATE is on GTK+-3 since Debian 10 now. Support for earlier Debian version has been dropped.
---
 debian/control |  1 +
 debian/rules   | 35 +----------------------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/debian/control b/debian/control
index a2a7790..7523ed7 100644
--- a/debian/control
+++ b/debian/control
@@ -39,6 +39,7 @@ Depends:
  mate-session-manager (>= 1.6.0),
  caja (>= 1.6.0),
  gnome-colors-common,
+ libgtk-3-bin,
 Conflicts:
  x2gognomebindings (<< 2.0.2.0),
 Breaks:
diff --git a/debian/rules b/debian/rules
index 0093a80..0a79ecd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,38 +1,5 @@
 #!/usr/bin/make -f
 
-RELEASE_VER = 0
-RELEASE_VER_MAJOR = 0
-RELEASE_VER_MINOR = 0
-SUBSTVARS = -Vdist:Depends="libgtk2.0-bin"
-USE_GTK = 2.0
-
-ifeq ($(shell { dpkg-vendor --is Debian && echo yes; } || { dpkg-vendor --is Raspbian && echo yes; }),yes)
-	RELEASE_VER = $(shell /usr/bin/lsb_release -r | /bin/sed -e 's/[	 ]*//g' | /usr/bin/cut -d ':' -f '2' | /usr/bin/cut -d '.' -f '1')
-# Let's fake testing's and unstable's "release version"...
-ifeq ($(RELEASE_VER),testing)
-	RELEASE_VER = 999
-endif
-ifeq ($(RELEASE_VER),unstable)
-	RELEASE_VER = 9999
-endif
-ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER) >= 9 )) && echo yes'),yes)
-	SUBSTVARS = -Vdist:Depends="libgtk-3-bin"
-	USE_GTK = 3.0
-endif
-else ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes)
-	RELEASE_VER_MAJOR = $(shell /usr/bin/lsb_release -r | /bin/sed -e 's/[	 ]*//g' | /usr/bin/cut -d ':' -f '2' | /usr/bin/cut -d '.' -f '1')
-	RELEASE_VER_MINOR = $(shell /usr/bin/lsb_release -r | /bin/sed -e 's/[	 ]*//g' | /usr/bin/cut -d ':' -f '2' | /usr/bin/cut -d '.' -f '2')
-ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) == 16 )) && echo yes'),yes)
-ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MINOR) >= 10 )) && echo yes'),yes)
-	SUBSTVARS = -Vdist:Depends="libgtk-3-bin"
-	USE_GTK = 3.0
-endif
-else ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) > 16 )) && echo yes'),yes)
-	SUBSTVARS = -Vdist:Depends="libgtk-3-bin"
-	USE_GTK = 3.0
-endif
-endif
-
 %:
 	dh $@
 
@@ -41,7 +8,7 @@ override_dh_auto_configure:
 	cp /usr/share/misc/config.guess .
 	NOCONFIGURE=1 ./autogen.sh
 	dh_auto_configure $(DHFLAGS) -- \
-		--with-gtk=$(USE_GTK)
+		--with-gtk=3.0
 
 override_dh_auto_install:
 	make -C po DESTDIR=../debian/x2gomatebindings install

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gomatebindings.git