x2goclient.git - build-baikal (branch) updated: 4.0.1.1-60-g829032b - x2go-commits

8 Jan 2014

The branch, build-baikal has been updated
       via  829032b3c3eef55cf6c77d400305c49fdc137db4 (commit)
      from  e4a8fa5bfe6f5d326147f91af60588863cd2b19d (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Makefile         |    2 +-
 debian/changelog |    1 +
 x2goclient.spec  |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/Makefile b/Makefile
index f007c72..1185888 100755
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ SHAREDIR=$(PREFIX)/share
 MANDIR=$(SHAREDIR)/man
 MOZPLUGDIR=$(PREFIX)/lib/mozilla/plugins
 QMAKE_BINARY=qmake-qt4
-LRELEASE_BINARY=lrelease
+LRELEASE_BINARY=lrelease-qt4
 
 all: build
 
diff --git a/debian/changelog b/debian/changelog
index 68bfaa6..5b02cb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low
     + For EPEL-5 builds: replace full path to qmake-qt4 and lrelease.
     + Split up package into bin:packages: x2goclient, x2goplugin,
       x2goplugin-provider.
+    + Make sure lrelease-qt4 is executed (not just lrelease).
 
   [ Ricardo Díaz Martín ]
   * New upstream versino (4.0.1.2):
diff --git a/x2goclient.spec b/x2goclient.spec
index 5edf0e5..ca1dc81 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -95,7 +95,7 @@ sed -i -e 's/-o root -g root//' Makefile
 sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile
 %if 0%{?el5}
 sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@%{_libdir}/qt4/bin/qmake@' Makefile
-sed -i -e '/^LRELEASE_BINARY=/s@lrelease@%{_libdir}/qt4/bin/lrelease@' Makefile
+sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@%{_libdir}/qt4/bin/lrelease@' Makefile
 %endif
 %if 0%{?fedora} >= 19 || 0%{?rhel} >= 6
 # Use system qtbrowserplugin


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

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 "x2goclient.git" (X2Go Client).

    