[X2Go-Commits] x2goserver.git - release/4.0.1.x (branch) updated: 3.0.99-2-282-g6b38d3c

X2Go dev team git-admin at x2go.org
Thu Jun 6 13:34:54 CEST 2013


The branch, release/4.0.1.x has been updated
       via  6b38d3c94a082d3256d8705195b81dcef761dbd1 (commit)
      from  ffb6e274fc08a63ae2bd83b838f378995f37f95f (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Makefile                                           |    6 ++
 debian/changelog                                   |    2 +
 debian/control                                     |   44 ++++++++--
 ...er-extensions.dirs => x2goserver-printing.dirs} |    0
 debian/x2goserver-printing.docs                    |    1 +
 debian/x2goserver-printing.install                 |    2 +
 debian/x2goserver-printing.lintian-overrides       |    1 +
 debian/x2goserver-printing.manpages                |    1 +
 debian/x2goserver-printing.postinst                |   84 ++++++++++++++++++++
 ...2goserver.postrm => x2goserver-printing.postrm} |   12 +--
 debian/x2goserver.postinst                         |   43 ----------
 debian/x2goserver.postrm                           |    3 -
 .../Makefile                                       |    4 +-
 .../VERSION.x2goserver-printing                    |    0
 {x2goserver => x2goserver-printing}/bin/x2goprint  |    2 +-
 .../man/man8/x2goprint.8                           |    0
 16 files changed, 139 insertions(+), 66 deletions(-)
 copy debian/{x2goserver-extensions.dirs => x2goserver-printing.dirs} (100%)
 create mode 100644 debian/x2goserver-printing.docs
 create mode 100644 debian/x2goserver-printing.install
 create mode 100644 debian/x2goserver-printing.lintian-overrides
 create mode 100644 debian/x2goserver-printing.manpages
 create mode 100755 debian/x2goserver-printing.postinst
 copy debian/{x2goserver.postrm => x2goserver-printing.postrm} (66%)
 copy {x2goserver-compat => x2goserver-printing}/Makefile (94%)
 copy x2goserver-compat/VERSION.x2goserver-compat => x2goserver-printing/VERSION.x2goserver-printing (100%)
 rename {x2goserver => x2goserver-printing}/bin/x2goprint (99%)
 rename {x2goserver => x2goserver-printing}/man/man8/x2goprint.8 (100%)

The diff of changes is:
diff --git a/Makefile b/Makefile
index da4beb4..f3111d0 100755
--- a/Makefile
+++ b/Makefile
@@ -7,32 +7,38 @@ build: build-arch build-indep
 # make man2html build available from project's base folder...
 build_man2html:
 	cd x2goserver && make $@
+	cd x2goserver-printing && make $@
 	cd x2goserver-compat && make $@
 	cd x2goserver-extensions && make $@
 
 clean:
 	cd x2goserver && make $@
+	cd x2goserver-printing && make $@
 	cd x2goserver-compat && make $@
 	cd x2goserver-extensions && make $@
 
 build-arch:
 	cd x2goserver && make $@
+	cd x2goserver-printing && make $@
 	cd x2goserver-compat && make $@
 	cd x2goserver-extensions && make $@
 
 build-indep:
 	cd x2goserver && make $@
+	cd x2goserver-printing && make $@
 	cd x2goserver-compat && make $@
 	cd x2goserver-extensions && make $@
 
 install:
 	cd x2goserver && make $@
+	cd x2goserver-printing && make $@
 	cd x2goserver-compat && make $@
 	cd x2goserver-extensions && make $@
 
 uninstall:
 	cd x2goserver-extensions && make $@
 	cd x2goserver-compat && make $@
+	cd x2goserver-printing && make $@
 	cd x2goserver && make $@
 
 
diff --git a/debian/changelog b/debian/changelog
index 6475a9b..59989ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,6 +73,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
     Do not write an error to stderr if x2goterminate-session fails (i.e. if
     x2goagent is dead).
   * Man page update for x2gosession-terminate, x2gosession-resume.
+  * Split up x2goprint script + man page + adduser x2goprint as seperate
+    package x2goserver-printing.
 
   [ Ivan Kabaivanov ]
   * Makefile fix around man page installation in x2goserver-compat package.
diff --git a/debian/control b/debian/control
index 038d3d3..d3be173 100644
--- a/debian/control
+++ b/debian/control
@@ -38,17 +38,15 @@ Recommends:
  xinit,
  x2goserver-extensions (= ${source:Version})
 Suggests:
- x2goserver-compat (= ${source:Version})
+ x2goserver-printing (= ${source:Version}), x2goserver-compat (= ${source:Version})
 Breaks:
  x2goserver-one,
  x2goserver-home,
- x2goprint
 Replaces:
  x2goserver-one,
  x2goserver-home,
- x2goprint
 Description: X2go server daemon scripts
- X2go is a serverbased computing environment with
+ X2go is a server based computing environment with
     - session resuming
     - low bandwith support
     - LDAP support
@@ -67,13 +65,46 @@ Description: X2go server daemon scripts
  of X2go make sure that you also have X2go server
  extensions package (x2goserver-extensions) installed.
 
+Package: x2goserver-printing
+Architecture: all
+Depends:
+ ${misc:Depends},
+ x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
+ adduser
+Breaks:
+ x2goprint
+Replaces:
+ x2goprint
+Suggests:
+ cups-x2go
+Description: X2go server daemon scripts (extensions)
+ X2go is a server based computing environment with
+    - session resuming
+    - low bandwith support
+    - LDAP support
+    - client side mass storage mounting support
+    - audio support
+    - authentication by smartcard and USB stick
+ .
+ The X2go server printing package provides
+ client-side printing support for X2go.
+ .
+ This package has to be installed on X2go servers
+ that shall be able to pass X2go print jobs on
+ to the X2go client.
+ .
+ This package co-operates with the cups-x2go CUPS
+ backend. If CUPS server and X2go server are different
+ machines, then install cups-x2go on the CUPS server
+ and x2goserver-printing on your X2go server(s).
+
 Package: x2goserver-compat
 Architecture: all
 Depends:
  ${misc:Depends},
  x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~)
 Description: X2go server daemon scripts (backwards compatitbity to old client versions)
- X2go is a serverbased computing environment with
+ X2go is a server based computing environment with
     - session resuming
     - low bandwith support
     - LDAP support
@@ -91,7 +122,7 @@ Depends:
  x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
  x11-xkb-utils
 Description: X2go server daemon scripts (extensions)
- X2go is a serverbased computing environment with
+ X2go is a server based computing environment with
     - session resuming
     - low bandwith support
     - LDAP support
@@ -106,3 +137,4 @@ Description: X2go server daemon scripts (extensions)
  Make sure you have this package installed on your server
  if you want non-legacy X2go clients to be able to
  access your server without lack of features.
+
diff --git a/debian/x2goserver-extensions.dirs b/debian/x2goserver-printing.dirs
similarity index 100%
copy from debian/x2goserver-extensions.dirs
copy to debian/x2goserver-printing.dirs
diff --git a/debian/x2goserver-printing.docs b/debian/x2goserver-printing.docs
new file mode 100644
index 0000000..4f81c88
--- /dev/null
+++ b/debian/x2goserver-printing.docs
@@ -0,0 +1 @@
+x2goserver-printing/.build_man2html/html
diff --git a/debian/x2goserver-printing.install b/debian/x2goserver-printing.install
new file mode 100644
index 0000000..5daea4e
--- /dev/null
+++ b/debian/x2goserver-printing.install
@@ -0,0 +1,2 @@
+x2goserver-printing/bin/x2go*      /usr/bin/
+x2goserver-printing/VERSION.x2goserver-printing      /usr/share/x2go/versions/
\ No newline at end of file
diff --git a/debian/x2goserver-printing.lintian-overrides b/debian/x2goserver-printing.lintian-overrides
new file mode 100644
index 0000000..1c853c2
--- /dev/null
+++ b/debian/x2goserver-printing.lintian-overrides
@@ -0,0 +1 @@
+x2goserver-printing: breaks-without-version
diff --git a/debian/x2goserver-printing.manpages b/debian/x2goserver-printing.manpages
new file mode 100644
index 0000000..9b5b500
--- /dev/null
+++ b/debian/x2goserver-printing.manpages
@@ -0,0 +1 @@
+x2goserver-printing/man/man8/*
\ No newline at end of file
diff --git a/debian/x2goserver-printing.postinst b/debian/x2goserver-printing.postinst
new file mode 100755
index 0000000..00aa2b4
--- /dev/null
+++ b/debian/x2goserver-printing.postinst
@@ -0,0 +1,84 @@
+#!/bin/sh
+# postinst script for x2goserver-printing
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+	configure)
+		###
+		### X2go printing
+		###
+
+		# setup x2goprint user and x2goprint group
+		if ! getent group x2goprint >/dev/null; then
+			echo "Creating x2goprint group." >&2
+			addgroup --system x2goprint
+		else
+			echo "Group x2goprint already exists." >&2
+		fi
+		if ! getent passwd x2goprint >/dev/null; then
+			echo "Creating x2goprint user." >&2
+			adduser --system \
+			        --disabled-password --disabled-login \
+			        --shell /bin/false --group --home /var/spool/x2goprint x2goprint
+		else
+			echo "User x2goprint already exists." >&2
+			# make sure all settings are appropriate
+			if [ "`id -gn x2goprint`" != "x2goprint" ]; then
+				usermod --gid x2goprint# x2goprint
+			fi
+			if [ "`ls -1d ~x2goprint`" != "/var/spool/x2goprint" ]; then
+				test -d /var/spool/x2goprint && \
+					usermod --home /var/spool/x2goprint x2goprint || \
+					usermod --move-home --home /var/spool/x2goprint x2goprint
+			fi
+			# we leave user shell alone. we have never set this wrongly
+			# and we need to respect the administrator's choices
+		fi
+
+		# make sure x2goprint spool dir permissions are set correctly
+		chown -R x2goprint:x2goprint /var/spool/x2goprint
+		# egid x2goprint needs write access to the spool dir
+		chmod 0770 /var/spool/x2goprint
+
+		# we may be upgrading versions of x2goserver that had
+		# /usr/bin/x2goprint set to setuid x2goprint.
+		if dpkg-statoverride --list /usr/bin/x2goprint >/dev/null; then
+			dpkg-statoverride --remove /usr/bin/x2goprint
+			chown root:root /usr/bin/x2goprint
+			chmod 0755 /usr/bin/x2goprint
+		fi
+		;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+		;;
+
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 1
+		;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/x2goserver.postrm b/debian/x2goserver-printing.postrm
similarity index 66%
copy from debian/x2goserver.postrm
copy to debian/x2goserver-printing.postrm
index e99c2c9..63cf12d 100755
--- a/debian/x2goserver.postrm
+++ b/debian/x2goserver-printing.postrm
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postrm script for x2goserver
+# postrm script for x2goserver-printing
 #
 # see: dh_installdeb(1)
 # summary of how this script can be called:
@@ -18,16 +18,6 @@ set -e
 
 case "$1" in
 	purge)
-		if dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper >/dev/null; then
-			dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper
-		fi
-		echo "Removing x2go session database" >&2
-		rm -vf /var/lib/x2go/x2go_sessions
-		rm -vf /etc/x2go/x2gosql/passwords/pgadmin
-		getent passwd x2gouser >/dev/null && deluser x2gouser
-		getent group x2gouser >/dev/null && delgroup x2gouser
-		getent group x2gousers >/dev/null && delgroup x2gousers
-
 		getent passwd x2goprint >/dev/null && deluser x2goprint
 		getent group x2goprint >/dev/null && delgroup x2goprint
 		;;
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index 24515db..9d5d3bb 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -90,49 +90,6 @@ case "$1" in
 		    dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/x2gosqlitewrapper
 		fi
 
-		###
-		### X2go printing
-		###
-
-		# setup x2goprint user and x2goprint group
-		if ! getent group x2goprint >/dev/null; then
-			echo "Creating x2goprint group." >&2
-			addgroup --system x2goprint
-		else
-			echo "Group x2goprint already exists." >&2
-		fi
-		if ! getent passwd x2goprint >/dev/null; then
-			echo "Creating x2goprint user." >&2
-			adduser --system \
-			        --disabled-password --disabled-login \
-			        --shell /bin/false --group --home /var/spool/x2goprint x2goprint
-		else
-			echo "User x2goprint already exists." >&2
-			# make sure all settings are appropriate
-			if [ "`id -gn x2goprint`" != "x2goprint" ]; then
-				usermod --gid x2goprint# x2goprint
-			fi
-			if [ "`ls -1d ~x2goprint`" != "/var/spool/x2goprint" ]; then
-				test -d /var/spool/x2goprint && \
-					usermod --home /var/spool/x2goprint x2goprint || \
-					usermod --move-home --home /var/spool/x2goprint x2goprint
-			fi
-			# we leave user shell alone. we have never set this wrongly
-			# and we need to respect the administrator's choices
-		fi
-
-		# make sure x2goprint spool dir permissions are set correctly
-		chown -R x2goprint:x2goprint /var/spool/x2goprint
-		# egid x2goprint needs write access to the spool dir
-		chmod 0770 /var/spool/x2goprint
-
-		# we may be upgrading versions of x2goserver that had
-		# /usr/bin/x2goprint was set to setuid x2goprint.
-		if dpkg-statoverride --list /usr/bin/x2goprint >/dev/null; then
-			dpkg-statoverride --remove /usr/bin/x2goprint
-			chown root:root /usr/bin/x2goprint
-			chmod 0755 /usr/bin/x2goprint
-		fi
 		;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm
index e99c2c9..eada048 100755
--- a/debian/x2goserver.postrm
+++ b/debian/x2goserver.postrm
@@ -27,9 +27,6 @@ case "$1" in
 		getent passwd x2gouser >/dev/null && deluser x2gouser
 		getent group x2gouser >/dev/null && delgroup x2gouser
 		getent group x2gousers >/dev/null && delgroup x2gousers
-
-		getent passwd x2goprint >/dev/null && deluser x2goprint
-		getent group x2goprint >/dev/null && delgroup x2goprint
 		;;
 	remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 		;;
diff --git a/x2goserver-compat/Makefile b/x2goserver-printing/Makefile
similarity index 94%
copy from x2goserver-compat/Makefile
copy to x2goserver-printing/Makefile
index e1bc30f..e41ff98 100755
--- a/x2goserver-compat/Makefile
+++ b/x2goserver-printing/Makefile
@@ -73,7 +73,7 @@ install_man:
 install_version:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
-	$(INSTALL_FILE) VERSION.x2goserver-compat     $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-compat
+	$(INSTALL_FILE) VERSION.x2goserver-printing     $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-printing
 
 uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
 
@@ -96,5 +96,5 @@ uninstall_man:
 	$(RM_DIR)  $(DESTDIR)$(MANDIR) || true
 
 uninstall_version:
-	$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-compat
+	$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-printing
 	$(RM_DIR)  $(DESTDIR)$(SHAREDIR)/versions || true
diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-printing/VERSION.x2goserver-printing
similarity index 100%
copy from x2goserver-compat/VERSION.x2goserver-compat
copy to x2goserver-printing/VERSION.x2goserver-printing
diff --git a/x2goserver/bin/x2goprint b/x2goserver-printing/bin/x2goprint
similarity index 99%
rename from x2goserver/bin/x2goprint
rename to x2goserver-printing/bin/x2goprint
index edff6eb..fa3e4ae 100755
--- a/x2goserver/bin/x2goprint
+++ b/x2goserver-printing/bin/x2goprint
@@ -139,4 +139,4 @@ if ( $mounts=~m/$spooldir/)
 }
 
 # closing syslog 
-closelog;
\ No newline at end of file
+closelog;
diff --git a/x2goserver/man/man8/x2goprint.8 b/x2goserver-printing/man/man8/x2goprint.8
similarity index 100%
rename from x2goserver/man/man8/x2goprint.8
rename to x2goserver-printing/man/man8/x2goprint.8


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




More information about the x2go-commits mailing list