[X2Go-Commits] [x2gomatebindings] 01/03: debian/rules: drop debugging output (which only leads to failing builds on all platforms) and consolidate default values.
git-admin at x2go.org
git-admin at x2go.org
Sat Jun 11 17:51:03 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 dffec2230b6929e1a2e09ca489982d3d61fa85fb
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Jun 11 17:11:26 2016 +0200
debian/rules: drop debugging output (which only leads to failing builds on all platforms) and consolidate default values.
---
debian/changelog | 2 ++
debian/rules | 19 ++++++-------------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2ce0786..fb6e131 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,8 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low
- 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.
+ - Drop debugging output (which only leads to failing builds on all
+ platforms) and consolidate default values.
-- 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 ea8752c..9af2f0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,39 +1,32 @@
#!/usr/bin/make -f
+RELEASE_VER = 0
+RELEASE_VER_MAJOR = 0
+RELEASE_VER_MINOR = 0
+SUBSTVARS = -Vdist:Depends="libgtk-2.0-bin"
+USE_GTK = 2.0
+
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
More information about the x2go-commits
mailing list