x2go-commits December 2013

x2go-commits@lists.x2go.org

2 participants
2076 discussions

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

11 Dec '13

The branch, master has been updated via bb8b09956265a8249ee0db56afe3b566751b6f64 (commit) from 05c4be8440ba1cbdcce09f2d1abcc0682dd45f2b (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 bb8b09956265a8249ee0db56afe3b566751b6f64 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 10:48:48 2013 +0100 x2goadmincenter.spec: don't forget to install the 48x48 px icons ----------------------------------------------------------------------- Summary of changes: x2goadmincenter.spec | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec index fdf734a..5c1cfb2 100644 --- a/x2goadmincenter.spec +++ b/x2goadmincenter.spec @@ -98,6 +98,7 @@ fi %{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/icons/hicolor/64x64/apps/%{name}.png %{_libdir}/%{name}/ %{_mandir}/man8/%{name}.8.gz 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: 05c4be8440ba1cbdcce09f2d1abcc0682dd45f2b
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 05c4be8440ba1cbdcce09f2d1abcc0682dd45f2b (commit) from 0a8fd25818b9804156181048bc8fe1c414f94bc6 (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 05c4be8440ba1cbdcce09f2d1abcc0682dd45f2b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 10:37:32 2013 +0100 x2goadmincenter.spec: typo fix ----------------------------------------------------------------------- Summary of changes: x2goadmincenter.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec index 9a34c51..fdf734a 100644 --- a/x2goadmincenter.spec +++ b/x2goadmincenter.spec @@ -60,7 +60,7 @@ For installation instruction/howtos/FAQs please visit http://wiki.x2go.org # Fix up install issues sed -i -e 's/-o root -g root//' x2goadmincenter/Makefile sed -i -e 's/-o root -g root//' x2goadminserver/Makefile -find -type f -name "*/Makefile" | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' +find -type f -name "Makefile" | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' sed -i x2goadminserver/Makefile -e '/^CGIBINDIR=/s,/lib/,/%{_lib}/,' %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: 0a8fd25818b9804156181048bc8fe1c414f94bc6
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 0a8fd25818b9804156181048bc8fe1c414f94bc6 (commit) from 68b59d548eab7045eabb3c4e55691f103e15677f (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 0a8fd25818b9804156181048bc8fe1c414f94bc6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 10:29:46 2013 +0100 x2goadmincenter.spec: patch cgi-bin dir in Makefile ----------------------------------------------------------------------- Summary of changes: x2goadmincenter.spec | 3 ++- x2goadminserver/Makefile | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec index ccfa17e..9a34c51 100644 --- a/x2goadmincenter.spec +++ b/x2goadmincenter.spec @@ -60,7 +60,8 @@ For installation instruction/howtos/FAQs please visit http://wiki.x2go.org # Fix up install issues sed -i -e 's/-o root -g root//' x2goadmincenter/Makefile sed -i -e 's/-o root -g root//' x2goadminserver/Makefile -find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' +find -type f -name "*/Makefile" | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' +sed -i x2goadminserver/Makefile -e '/^CGIBINDIR=/s,/lib/,/%{_lib}/,' %build %if 0%{?el5} diff --git a/x2goadminserver/Makefile b/x2goadminserver/Makefile index d785a7b..bfa152a 100755 --- a/x2goadminserver/Makefile +++ b/x2goadminserver/Makefile @@ -16,6 +16,7 @@ BINDIR=$(PREFIX)/bin SHAREDIR=$(PREFIX)/share MANDIR=$(SHAREDIR)/man LIBDIR=$(PREFIX)/lib/x2go +CGIBINDIR=$(PREFIX)/lib/cgi-bin all: build @@ -41,8 +42,8 @@ install_adminserver: $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/ $(INSTALL_FILE) $(CURDIR)/etc/x2goadminserver.conf $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) $(CURDIR)/lib/* $(DESTDIR)$(LIBDIR)/ - $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/lib/cgi-bin - $(INSTALL_FILE) $(CURDIR)/cgi-bin/* $(DESTDIR)$(PREFIX)/lib/cgi-bin + $(INSTALL_DIR) $(DESTDIR)$(CGIBINDIR)/ + $(INSTALL_FILE) $(CURDIR)/cgi-bin/* $(DESTDIR)$(CGIBINDIR)/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -57,12 +58,12 @@ uninstall: uninstall_adminserver uninstall_man uninstall_adminserver: $(RM_FILE) $(ETCDIR)/x2goadminserver.conf - $(RM_FILE) $(PREFIX)/lib/cgi-bin/x2gorpcserver.cgi + $(RM_FILE) $(CGIBINDIR)/x2gorpcserver.cgi $(RM_FILE) $(LIBDIR)/x2goadminserver.pm $(RM_FILE) $(LIBDIR)/x2goadminserver_backend_*.pm $(RM_DIR) $(ETCDIR)/ $(RM_DIR) $(LIBDIR)/ - $(RM_DIR) $(PREFIX)/lib/cgi-bin/ + $(RM_DIR) $(CGIBINDIR)/ uninstall_man: $(RM_FILE) $(DESTDIR)$(MANDIR)/man5/x2goadminserver.conf.5.gz 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: 68b59d548eab7045eabb3c4e55691f103e15677f
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 68b59d548eab7045eabb3c4e55691f103e15677f (commit) from 2c55aae3bd6e4fa6ce0c5715afaf2a2c664705c6 (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 68b59d548eab7045eabb3c4e55691f103e15677f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 10:05:45 2013 +0100 x2goadmincenter.spec: patch LIBDIR in Makefiles ----------------------------------------------------------------------- Summary of changes: Makefile | 24 ++++++++++++------------ x2goadmincenter.spec | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index ccb1261..fddc551 100755 --- a/Makefile +++ b/Makefile @@ -6,25 +6,25 @@ build: build-arch build-indep # make man2html build available from project's base folder... build_man2html: - cd x2goadmincenter && make $@ - cd x2goadminserver && make $@ + cd x2goadmincenter && $(MAKE) $@ + cd x2goadminserver && $(MAKE) $@ clean: - cd x2goadmincenter && make $@ - cd x2goadminserver && make $@ + cd x2goadmincenter && $(MAKE) $@ + cd x2goadminserver && $(MAKE) $@ build-arch: - cd x2goadmincenter && make $@ - cd x2goadminserver && make $@ + cd x2goadmincenter && $(MAKE) $@ + cd x2goadminserver && $(MAKE) $@ build-indep: - cd x2goadmincenter && make $@ - cd x2goadminserver && make $@ + cd x2goadmincenter && $(MAKE) $@ + cd x2goadminserver && $(MAKE) $@ install: - cd x2goadmincenter && make $@ - cd x2goadminserver && make $@ + cd x2goadmincenter && $(MAKE) $@ + cd x2goadminserver && $(MAKE) $@ uninstall: - cd x2goadmincenter && make $@ - cd x2goadminserver && make $@ + cd x2goadmincenter && $(MAKE) $@ + cd x2goadminserver && $(MAKE) $@ diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec index 377be2f..ccfa17e 100644 --- a/x2goadmincenter.spec +++ b/x2goadmincenter.spec @@ -60,6 +60,7 @@ For installation instruction/howtos/FAQs please visit http://wiki.x2go.org # Fix up install issues sed -i -e 's/-o root -g root//' x2goadmincenter/Makefile sed -i -e 's/-o root -g root//' x2goadminserver/Makefile +find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' %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: 2c55aae3bd6e4fa6ce0c5715afaf2a2c664705c6
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 2c55aae3bd6e4fa6ce0c5715afaf2a2c664705c6 (commit) from 548326b35e2c6fd51bb62dc6e93cc41662579856 (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 2c55aae3bd6e4fa6ce0c5715afaf2a2c664705c6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 09:40:53 2013 +0100 x2goadmincenter.spec: add debian/changelog,copyright rather then a non-existent COPYING file (todo: rewrite debian/copyright) ----------------------------------------------------------------------- Summary of changes: x2goadmincenter.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec index de873cd..377be2f 100644 --- a/x2goadmincenter.spec +++ b/x2goadmincenter.spec @@ -88,7 +88,8 @@ fi %files -%doc COPYING +%doc debian/changelog +%doc debian/copyright %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/ 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: fb18027c137ad896c234f80144d775b98980fd92
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via fb18027c137ad896c234f80144d775b98980fd92 (commit) from 2cdcd7006394cab5b0a0d73416d0502c2a691012 (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 fb18027c137ad896c234f80144d775b98980fd92 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 09:25:10 2013 +0100 debian/rules, x2goadmincenter/Makefile: Harden the build process. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/rules | 6 +++++- x2goadmincenter/Makefile | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0e6f9b2..fe26957 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low + Priority: optional. + Replace LDAP support by session brokerage support in LONG_DESCRIPTION. + Update SYNOPSIS fields and LONG_DESCRIPTION fields. + * debian/rules, x2goadmincenter/Makefile: + + Harden the build process. * debian/source/format: + Switch to format 1.0. * x2goadmincenter.spec: diff --git a/debian/rules b/debian/rules index d569055..bbab11e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,11 @@ #!/usr/bin/make -f +export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + %: dh $@ override_dh_auto_install: - diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index 1f30a43..55d0112 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -33,11 +33,11 @@ build-indep: build_man build_admincenter: $(LRELEASE_BINARY) x2goadmincenter.pro - mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && $(QMAKE_BINARY) ../x2goadmincenter.pro + mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goadmincenter.pro cd $(BUILD_DIR) && $(MAKE) build_plugins: - for module in `ls $(CURDIR)/modules`; do cd $(CURDIR)/modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) $$module.pro && make && cd - 1>/dev/null; done + for module in `ls $(CURDIR)/modules`; do cd $(CURDIR)/modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" $$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: 2cdcd7006394cab5b0a0d73416d0502c2a691012
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 2cdcd7006394cab5b0a0d73416d0502c2a691012 (commit) from fa72af6bf8a9f4b9e52e637fe37e0ace61620613 (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 2cdcd7006394cab5b0a0d73416d0502c2a691012 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 09:21:04 2013 +0100 more work on Makefiles ----------------------------------------------------------------------- Summary of changes: x2goadmincenter/Makefile | 32 +++++++++++++------------------- x2goadminserver/Makefile | 16 ++++++++-------- 2 files changed, 21 insertions(+), 27 deletions(-) The diff of changes is: diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index 895328a..1f30a43 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -1,9 +1,9 @@ #!/usr/bin/make -f -BUILD_DIR=.build +BUILD_DIR=$(CURDIR)/.build BUILD_BINARY=$(BUILD_DIR)/x2goadmincenter -PLUGINS_DIR=plugins +PLUGINS_DIR=$(CURDIR)/plugins SHELL=/bin/bash @@ -37,7 +37,7 @@ build_admincenter: cd $(BUILD_DIR) && $(MAKE) build_plugins: - for module in `ls modules`; do cd modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) $$module.pro && make && cd - 1>/dev/null; done + for module in `ls $(CURDIR)/modules`; do cd $(CURDIR)/modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) $$module.pro && make && cd - 1>/dev/null; done build_man: $(MAKE) -f Makefile.man2html build @@ -54,6 +54,7 @@ clean_admincenter: rm -fr $(BUILD_DIR) clean_plugins: + for module in `ls $(CURDIR)/modules`; do rm -fv $(CURDIR)/modules/$$module/Makefile; done rm -fr $(PLUGINS_DIR)/* clean_man: @@ -65,19 +66,19 @@ install_admincenter: $(INSTALL_DIR) $(DESTDIR)$(BINDIR)/ $(INSTALL_PROGRAM) $(BUILD_BINARY) $(DESTDIR)$(BINDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/applications/ - $(INSTALL_FILE) desktop/x2goadmincenter.destop $(DESTDIR)$(SHAREDIR)/applications/x2goadmincenter.desktop + $(INSTALL_FILE) $(CURDIR)/desktop/x2goadmincenter.desktop $(DESTDIR)$(SHAREDIR)/applications/x2goadmincenter.desktop $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/ - $(INSTALL_FILE) icons/x2goadmincenter.xpm $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm + $(INSTALL_FILE) $(CURDIR)/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_FILE) $(CURDIR)/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_FILE) $(CURDIR)/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_FILE) $(CURDIR)/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_FILE) $(CURDIR)/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_FILE) $(CURDIR)/icons/64x64/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goadmincenter.png install_plugins: $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/plugins/ @@ -86,7 +87,7 @@ install_plugins: install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 - $(INSTALL_FILE) man/man8/x2goadmincenter.8 $(DESTDIR)$(MANDIR)/man1/x2goadmincenter.8 + $(INSTALL_FILE) $(CURDIR)/man/man8/x2goadmincenter.8 $(DESTDIR)$(MANDIR)/man8/x2goadmincenter.8 gzip -f $(DESTDIR)$(MANDIR)/man8/x2goadmincenter.8 uninstall: uninstall_admincenter uninstall_plugins uninstall_man @@ -95,29 +96,22 @@ uninstall_admincenter: $(RM_FILE) $(BINDIR)/x2goadmincenter $(RM_FILE) $(SHAREDIR)/applications/x2goadmincenter.desktop $(RM_FILE) $(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm + $(RM_DIR) $(SHAREDIR)/applications/ $(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/* $(RM_DIR) $(LIBDIR)/plugins/ - $(RM_DIR) $(LIBDIR)/ uninstall_man: $(RM_FILE) $(MANDIR)/man8/x2goadmincenter.8.gz diff --git a/x2goadminserver/Makefile b/x2goadminserver/Makefile index c8ae08e..d785a7b 100755 --- a/x2goadminserver/Makefile +++ b/x2goadminserver/Makefile @@ -1,7 +1,5 @@ #!/usr/bin/make -f -SRC_DIR=$(CURDIR) - SHELL=/bin/bash INSTALL_DIR=install -d -o root -g root -m 755 @@ -41,20 +39,21 @@ install_adminserver: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/ $(INSTALL_DIR) $(DESTDIR)$(BINDIR)/ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/ - $(INSTALL_FILE) $(SRC_DIR)/etc/x2goadminserver.conf $(DESTDIR)$(ETCDIR)/ - $(INSTALL_FILE) $(SRC_DIR)/lib/* $(DESTDIR)$(LIBDIR)/ - $(INSTALL_FILE) $(SRC_DIR)/cgi-bin/* $(DESTDIR)$(PREFIX)/lib/cgi-bin + $(INSTALL_FILE) $(CURDIR)/etc/x2goadminserver.conf $(DESTDIR)$(ETCDIR)/ + $(INSTALL_FILE) $(CURDIR)/lib/* $(DESTDIR)$(LIBDIR)/ + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/lib/cgi-bin + $(INSTALL_FILE) $(CURDIR)/cgi-bin/* $(DESTDIR)$(PREFIX)/lib/cgi-bin install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5 - $(INSTALL_FILE) $(SRC_DIR)/man/man5/*.5 $(DESTDIR)$(MANDIR)/man5 + $(INSTALL_FILE) $(CURDIR)/man/man5/*.5 $(DESTDIR)$(MANDIR)/man5 gzip -f $(DESTDIR)$(MANDIR)/man5/x2go*.5 $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 - $(INSTALL_FILE) $(SRC_DIR)/man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_FILE) $(CURDIR)/man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 -uninstall: uninstall_adminserver +uninstall: uninstall_adminserver uninstall_man uninstall_adminserver: $(RM_FILE) $(ETCDIR)/x2goadminserver.conf @@ -63,6 +62,7 @@ uninstall_adminserver: $(RM_FILE) $(LIBDIR)/x2goadminserver_backend_*.pm $(RM_DIR) $(ETCDIR)/ $(RM_DIR) $(LIBDIR)/ + $(RM_DIR) $(PREFIX)/lib/cgi-bin/ uninstall_man: $(RM_FILE) $(DESTDIR)$(MANDIR)/man5/x2goadminserver.conf.5.gz 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: 548326b35e2c6fd51bb62dc6e93cc41662579856
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 548326b35e2c6fd51bb62dc6e93cc41662579856 (commit) from 677ffe1819fb20e6bf01f68aabd6d40b319e6833 (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 548326b35e2c6fd51bb62dc6e93cc41662579856 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 09:40:00 2013 +0100 fix(2) 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 bf8d540..bd3464b 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -47,7 +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 'x2go_*.qm' -exec rm -vf {} + + find . -type f -name 'x2go*_*.qm' -exec rm -vf {} + rm -f x2goadmincenter rm -f x2goadmincenter.tag 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: 7e91a443654535f6efde5d9a6991c428183ebe51
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 7e91a443654535f6efde5d9a6991c428183ebe51 (commit) from fb18027c137ad896c234f80144d775b98980fd92 (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 7e91a443654535f6efde5d9a6991c428183ebe51 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 09:25:36 2013 +0100 typo fix in debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fe26957..85fe782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,7 @@ 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 + - Only ship one binary version of qt_de.qm, the others ship is relative symlinks. * debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. 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: 677ffe1819fb20e6bf01f68aabd6d40b319e6833
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 677ffe1819fb20e6bf01f68aabd6d40b319e6833 (commit) from c94ea7beb32b9724afcb06505194d2c7bdb01c2e (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 677ffe1819fb20e6bf01f68aabd6d40b319e6833 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 09:39:39 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 8bbe1c7..bf8d540 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -47,7 +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 {} + + find . -type f -name 'x2go_*.qm' -exec rm -vf {} + rm -f x2goadmincenter rm -f x2goadmincenter.tag 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