x2go-commits December 2013

x2go-commits@lists.x2go.org

2 participants
2076 discussions

x2goadmincenter.git - master (branch) updated: c94ea7beb32b9724afcb06505194d2c7bdb01c2e
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via c94ea7beb32b9724afcb06505194d2c7bdb01c2e (commit) from 7e91a443654535f6efde5d9a6991c428183ebe51 (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 c94ea7beb32b9724afcb06505194d2c7bdb01c2e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 09:38:44 2013 +0100 remove .qm files during cleanm, add lost qt_de.qm back to git ----------------------------------------------------------------------- Summary of changes: x2goadmincenter/Makefile | 1 + .../qt_de.qm | 0 2 files changed, 1 insertion(+) copy x2goadmincenter/modules/{x2gogroupadmingui => x2gosessionadmingui}/qt_de.qm (100%) The diff of changes is: diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index 55d0112..8bbe1c7 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -47,6 +47,7 @@ clean: clean_admincenter clean_plugins clean_man find . -type f -name 'moc_*.cpp' -exec rm -vf {} + find . -type f -name 'ui_*.h' -exec rm -vf {} + find . -type f -name 'qrc_*.cpp' -exec rm -vf {} + + find . -type f -name 'x2goadmincenter_*.qm' -exec rm -vf {} + rm -f x2goadmincenter rm -f x2goadmincenter.tag diff --git a/x2goadmincenter/modules/x2gogroupadmingui/qt_de.qm b/x2goadmincenter/modules/x2gosessionadmingui/qt_de.qm similarity index 100% copy from x2goadmincenter/modules/x2gogroupadmingui/qt_de.qm copy to x2goadmincenter/modules/x2gosessionadmingui/qt_de.qm 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).

1 0

x2goadmincenter.git - master (branch) updated: fa72af6bf8a9f4b9e52e637fe37e0ace61620613
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via fa72af6bf8a9f4b9e52e637fe37e0ace61620613 (commit) from a3e81aed9757f68eb9662c1d535a15ccd2da4206 (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 fa72af6bf8a9f4b9e52e637fe37e0ace61620613 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 01:07:52 2013 +0100 Only ship one binary verson of qt_de.qm, the others ship is relative symlinks. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goadmincenter/modules/x2gogroupadmingui/qt_de.qm | Bin 157137 -> 14 bytes x2goadmincenter/modules/x2gouseradmingui/qt_de.qm | Bin 157137 -> 14 bytes 3 files changed, 2 insertions(+) mode change 100644 => 120000 x2goadmincenter/modules/x2gogroupadmingui/qt_de.qm mode change 100644 => 120000 x2goadmincenter/modules/x2gouseradmingui/qt_de.qm The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 564683c..0e6f9b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low now). - Build our .qm files on the fly. Don't store them in Git. - Rework x2goadmincenter/Makefile. + - Only ship one binary verson of qt_de.qm, the others ship is relative + symlinks. * debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Reduce build dependencies to a minimal set of packages. diff --git a/x2goadmincenter/modules/x2gogroupadmingui/qt_de.qm b/x2goadmincenter/modules/x2gogroupadmingui/qt_de.qm deleted file mode 100644 index 6b76d7b..0000000 Binary files a/x2goadmincenter/modules/x2gogroupadmingui/qt_de.qm and /dev/null differ diff --git a/x2goadmincenter/modules/x2gogroupadmingui/qt_de.qm b/x2goadmincenter/modules/x2gogroupadmingui/qt_de.qm new file mode 120000 index 0000000..62dc513 --- /dev/null +++ b/x2goadmincenter/modules/x2gogroupadmingui/qt_de.qm @@ -0,0 +1 @@ +../../qt_de.qm \ No newline at end of file diff --git a/x2goadmincenter/modules/x2gouseradmingui/qt_de.qm b/x2goadmincenter/modules/x2gouseradmingui/qt_de.qm deleted file mode 100644 index 6b76d7b..0000000 Binary files a/x2goadmincenter/modules/x2gouseradmingui/qt_de.qm and /dev/null differ diff --git a/x2goadmincenter/modules/x2gouseradmingui/qt_de.qm b/x2goadmincenter/modules/x2gouseradmingui/qt_de.qm new file mode 120000 index 0000000..62dc513 --- /dev/null +++ b/x2goadmincenter/modules/x2gouseradmingui/qt_de.qm @@ -0,0 +1 @@ +../../qt_de.qm \ No newline at end of file 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).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-62-g1c7a4f1
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 1c7a4f1aa2694eec916fe1e35998b931cd089f8f (commit) from 4d3c00fcbaf5f00664e37eb5c96327b0fc7788fe (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 1c7a4f1aa2694eec916fe1e35998b931cd089f8f Author: Mike DePaulo <mikedep333(a)gmail.com> Date: Tue Dec 10 18:57:55 2013 -0500 Change NSIS version string from 4.0.1.2-pre02 to 4.0.1.2 ----------------------------------------------------------------------- Summary of changes: nsis/x2goclient.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi index 3014b76..2099a6a 100755 --- a/nsis/x2goclient.nsi +++ b/nsis/x2goclient.nsi @@ -10,7 +10,7 @@ ;General RequestExecutionLevel admin - !define VERSION "4.0.1.2-pre02" + !define VERSION "4.0.1.2" Name "x2goclient-${VERSION}" Caption "x2goclient-${VERSION}" OutFile "x2goclient-${VERSION}-setup.exe" 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).

1 0

x2goadmincenter.git - master (branch) updated: a3e81aed9757f68eb9662c1d535a15ccd2da4206
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via a3e81aed9757f68eb9662c1d535a15ccd2da4206 (commit) from d397971d2d55d2f9bd959e95c4b1fa05fdf5fd04 (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 a3e81aed9757f68eb9662c1d535a15ccd2da4206 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 01:01:26 2013 +0100 fix for last commit ----------------------------------------------------------------------- Summary of changes: x2goadmincenter/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index dca53c3..895328a 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -37,7 +37,7 @@ build_admincenter: cd $(BUILD_DIR) && $(MAKE) build_plugins: - for module in `ls modules`; do cd $(SRC_DIR)/modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) $$module.pro && make; done + for module in `ls modules`; do cd modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) $$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).

1 0

x2goadmincenter.git - master (branch) updated: d397971d2d55d2f9bd959e95c4b1fa05fdf5fd04
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via d397971d2d55d2f9bd959e95c4b1fa05fdf5fd04 (commit) from bd42ae66c927db6f8bc2ef276aa4f23c70a22c2d (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 d397971d2d55d2f9bd959e95c4b1fa05fdf5fd04 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 00:42:20 2013 +0100 Rework x2goadmincenter/Makefile. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goadmincenter/Makefile | 46 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 36 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 69d0430..564683c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low - 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. + - Rework x2goadmincenter/Makefile. * debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Reduce build dependencies to a minimal set of packages. diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index 8876f17..dca53c3 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -1,10 +1,9 @@ #!/usr/bin/make -f -SRC_DIR=$(CURDIR) -BUILD_DIR=$(SRC_DIR)/.build -BUILD_BINARY=$(CLIENT_DIR)/x2goadmincenter +BUILD_DIR=.build +BUILD_BINARY=$(BUILD_DIR)/x2goadmincenter -PLUGINS_DIR=$(SRC_DIR)/plugins +PLUGINS_DIR=plugins SHELL=/bin/bash @@ -52,7 +51,7 @@ clean: clean_admincenter clean_plugins clean_man rm -f x2goadmincenter.tag clean_admincenter: - rm -fr $(CLIENT_DIR) + rm -fr $(BUILD_DIR) clean_plugins: rm -fr $(PLUGINS_DIR)/* @@ -64,22 +63,30 @@ install: install_admincenter install_plugins install_man install_admincenter: $(INSTALL_DIR) $(DESTDIR)$(BINDIR)/ - $(INSTALL_FILE) $(SRC_DIR)/desktop/x2goadmincenter.destop $(DESTDIR)$(SHAREDIR)/applications/x2goadmincenter.desktop - $(INSTALL_FILE) $(SRC_DIR)/icons/x2goadmincenter.xpm $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm + $(INSTALL_PROGRAM) $(BUILD_BINARY) $(DESTDIR)$(BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/applications/ + $(INSTALL_FILE) desktop/x2goadmincenter.destop $(DESTDIR)$(SHAREDIR)/applications/x2goadmincenter.desktop + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/ + $(INSTALL_FILE) icons/x2goadmincenter.xpm $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/ $(INSTALL_FILE) icons/128x128/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goadmincenter.png + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/ $(INSTALL_FILE) icons/16x16/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goadmincenter.png + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/ $(INSTALL_FILE) icons/32x32/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/x2goadmincenter.png + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/48x48/apps/ $(INSTALL_FILE) icons/48x48/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/48x48/apps/x2goadmincenter.png + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/ $(INSTALL_FILE) icons/64x64/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goadmincenter.png install_plugins: - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/ - $(INSTALL_FILE) $(PLUGINS_DIR)/* $(LIBDIR)/plugins/ + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/plugins/ + $(INSTALL_FILE) $(PLUGINS_DIR)/* $(DESTDIR)$(LIBDIR)/plugins/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 - $(INSTALL_FILE) $(SRC_DIR)/man/man8/x2goadmincenter.8 $(DESTDIR)$(MANDIR)/man1/x2goadmincenter.8 + $(INSTALL_FILE) man/man8/x2goadmincenter.8 $(DESTDIR)$(MANDIR)/man1/x2goadmincenter.8 gzip -f $(DESTDIR)$(MANDIR)/man8/x2goadmincenter.8 uninstall: uninstall_admincenter uninstall_plugins uninstall_man @@ -88,7 +95,24 @@ uninstall_admincenter: $(RM_FILE) $(BINDIR)/x2goadmincenter $(RM_FILE) $(SHAREDIR)/applications/x2goadmincenter.desktop $(RM_FILE) $(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm - $(RM_DIR) $(SHAREDIR)/x2goadmincenter/icons + $(RM_DIR) $(SHAREDIR)/x2goadmincenter/icons + $(RM_FILE) $(SHAREDIR)/icons/hicolor/128x128/apps/x2goadmincenter.png + $(RM_DIR) $(SHAREDIR)/icons/hicolor/128x128/apps/ + $(RM_DIR) $(SHAREDIR)/icons/hicolor/128x128/ + $(RM_FILE) $(SHAREDIR)/icons/hicolor/16x16/apps/x2goadmincenter.png + $(RM_DIR) $(SHAREDIR)/icons/hicolor/16x16/apps/ + $(RM_DIR) $(SHAREDIR)/icons/hicolor/16x16/ + $(RM_FILE) $(SHAREDIR)/icons/hicolor/32x32/apps/x2goadmincenter.png + $(RM_DIR) $(SHAREDIR)/icons/hicolor/32x32/apps/ + $(RM_DIR) $(SHAREDIR)/icons/hicolor/32x32/ + $(RM_FILE) $(SHAREDIR)/icons/hicolor/48x48/apps/x2goadmincenter.png + $(RM_DIR) $(SHAREDIR)/icons/hicolor/48x48/apps/ + $(RM_DIR) $(SHAREDIR)/icons/hicolor/48x48/ + $(RM_FILE) $(SHAREDIR)/icons/hicolor/64x64/apps/x2goadmincenter.png + $(RM_DIR) $(SHAREDIR)/icons/hicolor/64x64/apps/ + $(RM_DIR) $(SHAREDIR)/icons/hicolor/64x64/ + $(RM_DIR) $(SHAREDIR)/icons/hicolor/ + $(RM_DIR) $(SHAREDIR)/icons/ uninstall_plugins: $(RM_FILE) $(LIBDIR)/plugins/* 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).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-61-g4d3c00f
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via 4d3c00fcbaf5f00664e37eb5c96327b0fc7788fe (commit) from 829032b3c3eef55cf6c77d400305c49fdc137db4 (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 4d3c00fcbaf5f00664e37eb5c96327b0fc7788fe Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 00:13:27 2013 +0100 x2goclient.spec: add missing Group: fields to subpackages ----------------------------------------------------------------------- Summary of changes: x2goclient.spec | 2 ++ 1 file changed, 2 insertions(+) The diff of changes is: diff --git a/x2goclient.spec b/x2goclient.spec index ca1dc81..85fe95d 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -51,6 +51,7 @@ You can use it to connect to running sessions and start new sessions. %package -n x2goplugin Summary: X2Go Client (Qt4) as browser plugin +Group: Applications/Communications Requires: mozilla-filesystem Requires: nxproxy Requires: openssh-clients, openssh-server @@ -73,6 +74,7 @@ This package provides X2Go Client as QtBrowser-based Mozilla plugin. %package -n x2goplugin-provider Summary: Provide X2Go Plugin via Apache webserver +Group: Applications/Communications Requires: httpd %description -n x2goplugin-provider 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).

1 0

x2goadmincenter.git - master (branch) updated: bd42ae66c927db6f8bc2ef276aa4f23c70a22c2d
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via bd42ae66c927db6f8bc2ef276aa4f23c70a22c2d (commit) from db524c53fd8acead93420af769cb9cdfa090ca93 (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 bd42ae66c927db6f8bc2ef276aa4f23c70a22c2d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 00:21:09 2013 +0100 x2goadmincenter.spec: do not allow owner/group changes during install ----------------------------------------------------------------------- Summary of changes: x2goadmincenter.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec index df66c87..de873cd 100644 --- a/x2goadmincenter.spec +++ b/x2goadmincenter.spec @@ -57,7 +57,9 @@ For installation instruction/howtos/FAQs please visit http://wiki.x2go.org %prep %setup -q - +# Fix up install issues +sed -i -e 's/-o root -g root//' x2goadmincenter/Makefile +sed -i -e 's/-o root -g root//' x2goadminserver/Makefile %build %if 0%{?el5} 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).

1 0

x2goadmincenter.git - master (branch) updated: 41c7c70facf6c08a68a9f9958fa98cd85c76f1db
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via 41c7c70facf6c08a68a9f9958fa98cd85c76f1db (commit) from 28ad8db6817edb6021c45b13e4cd3006f18015da (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 41c7c70facf6c08a68a9f9958fa98cd85c76f1db Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 23:26:44 2013 +0100 re-enable man2html builds for x2goadmincenter ----------------------------------------------------------------------- Summary of changes: x2goadmincenter/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index 2d6b168..af97670 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -41,7 +41,7 @@ build_plugins: for module in `ls modules`; do cd $(SRC_DIR)/modules/$$module && qmake-qt4 $$module.pro && make; done build_man: -# $(MAKE) -f Makefile.man2html build + $(MAKE) -f Makefile.man2html build clean: clean_admincenter clean_plugins clean_man find . -type f -name '*.o' -exec rm -vf {} + 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).

1 0

x2goadmincenter.git - master (branch) updated: 3d4d6546eea9650b7f4c13bf3ef70b2f94c72694
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via 3d4d6546eea9650b7f4c13bf3ef70b2f94c72694 (commit) from 41c7c70facf6c08a68a9f9958fa98cd85c76f1db (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 3d4d6546eea9650b7f4c13bf3ef70b2f94c72694 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 23:31:03 2013 +0100 some Makefile variable fixes ----------------------------------------------------------------------- Summary of changes: x2goadmincenter/Makefile | 4 ++-- x2goadminserver/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index af97670..82c2b60 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -38,7 +38,7 @@ build_admincenter: cd $(BUILD_DIR) && $(MAKE) build_plugins: - for module in `ls modules`; do cd $(SRC_DIR)/modules/$$module && qmake-qt4 $$module.pro && make; done + for module in `ls modules`; do cd $(SRC_DIR)/modules/$$module && $(QMAKE_BINARY) $$module.pro && make; done build_man: $(MAKE) -f Makefile.man2html build @@ -58,7 +58,7 @@ clean_plugins: rm -fr $(PLUGINS_DIR)/* clean_man: - make -f Makefile.man2html clean + $(MAKE) -f Makefile.man2html clean install: install_admincenter install_plugins install_man diff --git a/x2goadminserver/Makefile b/x2goadminserver/Makefile index 0d3d701..c8ae08e 100755 --- a/x2goadminserver/Makefile +++ b/x2goadminserver/Makefile @@ -28,12 +28,12 @@ build-arch: build-indep: build_man build_man: - make -f Makefile.man2html build + $(MAKE) -f Makefile.man2html build clean: clean_man clean_man: - make -f Makefile.man2html clean + $(MAKE) -f Makefile.man2html clean install: install_adminserver install_man 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).

1 0

x2goadmincenter.git - master (branch) updated: db524c53fd8acead93420af769cb9cdfa090ca93
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

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

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits December 2013