The branch, backport-lenny has been updated via 57aafe46e7969439aefedad545717aba3671d39d (commit) via 67995f1774136d92be819e114f0236f264d588fe (commit) via 2668ba5678645266c8a8f7570844348bd0db0416 (commit) via 4bb6242d3152fd696434e27e607bc9998c815853 (commit) via 958560473227254b861cc03fdf12dddac05b8829 (commit) via e61a0c9fa0bcd462d987705876a1da6d29334705 (commit) via f28fa87d74c78b78b000fce8468e365698cd0acb (commit) via 9a1a9c0e19c9cc7667b8900506533a7129fe9ece (commit) from 4966fd70cabb6fdd280b49e7cef4ad8b201ccb83 (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 57aafe46e7969439aefedad545717aba3671d39d Merge: 4966fd70cabb6fdd280b49e7cef4ad8b201ccb83 67995f1774136d92be819e114f0236f264d588fe Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jul 17 15:12:22 2012 +0200 Merge branch 'build-main' into backport-lenny Conflicts (resolved by Mike Gabriel): debian/changelog debian/control ----------------------------------------------------------------------- Summary of changes: VERSION.x2gognomebindings | 2 +- bin/x2goumount-session-gnome | 4 +++- debian/changelog | 18 +++++++++++++----- debian/control | 3 ++- 4 files changed, 19 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/VERSION.x2gognomebindings b/VERSION.x2gognomebindings index d17ac2c..bfbaa94 100644 --- a/VERSION.x2gognomebindings +++ b/VERSION.x2gognomebindings @@ -1 +1 @@ -2.0.1.5 +2.0.1.6 diff --git a/bin/x2goumount-session-gnome b/bin/x2goumount-session-gnome index 7133d07..99366dd 100755 --- a/bin/x2goumount-session-gnome +++ b/bin/x2goumount-session-gnome @@ -31,6 +31,8 @@ my $dir=<F>; my $session=<F>; close(F); +my $tmp_dir = '/tmp'; + $session=~s/\n//; chomp($dir); @@ -43,7 +45,7 @@ if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") $use_zenity=1; } -if(system( "fusermount -u $dir" ) == 0) +if(system( "cd $tmp_dir && fusermount -u $dir && cd - >/dev/null" ) == 0) { unlink($fname); db_deletemount( $session, $dir); diff --git a/debian/changelog b/debian/changelog index da9b3ba..a64fdc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,20 @@ -x2gognomebindings (2.0.1.5-0~x2go+bpo+lenny1) UNRELEASED; urgency=low +x2gognomebindings (2.0.1.6-0~x2go+bpo+lenny1) UNRELEASED; urgency=low * Backport latest package version to Debian lenny. - * Fix missing target binary-arch. - * Fallback to gnome-icon-theme as dependency for Debian lenny. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Feb 2012 15:41:42 +0100 -x2gognomebindings (2.0.1.5-0~x2go1) UNRELEASED; urgency=low +x2gognomebindings (2.0.1.6-0~x2go1) unstable; urgency=low + + * New upstream version (2.0.1.6): + - Make sure we run fusermount from within a directory that + the user has read access to. + * Depend on desktop-file-utils (postinst uses script + ,,update-desktop-database''). + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 02 Jul 2012 14:31:41 +0200 + +x2gognomebindings (2.0.1.5-0~x2go1) unstable; urgency=low * New upstream version (2.0.1.5): - Let GNOME sessions started via X2Go ignore GNOME's monitor settings @@ -14,7 +22,7 @@ x2gognomebindings (2.0.1.5-0~x2go1) UNRELEASED; urgency=low * Depend on x2goserver (>=3.1.0.2). Earlier versions have a bug in x2goruncommand that let's execution of X2Go server extensions fail. - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Feb 2012 15:41:42 +0100 + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 15 Apr 2012 18:30:12 +0200 x2gognomebindings (2.0.1.4-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index abffb6c..e45ce6f 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,8 @@ Depends: ${shlibs:Depends}, x2goserver-extensions, zenity, gnome-menus, - gnome-colors-common | gnome-icon-theme + gnome-colors-common | gnome-icon-theme, + desktop-file-utils Description: Description: x2gognomebindings (GNOME mimetypes for X2go) X2go is a server based computing environment with - session resuming hooks/post-receive -- x2gognomebindings.git (GNOME bindings for X2Go) 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 "x2gognomebindings.git" (GNOME bindings for X2Go).