The branch, master has been updated via c7a5a15c9882aba9d3ef690162e46db570740e64 (commit) from ac8541b377396506ffca5941561fad814269afb5 (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 c7a5a15c9882aba9d3ef690162e46db570740e64 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Dec 10 21:45:36 2013 +0100 x2goadmincenter/Makefile: QMAKE_BINARY and LRELEASE_BINARY easily replacable. Add .desktop file for X2Go Admin Center. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++++- debian/x2goadmincenter.install | 1 + x2goadmincenter/Makefile | 6 +++++- x2goadmincenter/desktop/x2goadmincenter.desktop | 11 +++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 x2goadmincenter/desktop/x2goadmincenter.desktop The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 03bd23f..c7aaa3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,10 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] - * Initial package build for Debian/Ubuntu. + * Upstream version 0.0.0.1 (initial release): + - x2goadmincenter/Makefile: QMAKE_BINARY and LRELEASE_BINARY easily + replacable. + - Add .desktop file for X2Go Admin Center. * debian/control: + Maintainer change in package: X2Go Developers <x2go-dev@lists.berlios.de>. + Reduce build dependencies to a minimal set of packages. diff --git a/debian/x2goadmincenter.install b/debian/x2goadmincenter.install index b4cb467..12b169b 100644 --- a/debian/x2goadmincenter.install +++ b/debian/x2goadmincenter.install @@ -1,3 +1,4 @@ x2goadmincenter/.build/x2goadmincenter usr/bin +x2goadmincenter/desktop/x2goadmincenter.desktop usr/share/applications/ x2goadmincenter/icons/x2goadmincenter.xpm usr/share/x2goadmincenter/icons/ x2goadmincenter/plugins/* usr/lib/x2goadmincenter/plugins/ diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index b0b44f7..09b72f8 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -21,6 +21,8 @@ BINDIR=$(PREFIX)/bin SHAREDIR=$(PREFIX)/share MANDIR=$(SHAREDIR)/man LIBDIR=$(PREFIX)/lib/x2goadmincenter +QMAKE_BINARY=qmake-qt4 +LRELEASE_BINARY=lrelease all: build @@ -31,7 +33,8 @@ build-arch: build_admincenter build_plugins build-indep: build_man build_admincenter: - mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && qmake-qt4 ../x2goadmincenter.pro + $(LRELEASE_BINARY) x2goadmincenter.pro + mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && $(QMAKE_BINARY) ../x2goadmincenter.pro cd $(BUILD_DIR) && $(MAKE) build_plugins: @@ -61,6 +64,7 @@ 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_plugins: diff --git a/x2goadmincenter/desktop/x2goadmincenter.desktop b/x2goadmincenter/desktop/x2goadmincenter.desktop new file mode 100644 index 0000000..47e8de0 --- /dev/null +++ b/x2goadmincenter/desktop/x2goadmincenter.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=X2Go Admin Center +Exec=x2goadmincenter +Icon=x2goadmincenter +StartupWMClass=x2goadmincenter +X-Window-Icon=x2goadmincenter +Terminal=false +Categories=Qt;KDE;System; +Keywords=X2Go,Session,Administration,User,Group,Shadow,LDAP,Cipux; 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).