The branch, twofactorauth has been updated via e0666e6c3d50662b96ddcfc9a19a25ce15d415ab (commit) from 49ddf41dd754b6cfb90db2daf932752fb75f5881 (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: debian/python-x2go.docs | 1 - .../3.0.1.x/x2gomountdirs_X2goDropbox.patch | 77 ------------------- .../3.0.99.x/x2gomountdirs_X2goDropbox.patch | 78 -------------------- 3 files changed, 156 deletions(-) delete mode 100644 patches/x2goserver/3.0.1.x/x2gomountdirs_X2goDropbox.patch delete mode 100644 patches/x2goserver/3.0.99.x/x2gomountdirs_X2goDropbox.patch The diff of changes is: diff --git a/debian/python-x2go.docs b/debian/python-x2go.docs index a52108a..415a02b 100644 --- a/debian/python-x2go.docs +++ b/debian/python-x2go.docs @@ -3,4 +3,3 @@ README.Trinity-Desktop TODO .epydoc/html/ #.epydoc/pdf/ -patches/ \ No newline at end of file diff --git a/patches/x2goserver/3.0.1.x/x2gomountdirs_X2goDropbox.patch b/patches/x2goserver/3.0.1.x/x2gomountdirs_X2goDropbox.patch deleted file mode 100644 index 71e1963..0000000 --- a/patches/x2goserver/3.0.1.x/x2gomountdirs_X2goDropbox.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- a/x2gomountdirs 2010-12-16 23:11:29.000000000 +0100 -+++ b/x2gomountdirs 2011-01-06 03:07:56.000000000 +0100 -@@ -69,6 +69,8 @@ - my $ldir="$ENV{'HOME'}/media"; - my $spooldir_lnk="$ENV{'HOME'}/.x2go/C-$session/spool"; - my $spooldir="/tmp/spool_$ENV{'USER'}"; -+my $dropboxdir_lnk="$ENV{'HOME'}/.x2go/C-$session/dropbox"; -+my $dropboxdir="/tmp/dropbox_$ENV{'USER'}"; - - if(! -e $mdir) - { -@@ -109,6 +111,19 @@ - } - chmod(0700,$spooldir); - -+if(! -e $dropboxdir) -+{ -+ mkdir($dropboxdir); -+} -+chmod(0700,$dropboxdir); -+ -+$dropboxdir="$dropboxdir/$session"; -+if(! -e $dropboxdir) -+{ -+ mkdir($dropboxdir); -+} -+chmod(0700,$dropboxdir); -+ - if( -d $ldir) - { - rmdir($ldir); -@@ -129,12 +144,23 @@ - system ("ln -s $spooldir $spooldir_lnk"); - } - -+if( -d $dropboxdir_lnk) -+{ -+ rmdir($dropboxdir_lnk); -+} -+ -+if( ! -l $dropboxdir_lnk) -+{ -+ system ("ln -s $dropboxdir $dropboxdir_lnk"); -+} -+ - my $uname=$ENV{'USER'}; - - my @dirs=split(':',$dirlist); - for(my $i=0;$i<@dirs;$i++) - { - my $printspool=0; -+ my $dropboxspool=0; - my $mntpath; - if(@dirs[$i]=~m/__PRINT_SPOOL_/) - { -@@ -142,6 +168,12 @@ - $printspool=1; - $mntpath=$spooldir; - } -+ elsif(@dirs[$i]=~m/__DROPBOX_SPOOL_/) -+ { -+ @dirs[$i]=~s/__DROPBOX_SPOOL_//; -+ $dropboxspool=1; -+ $mntpath=$dropboxdir; -+ } - else - { - my $p=@dirs[$i]; -@@ -197,7 +229,7 @@ - $useplasmoid=1; - } - } -- if(! $printspool && ! $useplasmoid) -+ if(! $printspool && ! $dropboxspool && ! $useplasmoid) - { - my $fname="$ENV{'HOME'}/Desktop"; - my $p=@dirs[$i]; diff --git a/patches/x2goserver/3.0.99.x/x2gomountdirs_X2goDropbox.patch b/patches/x2goserver/3.0.99.x/x2gomountdirs_X2goDropbox.patch deleted file mode 100644 index 6f0fc4d..0000000 --- a/patches/x2goserver/3.0.99.x/x2gomountdirs_X2goDropbox.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- a/x2gomountdirs 2011-02-25 17:12:05.000000000 +0100 -+++ b/x2gomountdirs 2011-02-25 17:12:35.000000000 +0100 -@@ -72,6 +72,8 @@ - my $ldir="$ENV{'HOME'}/media"; - my $spooldir_lnk="$ENV{'HOME'}/.x2go/C-$session/spool"; - my $spooldir="/tmp/spool_$ENV{'USER'}"; -+my $dropboxdir_lnk="$ENV{'HOME'}/.x2go/C-$session/dropbox"; -+my $dropboxdir="/tmp/dropbox_$ENV{'USER'}"; - - if(! -e $mdir) - { -@@ -112,6 +114,19 @@ - } - chmod(0700,$spooldir); - -+if(! -e $dropboxdir) -+{ -+ mkdir($dropboxdir); -+} -+chmod(0700,$dropboxdir); -+ -+$dropboxdir="$dropboxdir/$session"; -+if(! -e $dropboxdir) -+{ -+ mkdir($dropboxdir); -+} -+chmod(0700,$dropboxdir); -+ - if( -d $ldir) - { - rmdir($ldir); -@@ -132,12 +147,23 @@ - system ("ln -s $spooldir $spooldir_lnk"); - } - -+if( -d $dropboxdir_lnk) -+{ -+ rmdir($dropboxdir_lnk); -+} -+ -+if( ! -l $dropboxdir_lnk) -+{ -+ system ("ln -s $dropboxdir $dropboxdir_lnk"); -+} -+ - my $uname=$ENV{'USER'}; - - my @dirs=split(':',$dirlist); - for(my $i=0;$i<@dirs;$i++) - { - my $printspool=0; -+ my $dropboxspool=0; - my $mntpath; - if(@dirs[$i]=~m/__PRINT_SPOOL_/) - { -@@ -145,6 +171,12 @@ - $printspool=1; - $mntpath=$spooldir; - } -+ elsif(@dirs[$i]=~m/__DROPBOX_SPOOL_/) -+ { -+ @dirs[$i]=~s/__DROPBOX_SPOOL_//; -+ $dropboxspool=1; -+ $mntpath=$dropboxdir; -+ } - else - { - my $p=@dirs[$i]; -@@ -197,7 +229,7 @@ - $useplasmoid=1; - } - } -- if(! $printspool && ! $useplasmoid) -+ if(! $printspool && ! $dropboxspool && ! $useplasmoid) - { - my $fname="$ENV{'HOME'}/Desktop"; - my $p=@dirs[$i]; - hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).