This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gomatebindings. from 74f11e3 debian/rules: if encountering the "unstable" distro version, set it to a fake 9999 version. new bce515d debian/rules: fix Ubuntu versioning override. It's uglier now, but there's no way around that. new 6da9ac4 debian/rules: add explicit "printf-style" debugging, hoping it will actually show up. new 3b45d99 x2gomatebindings.spec: re-add explicit GTK library build dependencies. new 802d980 x2gomatebindings.spec: switch to GTK 3 for Fedora 25 and up. The 4 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 | 6 ++++++ debian/rules | 14 +++++++++++++- x2gomatebindings.spec | 20 ++++++++++++++++---- 3 files changed, 35 insertions(+), 5 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2gomatebindings.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gomatebindings.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gomatebindings. commit bce515d71380af9c75e9af80470153bca6f1f839 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 16:24:59 2016 +0200 debian/rules: fix Ubuntu versioning override. It's uglier now, but there's no way around that. --- debian/changelog | 2 ++ debian/rules | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c5b8fed..0d6387a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,8 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low parenthesis. - If encountering the "unstable" distro version, set it to a fake 9999 version. + - Fix Ubuntu versioning override. It's uglier now, but there's no way + around that. -- X2Go Release Manager <git-admin@x2go.org> Tue, 10 Feb 2015 23:48:43 +0100 diff --git a/debian/rules b/debian/rules index 57dfd77..33085eb 100755 --- a/debian/rules +++ b/debian/rules @@ -17,11 +17,14 @@ else ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes) 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') SUBSTVARS = -Vdist:Depends="libgtk-2.0-bin" USE_GTK = 2.0 -ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) >= 16 )) && echo yes'),yes) +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.0-bin" USE_GTK = 3.0 endif +else ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) > 16 )) && echo yes'),yes) + SUBSTVARS = -Vdist:Depends="libgtk-3.0-bin" + USE_GTK = 3.0 endif endif -- Alioth's /srv/git/code.x2go.org/x2gomatebindings.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gomatebindings.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gomatebindings. commit 6da9ac4842bc0b32a065acd9c55e3a23f53e07c6 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 16:48:38 2016 +0200 debian/rules: add explicit "printf-style" debugging, hoping it will actually show up. --- debian/changelog | 1 + debian/rules | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0d6387a..d84b816 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,7 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low version. - Fix Ubuntu versioning override. It's uglier now, but there's no way around that. + - Add explicit "printf-style" debugging, hoping it will actually show up. -- X2Go Release Manager <git-admin@x2go.org> Tue, 10 Feb 2015 23:48:43 +0100 diff --git a/debian/rules b/debian/rules index 33085eb..ea8752c 100755 --- a/debian/rules +++ b/debian/rules @@ -2,29 +2,38 @@ ifeq ($(shell dpkg-vendor --is Debian && 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') + @echo 'initial RELEASE_VER in Debian vendor section: $(RELEASE_VER)' # Let's fake unstable's "release version"... ifeq ($(RELEASE_VER),unstable) RELEASE_VER = 9999 + @echo 'unstable detected, resetted RELEASE_VER to: $(RELEASE_VER)' endif SUBSTVARS = -Vdist:Depends="libgtk-2.0-bin" USE_GTK = 2.0 + @echo 'initialized USE_GTK with: $(USE_GTK)' ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER) >= 9 )) && echo yes'),yes) SUBSTVARS = -Vdist:Depends="libgtk-3.0-bin" USE_GTK = 3.0 + @echo 'overriding USE_GTK with version 3, check: $(USE_GTK)' 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') + @echo 'initial RELEASE_VER_MAJOR in Ubuntu vendor section: $(RELEASE_VER_MAJOR)' + @echo 'initial RELEASE_VER_MINOR in Ubuntu vendor section: $(RELEASE_VER_MINOR)' SUBSTVARS = -Vdist:Depends="libgtk-2.0-bin" USE_GTK = 2.0 + @echo 'initialized USE_GTK with: $(USE_GTK)' 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.0-bin" USE_GTK = 3.0 + @echo 'overriding USE_GTK with version 3 in 16.10 branch, check: $(USE_GTK)' endif else ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) > 16 )) && echo yes'),yes) SUBSTVARS = -Vdist:Depends="libgtk-3.0-bin" USE_GTK = 3.0 + @echo 'overriding USE_GTK with version 3 in >16 branch, check: $(USE_GTK)' endif endif -- Alioth's /srv/git/code.x2go.org/x2gomatebindings.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gomatebindings.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gomatebindings. commit 3b45d99383622668c721f8d8acf4f2606e917b77 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 16:52:58 2016 +0200 x2gomatebindings.spec: re-add explicit GTK library build dependencies. Run-time dependencies should be handled automatically. --- debian/changelog | 2 ++ x2gomatebindings.spec | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index d84b816..050e9d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low OpenSuSE 13.2 and SLE{S,D} 12. - Switch to use -symbolic icons on OpenSUSE 13.2 and 42.1. - Prepare GTK library version switching and hardcode GTK 2 for now. + - Re-add explicit GTK library build dependencies. Run-time dependencies + should be handled automatically. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Whitespace only. diff --git a/x2gomatebindings.spec b/x2gomatebindings.spec index 853b343..2b2f855 100644 --- a/x2gomatebindings.spec +++ b/x2gomatebindings.spec @@ -38,6 +38,17 @@ BuildRequires: x2goserver-extensions BuildRequires: mate-menus BuildRequires: mate-icon-theme +%if 0%{?suse_version} +BuildRequires: pkgconfig(gtk+-2.0) +%endif +%if 0%{?fedora_version} +%if 0%{?fedora_version} >= 25 +BuildRequires: gtk3-devel +%else +BuildRequires: gtk2-devel +%endif +%endif + Requires: x2goserver >= 4.0.1.4 Requires: x2goserver-extensions Requires: zenity @@ -54,10 +65,6 @@ Requires: gnome-icon-theme-symbolic Requires: filesystem Requires: mate-icon-theme -# We also depend on gtk2 or gtk3. However, there does not appear to be -# a way to specify a dependency on gtk2 or gtk3, so let's assume that -# if packages like mate-menus are installed, then gtk2 or gtk3 are -# installed. %description X2Go is a server based computing environment with -- Alioth's /srv/git/code.x2go.org/x2gomatebindings.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gomatebindings.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gomatebindings. commit 802d9801a388c5123b2fa39b35003e66c9eeeec5 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 16:53:23 2016 +0200 x2gomatebindings.spec: switch to GTK 3 for Fedora 25 and up. --- debian/changelog | 1 + x2gomatebindings.spec | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 050e9d9..2ce0786 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low - Prepare GTK library version switching and hardcode GTK 2 for now. - Re-add explicit GTK library build dependencies. Run-time dependencies should be handled automatically. + - Switch to GTK 3 for Fedora 25 and up. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Whitespace only. diff --git a/x2gomatebindings.spec b/x2gomatebindings.spec index 2b2f855..8aae7e0 100644 --- a/x2gomatebindings.spec +++ b/x2gomatebindings.spec @@ -88,7 +88,12 @@ if [ ! -e configure ]; then ./autogen.sh; fi; # Remember to switch to --with-gtk=3.0 once OpenSuSE already provides a newer MATE version compiled against GTK 3. +# Fedora will switch to GTK 3 with FC25. +%if 0%{?fedora_version} && 0%{?fedora_version} >= 25 +%configure --with-gtk=3.0 +%else %configure --with-gtk=2.0 +%endif make %{?_smp_mflags}; -- Alioth's /srv/git/code.x2go.org/x2gomatebindings.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gomatebindings.git
-
git-admin＠x2go.org