[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-4-g7eb59f3

X2Go dev team git-admin at x2go.org
Wed Sep 11 15:51:22 CEST 2013 

The branch, master has been updated
       via  7eb59f32a8d39d03c4e426faf412f4a35f101766 (commit)
      from  20d04f171c0222cbc87c37257b3ee2261210621b (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 7eb59f32a8d39d03c4e426faf412f4a35f101766
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Sep 11 15:50:07 2013 +0200

    Pull-in packaging changes from Debian.

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

Summary of changes:
 debian/changelog                    |    1 +
 debian/control                      |   24 +++++++++--------
 debian/rules                        |    9 ++++++-
 debian/x2goplugin-provider.links    |    2 +-
 debian/x2goplugin-provider.postinst |   49 +++++++++++++++++++++++++++++++++++
 debian/x2goplugin-provider.postrm   |   47 +++++++++++++++++++++++++++++++++
 6 files changed, 119 insertions(+), 13 deletions(-)
 create mode 100755 debian/x2goplugin-provider.postinst
 create mode 100755 debian/x2goplugin-provider.postrm

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 71fbd46..1af832e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low
 
   * New upstream version (4.0.1.2):
     + Provide Keywords: key in .desktop file.
+  * Pull-in packaging changes from Debian.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 11 Sep 2013 12:17:43 +0200
 
diff --git a/debian/control b/debian/control
index 21a806c..819e6c1 100644
--- a/debian/control
+++ b/debian/control
@@ -40,34 +40,35 @@ Description: X2Go Client application (Qt4)
  X2Go is a serverbased computing environment with
     - session resuming
     - low bandwidth support
-    - LDAP support
+    - session brokerage support
     - client-side mass storage mounting support
     - client-side printing support
     - audio support
     - authentication by smartcard and USB stick
  .
- x2goclient is a graphical client (Qt4) for the X2Go system.
+ X2Go Client is a graphical client (Qt4) for the X2Go system.
  You can use it to connect to running sessions and start new sessions.
 
 Package: x2goclient-dbg
-Priority: extra
 Section: debug
 Architecture: any
-Depends: ${misc:Depends}, x2goclient (= ${binary:Version})
+Depends:
+ ${misc:Depends},
+ x2goclient (= ${binary:Version}),
 Description: X2Go Client application (Qt4), debug symbols
  X2Go is a serverbased computing environment with
     - session resuming
     - low bandwidth support
-    - LDAP support
+    - session brokerage support
     - client-side mass storage mounting support
     - client-side printing support
     - audio support
     - authentication by smartcard and USB stick
  .
- x2goclient is a graphical client (Qt4) for the X2Go system.
+ X2Go Client is a graphical client (Qt4) for the X2Go system.
  You can use it to connect to running sessions and start new sessions
  .
- This package provides the debug symbols for the x2goclient application.
+ This package provides the debug symbols for the X2Go Client application.
 
 Package: x2goplugin
 Architecture: any
@@ -75,6 +76,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  openssh-client,
+ libssh-4 (>= 0.4.7),
  nxproxy,
 Recommends:
  openssh-server,
@@ -85,16 +87,16 @@ Description: X2Go Client (Qt4) as browser plugin
  X2Go is a serverbased computing environment with
     - session resuming
     - low bandwidth support
-    - LDAP support
+    - session brokerage support
     - client-side mass storage mounting support
     - client-side printing support
     - audio support
     - authentication by smartcard and USB stick
  .
- x2goclient is a graphical client (qt4) for the X2Go system.
+ X2Go Client is a graphical client (qt4) for the X2Go system.
  You can use it to connect to running sessions and start new sessions.
  .
- This package provides x2goclient as QtBrowser-based Mozilla plugin.
+ This package provides X2Go Client as QtBrowser-based Mozilla plugin.
 
 Package: x2goplugin-provider
 Architecture: all
@@ -108,7 +110,7 @@ Description: Provide X2Go Plugin via Apache webserver
  X2Go is a serverbased computing environment with
     - session resuming
     - low bandwidth support
-    - LDAP support
+    - session brokerage support
     - client-side mass storage mounting support
     - client-side printing support
     - audio support
diff --git a/debian/rules b/debian/rules
index 97abc81..a7a4cfa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
 export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with apache2
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -14,6 +14,13 @@ override_dh_auto_clean:
 	rm -Rf x2goclient_*.qm
 
 override_dh_auto_install:
+	mv plugin_build/libx2goplugin.so plugin_build/libx2goplugin.so.unstripped
+	strip -s --remove-section=.comment --remove-section=.note \
+	        plugin_build/libx2goplugin.so.unstripped -o plugin_build/libx2goplugin.so
+	rm -f plugin_build/libx2goplugin.so.unstripped
 
 override_dh_strip:
 	dh_strip -p x2goclient --dbg-package=x2goclient-dbg
+
+override_dh_apache2:
+	dh_apache2 --noscripts
diff --git a/debian/x2goplugin-provider.links b/debian/x2goplugin-provider.links
index c4b78d5..c1af701 100644
--- a/debian/x2goplugin-provider.links
+++ b/debian/x2goplugin-provider.links
@@ -1,2 +1,2 @@
-etc/x2go/x2goplugin-apache.conf etc/apache2/conf.d/x2goplugin.conf
+etc/x2go/x2goplugin-apache.conf etc/apache2/conf-available/x2goplugin-provider.conf
 etc/x2go/plugin-provider/x2goplugin.html usr/share/x2go/plugin/x2goplugin.html
diff --git a/debian/x2goplugin-provider.postinst b/debian/x2goplugin-provider.postinst
new file mode 100755
index 0000000..0808138
--- /dev/null
+++ b/debian/x2goplugin-provider.postinst
@@ -0,0 +1,49 @@
+#!/bin/sh
+# postinst script for x2goplugin-provider
+#
+# 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)
+		CONF="x2goplugin-provider"
+		COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
+
+		if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+			. /usr/share/apache2/apache2-maintscript-helper
+			apache2_invoke enconf $CONF || exit $?
+		elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
+			[ -d /etc/apache2/conf.d/ ] && [ ! -L /etc/apache2/conf.d/$CONF.conf ] && ln -s ../conf-available/$CONF.conf /etc/apache2/conf.d/$CONF.conf
+		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/x2goplugin-provider.postrm b/debian/x2goplugin-provider.postrm
new file mode 100755
index 0000000..74b1218
--- /dev/null
+++ b/debian/x2goplugin-provider.postrm
@@ -0,0 +1,47 @@
+#! /bin/sh
+# postrm script for x2goplugin-provider
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/share/doc/packaging-manual/
+
+case "$1" in
+	remove|purge)
+		CONF="x2goplugin-provider"
+		COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
+
+		if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+			. /usr/share/apache2/apache2-maintscript-helper
+			apache2_invoke disconf $CONF || exit $?
+		elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
+			[ ! -L /etc/apache2/conf.d/$CONF.conf ] || rm /etc/apache2/conf.d/$CONF.conf
+		fi
+		;;
+
+	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+		;;
+
+	*)
+		echo "postrm called with unknown argument \`$1'" >&2
+		exit 0
+		;;
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
\ No newline at end of file


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

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 "x2goclient.git" (X2Go Client).

More information about the x2go-commits mailing list