This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gomatebindings. from 2d06515 debian/control: replace explicit GTK library dependency with some generated substitution variable. new 0329318 debian/control: add explicit dependency on bash (for arithmetic operations in debian/rules file.) new cac3931 debian/rules: use bash for arithmetic operations, not supported by sh. new a49fce3 x2gomatebindings.spec: switch to use -symbolic icons on OpenSUSE 13.2 and 42.1. new 0c885ff x2gomatebindings.spec: prepare GTK library version switching and hardcode GTK 2 for now. 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 | 5 +++++ debian/control | 1 + debian/rules | 10 ++++++---- x2gomatebindings.spec | 12 ++++++------ 4 files changed, 18 insertions(+), 10 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 0329318fe394160d7768df97b15cafdfb52b6d77 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 03:20:22 2016 +0200 debian/control: add explicit dependency on bash (for arithmetic operations in debian/rules file.) --- debian/changelog | 2 ++ debian/control | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index d465a2c..928bcac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low but who knows...) - Replace explicit GTK library dependency with some generated substitution variable. + - Add explicit dependency on bash (for arithmetic operations in + debian/rules file.) * debian/rules: - Add per-distro and per-version substitution variable for GTK library version selection. diff --git a/debian/control b/debian/control index 51e192a..68d8520 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: sed, coreutils, lsb-release, + bash, Standards-Version: 3.9.5 Homepage: http://code.x2go.org/releases/source/x2gomatebindings Vcs-Git: git://code.x2go.org/x2gomatebindings.git -- 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 cac39313ce18a93dc26a47454672905c686baae8 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 03:22:40 2016 +0200 debian/rules: use bash for arithmetic operations, not supported by sh. --- debian/changelog | 1 + debian/rules | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 928bcac..07bbf7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,7 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low * debian/rules: - Add per-distro and per-version substitution variable for GTK library version selection. + - Use bash for arithmetic operations, not supported by sh. -- X2Go Release Manager <git-admin@x2go.org> Tue, 10 Feb 2015 23:48:43 +0100 diff --git a/debian/rules b/debian/rules index 2ce773f..433885e 100755 --- a/debian/rules +++ b/debian/rules @@ -4,22 +4,24 @@ 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') SUBSTVARS = -Vdist:Depends="libgtk-2.0-bin" USE_GTK = 2.0 -ifeq ($(shell (( $(RELEASE_VER) >= 9 )) && echo yes),yes) +ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER) >= 9 )) && echo yes'),yes) SUBSTVARS = -Vdist:Depends="libgtk-3.0-bin" USE_GTK = 3.0 endif -else ifeq($(shell dpkg-vendor --is Ubuntu && echo yes),yes) +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') SUBSTVARS = -Vdist:Depends="libgtk-2.0-bin" USE_GTK = 2.0 -ifeq ($(shell (( $(RELEASE_VER_MAJOR) >= 16 )) && echo yes),yes) -ifeq ($(shell (( $(RELEASE_VER_MINOR) >= 10 )) && 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 endif endif +endif %: dh $@ -- 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 a49fce31872de0466c7073a2eee2c40aa1b6a499 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 03:50:01 2016 +0200 x2gomatebindings.spec: switch to use -symbolic icons on OpenSUSE 13.2 and 42.1. --- debian/changelog | 1 + x2gomatebindings.spec | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07bbf7e..e36b6fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low mate-menus. - Add dependency upon gnome-icon-theme-symbolic for OpenSuSE Leap 42.1, OpenSuSE 13.2 and SLE{S,D} 12. + - Switch to use -symbolic icons on OpenSUSE 13.2 and 42.1. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Whitespace only. diff --git a/x2gomatebindings.spec b/x2gomatebindings.spec index ba900d3..300915b 100644 --- a/x2gomatebindings.spec +++ b/x2gomatebindings.spec @@ -96,11 +96,10 @@ install -p -m 644 VERSION.x2gomatebindings %{buildroot}%{_datadir}/x2go/versions mkdir -p %{buildroot}%{_datadir}/{applications,icons/mate/scalable/mimetypes,mime/packages} desktop-file-install --dir %{buildroot}%{_datadir}/applications/ share/applications/x2gocaja.desktop desktop-file-install --dir %{buildroot}%{_datadir}/applications/ share/applications/x2gosuspend-mate.desktop -%if 0%{?suse_version} && 0%{?suse_version} >= 1320 -install -p -m 644 share/icons/mate/scalable/mimetypes/drive*.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/ -ln -s -f drive-optical.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfscdrom-x2go-mate.svg -ln -s -f drive-harddisk.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfsdisk-x2go-mate.svg -ln -s -f drive-removable-media.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfsremovable-x2go-mate.svg +%if 0%{?suse_version} && 0%{?suse_version} >= 1315 +ln -s -f drive-optical-symbolic.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfscdrom-x2go-mate.svg +ln -s -f drive-harddisk-symbolic.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfsdisk-x2go-mate.svg +ln -s -f drive-removable-media-symbolic.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfsremovable-x2go-mate.svg %else ln -s -f ../../../gnome/scalable/devices/drive-harddisk.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfsdisk-x2go-mate.svg ln -s -f ../../../gnome/scalable/devices/drive-removable-media.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfsremovable-x2go-mate.svg -- 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 0c885ff2c46264cb5fcbd7fb597e12b8dfa42200 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 03:51:16 2016 +0200 x2gomatebindings.spec: prepare GTK library version switching and hardcode GTK 2 for now. --- debian/changelog | 1 + x2gomatebindings.spec | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e36b6fd..ce3e65d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low - Add dependency upon gnome-icon-theme-symbolic for OpenSuSE Leap 42.1, 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. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Whitespace only. diff --git a/x2gomatebindings.spec b/x2gomatebindings.spec index 300915b..853b343 100644 --- a/x2gomatebindings.spec +++ b/x2gomatebindings.spec @@ -80,7 +80,8 @@ MATE desktops. if [ ! -e configure ]; then ./autogen.sh; fi; -%configure +# Remember to switch to --with-gtk=3.0 once OpenSuSE already provides a newer MATE version compiled against GTK 3. +%configure --with-gtk=2.0 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