This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gomatebindings. from 45e3589 debian/control: maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. new 5a506ca x2gomatebindings.spec: add dependency upon gnome-icon-theme-symbolic for OpenSuSE Leap 42.1, OpenSuSE 13.2 and SLE{S,D} 12. new cd66cb2 debian/control: whitespace only. new be5376f configure.ac: make GTK version selectable. new b09f65f debian/rules: add per-distro and per-version substitution variable for GTK library version selection. new d704137 debian/control: add new build dependencies (should already be fulfilled by base system, but who knows...) new 2d06515 debian/control: replace explicit GTK library dependency with some generated substitution variable. The 6 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: configure.ac | 23 +++++++++++++++++++++-- debian/changelog | 12 ++++++++++++ debian/control | 9 ++++++--- debian/rules | 27 ++++++++++++++++++++++++++- x2gomatebindings.spec | 6 ++++++ 5 files changed, 71 insertions(+), 6 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 5a506ca145c726b268e959062db47a2eb8f60c72 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 9 23:16:46 2016 +0200 x2gomatebindings.spec: add dependency upon gnome-icon-theme-symbolic for OpenSuSE Leap 42.1, OpenSuSE 13.2 and SLE{S,D} 12. --- debian/changelog | 2 ++ x2gomatebindings.spec | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index a1751d7..e628db3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low leading to a build failure. - The last change should have really been for mate-menus-branding, not mate-menus. + - Add dependency upon gnome-icon-theme-symbolic for OpenSuSE Leap 42.1, + OpenSuSE 13.2 and SLE{S,D} 12. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. diff --git a/x2gomatebindings.spec b/x2gomatebindings.spec index 35a3212..ba900d3 100644 --- a/x2gomatebindings.spec +++ b/x2gomatebindings.spec @@ -16,6 +16,9 @@ Source1: %{name}-rpmlintrc BuildRequires: autoconf >= 2.57, automake >= 1.7.6 BuildRequires: mate-common BuildRequires: gnome-icon-theme +%if 0%{?suse_version} >= 1315 +BuildRequires: gnome-icon-theme-symbolic +%endif BuildRequires: mate-desktop-devel BuildRequires: mate-file-manager-devel BuildRequires: pkgconfig @@ -43,6 +46,9 @@ Requires: desktop-file-utils Requires: mate-session-manager Requires: caja >= 1.6.0 Requires: gnome-icon-theme +%if 0%{?suse_version} >= 1315 +Requires: gnome-icon-theme-symbolic +%endif # Especially (but not only) for directory owning. Requires: filesystem -- 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 b09f65f5598145472b6e721c477cb63656d6b689 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 03:07:53 2016 +0200 debian/rules: add per-distro and per-version substitution variable for GTK library version selection. --- debian/changelog | 3 +++ debian/rules | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b35b64f..2dd0cd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Whitespace only. + * debian/rules: + - Add per-distro and per-version substitution variable for GTK library + version selection. -- X2Go Release Manager <git-admin@x2go.org> Tue, 10 Feb 2015 23:48:43 +0100 diff --git a/debian/rules b/debian/rules index 48a47bc..2ce773f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,26 @@ #!/usr/bin/make -f +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) + SUBSTVARS = -Vdist:Depends="libgtk-3.0-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') + 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) + SUBSTVARS = -Vdist:Depends="libgtk-3.0-bin" + USE_GTK = 3.0 +endif +endif +endif + %: dh $@ @@ -7,7 +28,8 @@ override_dh_auto_configure: cp /usr/share/misc/config.sub . cp /usr/share/misc/config.guess . ./autogen.sh - dh_auto_configure + dh_auto_configure $(DHFLAGS) -- \ + --with-gtk=$(USE_GTK) override_dh_auto_install: make -C po DESTDIR=../debian/x2gomatebindings install @@ -23,3 +45,6 @@ override_dh_auto_clean: rm -f extension/Makefile.in rm -f config.h.in intltool-*.in rm -f compile + +override_dh_gencontrol: + dh_gencontrol -- $(SUBSTVARS) -- 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 d7041373f4cd34400e5b466955b57099fb3afb68 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 03:10:16 2016 +0200 debian/control: add new build dependencies (should already be fulfilled by base system, but who knows...) --- debian/changelog | 2 ++ debian/control | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2dd0cd1..8e38f4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Whitespace only. + - Add new build dependencies (should already be fulfilled by base system, + but who knows...) * debian/rules: - Add per-distro and per-version substitution variable for GTK library version selection. diff --git a/debian/control b/debian/control index ce7c116..c5b132b 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,9 @@ Build-Depends: pkg-config, libdconf-dev, libstartup-notification0-dev, + sed, + coreutils, + lsb-release, 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 cd66cb26884ddf6e8d79e7a41c108b20def659d1 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 03:00:06 2016 +0200 debian/control: whitespace only. --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e628db3..7dd45e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low OpenSuSE 13.2 and SLE{S,D} 12. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. + - Whitespace only. -- X2Go Release Manager <git-admin@x2go.org> Tue, 10 Feb 2015 23:48:43 +0100 diff --git a/debian/control b/debian/control index 2c7290c..ce7c116 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,11 @@ Source: x2gomatebindings -Section: x11 +Section: x11 Priority: optional Maintainer: X2Go Developers <x2go-dev@lists.x2go.org> Uploaders: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, -Build-Depends: +Build-Depends: autotools-dev, debhelper (>= 7.0.50~), intltool, -- 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 be5376fb897044d78c66230fe30573c92ee28fee Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 03:01:43 2016 +0200 configure.ac: make GTK version selectable. --- configure.ac | 23 +++++++++++++++++++++-- debian/changelog | 2 ++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index cc24ae0..e82004e 100644 --- a/configure.ac +++ b/configure.ac @@ -23,17 +23,36 @@ fi dnl -------------------------------------------------- GLIB_REQUIRED=2.4.0 -GTK_REQUIRED=2.4.0 MATE_REQUIRED=1.6.0 CAJA_EXTENSION=1.6.0 GOBJECT_REQUIRED=2.4.0 +AC_MSG_CHECKING([GTK+ version]) +AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])], + [case "$with_gtk" in + 2.0|3.0) ;; + *) AC_MSG_ERROR([invalid gtk version specified]) ;; + esac], + [with_gtk=2.0]) +AC_MSG_RESULT([$with_gtk]) + +case "$with_gtk" in + 2.0) GTK_API_VERSION=2.0 + GTK_REQUIRED=2.4.0 + ;; + 3.0) GTK_API_VERSION=3.0 + GTK_REQUIRED=3.0.0 + ;; +esac +AC_SUBST(GTK_API_VERSION) + AC_SUBST(GLIB_REQUIRED) AC_SUBST(GTK_REQUIRED) PKG_CHECK_MODULES(CAJA_X2GOUMOUNT, \ glib-2.0 >= $GLIB_REQUIRED \ - gtk+-2.0 >= $GTK_REQUIRED \ + gtk+-$GTK_API_VERSION >= $GTK_REQUIRED \ gmodule-2.0 >= $GLIB_REQUIRED \ mate-desktop-2.0 >= $MATE_REQUIRED) diff --git a/debian/changelog b/debian/changelog index 7dd45e7..b35b64f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low "Error: Package: x2gomatebinding ... Requires: or" [ Mihai Moldovan ] + * New upstream version (0.0.1.4): + - configure.ac: make GTK version selectable. * x2gomatebindings.spec: - Add run and build time dependency: filesystem. - Only own files, do not blindly own complete (and alien!) directories. -- 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 2d06515f32a73c7b095175b544e87de2e8cce7f8 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 03:10:41 2016 +0200 debian/control: replace explicit GTK library dependency with some generated substitution variable. --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8e38f4c..d465a2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low - Whitespace only. - Add new build dependencies (should already be fulfilled by base system, but who knows...) + - Replace explicit GTK library dependency with some generated substitution + variable. * debian/rules: - Add per-distro and per-version substitution variable for GTK library version selection. diff --git a/debian/control b/debian/control index c5b132b..51e192a 100644 --- a/debian/control +++ b/debian/control @@ -28,6 +28,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + ${dist:Depends}, x2goserver (>=4.0.1.4-0~), x2goserver-extensions, zenity, @@ -35,7 +36,6 @@ Depends: desktop-file-utils, mate-session-manager (>= 1.6.0), caja (>= 1.6.0), - libgtk2.0-bin | libgtk-3-bin, gnome-colors-common, Conflicts: x2gognomebindings (<< 2.0.2.0), -- 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