The branch, master has been updated via fb18027c137ad896c234f80144d775b98980fd92 (commit) from 2cdcd7006394cab5b0a0d73416d0502c2a691012 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fb18027c137ad896c234f80144d775b98980fd92 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Dec 11 09:25:10 2013 +0100 debian/rules, x2goadmincenter/Makefile: Harden the build process. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/rules | 6 +++++- x2goadmincenter/Makefile | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0e6f9b2..fe26957 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low + Priority: optional. + Replace LDAP support by session brokerage support in LONG_DESCRIPTION. + Update SYNOPSIS fields and LONG_DESCRIPTION fields. + * debian/rules, x2goadmincenter/Makefile: + + Harden the build process. * debian/source/format: + Switch to format 1.0. * x2goadmincenter.spec: diff --git a/debian/rules b/debian/rules index d569055..bbab11e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,11 @@ #!/usr/bin/make -f +export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + %: dh $@ override_dh_auto_install: - diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index 1f30a43..55d0112 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -33,11 +33,11 @@ build-indep: build_man build_admincenter: $(LRELEASE_BINARY) x2goadmincenter.pro - mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && $(QMAKE_BINARY) ../x2goadmincenter.pro + mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goadmincenter.pro cd $(BUILD_DIR) && $(MAKE) build_plugins: - for module in `ls $(CURDIR)/modules`; do cd $(CURDIR)/modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) $$module.pro && make && cd - 1>/dev/null; done + for module in `ls $(CURDIR)/modules`; do cd $(CURDIR)/modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" $$module.pro && make && cd - 1>/dev/null; done build_man: $(MAKE) -f Makefile.man2html build hooks/post-receive -- x2goadmincenter.git (X2Go Administration Center) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goadmincenter.git" (X2Go Administration Center).