[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-200-g656dc5c

[X2go dev team]

The branch, master has been updated
       via  656dc5c982735001b32fd79782ec2a2ba6c99910 (commit)
      from  3d8515215ebb7d424798583fa27d5168660dfa72 (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 656dc5c982735001b32fd79782ec2a2ba6c99910
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 30 09:18:43 2011 +0200

    Makefile update for x2goprint setgid wrapper.

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

Summary of changes:
 debian/changelog    |    1 +
 x2goserver/Makefile |   10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2739a45..18f0c53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Create x2goprint user/group on package installation, add same info to INSTALL howto.
   * Change permissions on x2goprint, using 2755:root:x2goprint (setgid).
   * Change X2go printing concept: use setgit and a sgid wrapper instead of sudo.
+  * Makefile update for x2goprint setgid wrapper.
 
   [Martin Oehler]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index ca4851d..b46c117 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -33,10 +33,11 @@ all: clean build
 
 build: build-arch build-indep
 
-build-arch: build_setuidwrapper
+build-arch: build_setgidwrappers
 
-build_setuidwrapper:
+build_setgidwrappers:
 	gcc -o x2gosqlitewrapper x2gosqlitewrapper.c
+	gcc -o x2goprint x2goprint.c
 
 build-indep: build_man2html
 
@@ -49,6 +50,7 @@ clean: clean_arch clean_man2html
 
 clean_arch:
 	rm -f x2gosqlitewrapper
+	rm -f x2goprint
 
 clean_man2html:
 	rm -Rf `dirname $(MAN2HTML_DEST)`
@@ -62,10 +64,13 @@ install_scripts:
 	$(INSTALL_PROGRAM) bin/*                $(DESTDIR)$(BINDIR)/
 	$(INSTALL_PROGRAM) sbin/*               $(DESTDIR)$(SBINDIR)/
 	$(INSTALL_PROGRAM) x2gosqlitewrapper       $(DESTDIR)$(LIBDIR)/
+	$(INSTALL_PROGRAM) x2goprint               $(DESTDIR)$(BINDIR)/
 	$(INSTALL_PROGRAM) lib/*                   $(DESTDIR)$(LIBDIR)/
 	chmod a-x $(DESTDIR)$(LIBDIR)/*.pm
 	chown root:x2gouser $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper
 	chmod 2755 $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper
+	chown root:x2goprint $(DESTDIR)$(BINDIR)/x2goprint
+	chmod 2755 $(DESTDIR)$(BINDIR)/x2goprint
 
 install_config:
 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
@@ -95,6 +100,7 @@ uninstall_scripts:
 	for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done
 	for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done
 	$(RM_FILE) $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper
+	$(RM_FILE) $(DESTDIR)$(BINDIR)/x2goprint
 	$(RM_DIR) $(DESTDIR)$(LIBDIR) || true
 
 uninstall_config:


hooks/post-receive
-- 
x2goserver.git (X2go Server)

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 "x2goserver.git" (X2go Server).