[X2Go-Commits] [x2godesktopsharing] 09/13: debian/rules: Run lrelease during auto-configure. Makes sure all resources are available for building the executable.
git-admin at x2go.org
git-admin at x2go.org
Mon Nov 12 14:32:34 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2godesktopsharing.
commit d7e12905b16aca125806ab4c8dee5dd397b59c62
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Nov 11 20:59:43 2018 +0100
debian/rules: Run lrelease during auto-configure. Makes sure all resources are available for building the executable.
---
debian/changelog | 2 ++
debian/rules | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index ec559b9..e05cef0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium
properly after build (this really needs to go into the qmake
.pro file, but debian/rules is easier...).
+ Pass-through of compiler flags to qmake call.
+ + Run lrelease during auto-configure. Make sure all resources are available
+ for building the executable.
* debian/x2godesktopsharing.menu:
+ Drop file. The menu file is not allowed if a .desktop file is present.
* debian/<config>:
diff --git a/debian/rules b/debian/rules
index da63bb0..bddc7fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,11 @@ export QT_SELECT=qt5
%:
dh $@
-override_dh_auto_build:
+override_dh_auto_configure:
lrelease x2godesktopsharing.pro
+ dh_auto_configure
+
+override_dh_auto_build:
qmake QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" x2godesktopsharing.pro
override_dh_install:
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
More information about the x2go-commits
mailing list