[X2Go-Commits] x2godesktopsharing.git - master (branch) updated: 3.1.1.0-21-g2403383
X2Go dev team
git-admin at x2go.org
Wed Dec 18 09:10:30 CET 2013
The branch, master has been updated
via 2403383f0d77e47248678cf98c1eaa151069385d (commit)
from 9eb787eba8bed8ec171a23cff36f40ea5cad591f (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 2403383f0d77e47248678cf98c1eaa151069385d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Dec 18 09:10:26 2013 +0100
Run lrelease-qt4 before running qmake-qt4.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2godesktopsharing.spec | 2 ++
2 files changed, 3 insertions(+)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 37c4066..24f2191 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ x2godesktopsharing (3.1.1.1-0x2go1) UNRELEASED; urgency=low
project. (Thanks to the Fedora package maintainers).
+ Conditional dependency on sysvinit-tools (EPEL) or procps-ng (Fedora) to
get the pidof binary installed.
+ + Run lrelease-qt4 before running qmake-qt4.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sat, 08 Jun 2013 01:13:44 +0200
diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec
index 38ad2e0..e0583d1 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -43,8 +43,10 @@ a local X11 session.
%build
%if 0%{?el5}
+%{_libdir}/qt4/bin/lrelease
%{_libdir}/qt4/bin/qmake
%else
+lrelease-qt4
qmake-qt4
%endif
make %{?_smp_mflags}
hooks/post-receive
--
x2godesktopsharing.git (Desktop Sharing for X2Go)
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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).
More information about the x2go-commits
mailing list