[X2Go-Commits] x2goadmincenter.git - master (branch) updated: db524c53fd8acead93420af769cb9cdfa090ca93

[X2Go dev team]

The branch, master has been updated
       via  db524c53fd8acead93420af769cb9cdfa090ca93 (commit)
      from  3d4d6546eea9650b7f4c13bf3ef70b2f94c72694 (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 db524c53fd8acead93420af769cb9cdfa090ca93
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 10 23:36:04 2013 +0100

    Build our .qm files on the fly. Don't store them in Git.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    1 +
 x2goadmincenter/Makefile                           |    4 ++--
 .../x2gogroupadmingui/x2gogroupadmingui_de.qm      |  Bin 4674 -> 0 bytes
 .../x2gouseradmingui/x2gouseradmingui_de.qm        |  Bin 6929 -> 0 bytes
 x2goadmincenter/x2goadmincenter_de.qm              |  Bin 4611 -> 0 bytes
 5 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadmingui_de.qm
 delete mode 100644 x2goadmincenter/modules/x2gouseradmingui/x2gouseradmingui_de.qm
 delete mode 100644 x2goadmincenter/x2goadmincenter_de.qm

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 48e7af8..69d0430 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low
     - Add .desktop file for X2Go Admin Center.
     - Provide PNG icon set for X2Go Admin Center (using X2Go Client icon for
       now).
+    - Build our .qm files on the fly. Don't store them in Git.
   * debian/control:
     + Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
     + Reduce build dependencies to a minimal set of packages.
diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile
index 82c2b60..8876f17 100755
--- a/x2goadmincenter/Makefile
+++ b/x2goadmincenter/Makefile
@@ -22,7 +22,7 @@ SHAREDIR=$(PREFIX)/share
 MANDIR=$(SHAREDIR)/man
 LIBDIR=$(PREFIX)/lib/x2goadmincenter
 QMAKE_BINARY=qmake-qt4
-LRELEASE_BINARY=lrelease
+LRELEASE_BINARY=lrelease-qt4
 
 all: build
 
@@ -38,7 +38,7 @@ build_admincenter:
 	cd $(BUILD_DIR) && $(MAKE)
 
 build_plugins:
-	for module in `ls modules`; do cd $(SRC_DIR)/modules/$$module && $(QMAKE_BINARY) $$module.pro && make; done
+	for module in `ls modules`; do cd $(SRC_DIR)/modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) $$module.pro && make; done
 
 build_man:
 	$(MAKE) -f Makefile.man2html build
diff --git a/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadmingui_de.qm b/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadmingui_de.qm
deleted file mode 100644
index b5cd6d1..0000000
Binary files a/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadmingui_de.qm and /dev/null differ
diff --git a/x2goadmincenter/modules/x2gouseradmingui/x2gouseradmingui_de.qm b/x2goadmincenter/modules/x2gouseradmingui/x2gouseradmingui_de.qm
deleted file mode 100644
index 76edc23..0000000
Binary files a/x2goadmincenter/modules/x2gouseradmingui/x2gouseradmingui_de.qm and /dev/null differ
diff --git a/x2goadmincenter/x2goadmincenter_de.qm b/x2goadmincenter/x2goadmincenter_de.qm
deleted file mode 100644
index d531055..0000000
Binary files a/x2goadmincenter/x2goadmincenter_de.qm and /dev/null differ


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).