Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: X2Go dev team <git-admin-P0WSJaAXTow <at> public.gmane.org>
Subject: x2gobroker.git - master (branch) updated: 0.0.0.1-41-g9ed3a78
Newsgroups: gmane.linux.terminal-server.x2go.scm
Date: Wednesday 20th February 2013 21:07:46 UTC (over 3 years ago)
The branch, master has been updated
       via  9ed3a78cd49d01e4c056b8d93ae8b2f3709a00c4 (commit)
      from  169a3bb77b455408af57f65ab47ed1ea63df4287 (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 9ed3a78cd49d01e4c056b8d93ae8b2f3709a00c4
Author: Mike Gabriel

Date:   Wed Feb 20 22:10:34 2013 +0100

    fix .deb package build

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

Summary of changes:
 debian/control                    |    1 +
 debian/python-x2gobroker.postinst |   47
-------------------------------------
 debian/x2gobroker-daemon.postinst |    5 ++++
 debian/x2gobroker-daemon.postrm   |    4 ++++
 4 files changed, 10 insertions(+), 47 deletions(-)
 delete mode 100755 debian/python-x2gobroker.postinst

The diff of changes is:
diff --git a/debian/control b/debian/control
index 833c10f..769975d 100644
--- a/debian/control
+++ b/debian/control
@@ -84,6 +84,7 @@ Architecture: all
 Depends:
  ${misc:Depends},
  ${python:Depends},
+ adduser,
  x2gobroker (>= ${source:Version}), x2gobroker (<< ${source:Version}.1~),
 Recommends:
  x2gobroker-authservice,
diff --git a/debian/python-x2gobroker.postinst
b/debian/python-x2gobroker.postinst
deleted file mode 100755
index 6299aea..0000000
--- a/debian/python-x2gobroker.postinst
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# postinst script for python-x2gobroker
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        *  `configure' 
-#        *  `abort-upgrade' 
-#        *  `abort-remove' `in-favour' 
-#          
-#        *  `abort-remove'
-#        *  `abort-deconfigure' `in-favour'
-#            `removing'
-#           
-# for details, see http://www.debian.org/doc/debian-policy/
or
-# the debian-policy package
-
-
-case "$1" in
-	configure)
-
-		# the python-x2gobroker needs special permissions on its log directory
-		if ! dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then
-		    dpkg-statoverride --add --update x2gobroker adm 2750
/var/log/x2gobroker
-		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/x2gobroker-daemon.postinst
b/debian/x2gobroker-daemon.postinst
index fca14ca..dea98bc 100755
--- a/debian/x2gobroker-daemon.postinst
+++ b/debian/x2gobroker-daemon.postinst
@@ -40,6 +40,11 @@ case "$1" in
 			echo "User x2gobroker already exists." >&2
 		fi
 
+		# the x2gobroker-daemon needs special permissions on its log directory
+		if ! dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then
+			dpkg-statoverride --add --update x2gobroker adm 2750
/var/log/x2gobroker
+		fi
+
 		;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/x2gobroker-daemon.postrm
b/debian/x2gobroker-daemon.postrm
index 678bbb9..a8ebd42 100755
--- a/debian/x2gobroker-daemon.postrm
+++ b/debian/x2gobroker-daemon.postrm
@@ -19,6 +19,10 @@ set -e
 case "$1" in
 	purge)
 
+		if dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then
+			dpkg-statoverride --remove /var/log/x2gobroker
+		fi
+
 		if [ ! -d /usr/share/doc/x2gobroker-agent ]; then
 			# remove user/group x2gobroker from system (only if not in use by
x2gobroker-agent
 			getent passwd x2gobroker >/dev/null && deluser x2gobroker


hooks/post-receive
 
CD: 4ms