[X2Go-Commits] [x2gomatebindings] 01/04: debian/rules: fix Ubuntu versioning override. It's uglier now, but there's no way around that.
git-admin at x2go.org
git-admin at x2go.org
Sat Jun 11 16:54:05 CEST 2016
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 at 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 at 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
More information about the x2go-commits
mailing list