The branch, release/4.0.1.x has been updated
via a35b196a82b523f24430b6977c61bc8d702f9d93 (commit)
from ead0462ea08a768e361aad48ebc0fb913c5c826d (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:
…
[View More]x2goserver/bin/x2gosessionlimit | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit
index 7167d5a..91f747b 100755
--- a/x2goserver/bin/x2gosessionlimit
+++ b/x2goserver/bin/x2gosessionlimit
@@ -33,7 +33,7 @@ setlogmask( LOG_UPTO(x2gologlevel()) );
syslog('info', "x2gosessionlimit has been called");
-my $maxlimit=0;
+my $maxlimit=-1;
my $Config = new Config::Simple(syntax=>'ini');
$Config->read('/etc/x2go/x2goserver.conf' );
@@ -69,11 +69,13 @@ if($strlimit ne "")
if ($strlimit == 0)
{
print "0\n";
+ closelog;
exit 0;
}
if ($scount < $strlimit)
{
print "$strlimit\n";
+ closelog;
exit 0;
}
print "LIMIT\n";
@@ -99,12 +101,20 @@ while (my ($name, $passwd, $gid, $members) = getgrent())
}
}
+
if ($scount < $maxlimit)
{
print "$maxlimit\n";
+ closelog;
+ exit 0;
+}
+
+if ($maxlimit != -1) {
+ print "LIMIT\n";
+ closelog;
exit 0;
}
-print "LIMIT\n";
# closing syslog
closelog;
+
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).
[View Less]
The branch, release/4.0.1.x has been updated
via 90f7a40a659b98d62f936890aa7c786ea914cc44 (commit)
from c13d693dfd13f19bac13ad430b2165b2e6322f2a (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:
…
[View More]x2goserver-printing/bin/x2goprint | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint
index f6bc1c4..e3f3f8f 100755
--- a/x2goserver-printing/bin/x2goprint
+++ b/x2goserver-printing/bin/x2goprint
@@ -93,7 +93,7 @@ syslog('notice', "x2goprint is processing $printdir/$pdfFile with print job titl
($tm,$tm,$uid,$gid,$tm,$tm,$tm,$homedir)=getpwnam($user);
my $spoolbase="/tmp/.x2go-$user/spool";
-my $spooldir="$spoolbase/$session";
+my $spooldir="$spoolbase/C-$session";
my $spooltmp="$spoolbase/tmp";
mkpath($spooltmp);
chown $uid, $gid, "$spooltmp";
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).
[View Less]
The branch, release/4.0.1.x has been updated
via df13257d3fe83b4e12f9117f39e82b05276c44a1 (commit)
from 48ccfe5706cb5192fc0a4a83938db827b5565ee0 (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/…
[View More]changelog | 1 +
x2goserver/bin/x2goruncommand | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index cb2ec8e..8dae37b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low
* New upstream version (3.1.1.4):
- Fix x2gosessionlimit script.
- Wrap padsp around rdesktop calls if pulse is used as audio protocol.
+ - Add option ,,-r sound:local'' to rdesktop calls if pulse is enabled.
* /debian/control:
+ Fix x2goagent dependency.
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 1fb14bd..93e731f 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -185,7 +185,10 @@ BNAME=`basename "$EXEC"`
if [ "$BNAME" == "rdesktop" ]
then
IMEXIT="true"
- which padsp >/dev/null && EXEC_WRAPPER="padsp"
+ which padsp >/dev/null && {
+ EXEC_WRAPPER="padsp"
+ args=" -r sound:local"
+ }
fi
if [ "$X2GO_SESS_TYPE" == "P" ]
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).
[View Less]
The branch, release/4.0.1.x has been updated
via 15f93bffe63a7d9eea3a7cb1fe12d531e92c113f (commit)
from 1bbfded0225f0790c727cbf2e13e41aa19bee92d (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/…
[View More]changelog | 6 ++++++
x2goserver-compat/VERSION.x2goserver-compat | 2 +-
.../VERSION.x2goserver-extensions | 2 +-
.../VERSION.x2goserver-fmbindings | 2 +-
x2goserver-printing/VERSION.x2goserver-printing | 2 +-
x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +-
x2goserver-xsession/VERSION.x2goserver-xsession | 2 +-
x2goserver/VERSION.x2goserver | 2 +-
8 files changed, 13 insertions(+), 7 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e69b220..5b282e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low
+
+ * Continue development...
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200
+
x2goserver (3.1.1.3-0~x2go1) unstable; urgency=low
[ Jan Engelhardt ]
diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat
index c7271d2..f927970 100644
--- a/x2goserver-compat/VERSION.x2goserver-compat
+++ b/x2goserver-compat/VERSION.x2goserver-compat
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions
index c7271d2..f927970 100644
--- a/x2goserver-extensions/VERSION.x2goserver-extensions
+++ b/x2goserver-extensions/VERSION.x2goserver-extensions
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
index c7271d2..f927970 100644
--- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
+++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing
index c7271d2..f927970 100644
--- a/x2goserver-printing/VERSION.x2goserver-printing
+++ b/x2goserver-printing/VERSION.x2goserver-printing
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
index c7271d2..f927970 100644
--- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
+++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession
index c7271d2..f927970 100644
--- a/x2goserver-xsession/VERSION.x2goserver-xsession
+++ b/x2goserver-xsession/VERSION.x2goserver-xsession
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver
index c7271d2..f927970 100644
--- a/x2goserver/VERSION.x2goserver
+++ b/x2goserver/VERSION.x2goserver
@@ -1 +1 @@
-3.1.1.3
\ No newline at end of file
+3.1.1.4
\ No newline at end of file
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).
[View Less]
The branch, release/4.0.1.x has been updated
via d70b136ab99623678f34c12f2175570a856eaa77 (commit)
from 15f93bffe63a7d9eea3a7cb1fe12d531e92c113f (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/…
[View More]changelog | 3 ++-
x2goserver/bin/x2gosessionlimit | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5b282e8..a1fad39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low
- * Continue development...
+ * New upstream version (3.1.1.3):
+ - Fix x2gosessionlimit script.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit
index 0287fc4..7167d5a 100755
--- a/x2goserver/bin/x2gosessionlimit
+++ b/x2goserver/bin/x2gosessionlimit
@@ -71,12 +71,12 @@ if($strlimit ne "")
print "0\n";
exit 0;
}
- if ($strlimit <= $scount)
+ if ($scount < $strlimit)
{
print "$strlimit\n";
exit 0;
}
- print "$strlimit\n";
+ print "LIMIT\n";
exit 0;
}
@@ -99,12 +99,12 @@ while (my ($name, $passwd, $gid, $members) = getgrent())
}
}
-if ($maxlimit <= $scount)
+if ($scount < $maxlimit)
{
print "$maxlimit\n";
exit 0;
}
-print "$maxlimit\n";
+print "LIMIT\n";
# closing syslog
-closelog;
\ No newline at end of file
+closelog;
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).
[View Less]
The branch, release/4.0.1.x has been updated
via 6b41cef9e10da4dee9f16c36f273c3d723208953 (commit)
from 96046134086d5c2fc2fdb1345df32cc2af37e773 (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/…
[View More]changelog | 7 +++++++
x2goserver/Makefile | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 070c62f..309adc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low
+ [ Jan Engelhardt ]
+ * New upstream version (3.1.1.4):
+ - Add -pie as linker flag. Fixes non-position-independent-executable
+ (x2gosqlitewrapper.c). The executable is now completely position
+ independent.
+
+ [ Mike Gabriel ]
* New upstream version (3.1.1.4):
- Fix x2gosessionlimit script.
* /debian/control:
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 115c929..979283b 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -37,7 +37,7 @@ build: build-arch build-indep
build-arch: build_setgidwrappers
build_setgidwrappers:
- gcc -fPIE -o x2gosqlitewrapper x2gosqlitewrapper.c
+ gcc -fPIE -pie -o x2gosqlitewrapper x2gosqlitewrapper.c
build-indep: build_man2html
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).
[View Less]
The branch, release/4.0.1.x has been updated
via e1d66fc8929ff79495414e48068192a65c7d072d (commit)
from 44cbc5037875d6f5755abfd39271ab1c41347228 (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/…
[View More]changelog | 1 +
x2goserver/bin/x2goresume-session | 8 ++++++--
x2goserver/bin/x2gostartagent | 10 +++++++---
3 files changed, 14 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0d53fe4..611f584 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x2goserver (3.1.1.3-0~x2go1) UNRELEASED; urgency=low
[ Jan Engelhardt ]
* New upstream version (3.1.1.3):
- Do not block /etc/X11/Xresources with a directory (in Makefile).
+ - Avoid using archaic tools during free port detection.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 29 Jun 2012 17:49:04 +0200
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 3a9772f..cddbf05 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -64,8 +64,12 @@ SERVER=`echo "$SESSIONINFO" | awk -F, {'print $4'}`
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "old ports: $GR_PORT, $SOUND_PORT, $FS_PORT"
-#Get all used in system ports from netstat output
-SYSTEM_PORTS=`netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }'`
+#Get all used in system ports from ss output
+ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss);
+USED_PORTS=$(
+ "$ss" -lnt |
+ perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}';
+);
#check if saved in DB ports free
if grep -q "|${GR_PORT}|" <<<$SYSTEM_PORTS ; then
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index fedd6ba..abf1422 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -124,9 +124,13 @@ fi
USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME`
-#Get all used in system ports from X2Go database and netstat output
-USED_PORTS=`$X2GO_LIB_PATH/x2gogetports $HOSTNAME ; netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }'`
-
+#Get all used in system ports from X2Go database and ss output
+ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss);
+USED_PORTS=$(
+ "$X2GO_LIB_PATH/x2gogetports" "$HOSTNAME";
+ "$ss" -lnt |
+ perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}';
+);
while [ "$OUTPUT" != "inserted" ]; do
X2GO_PORT=$(($X2GO_PORT + 1))
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).
[View Less]
The branch, release/4.0.1.x has been updated
via e305a0a9cc943453a2e3508926967dc6b38bd525 (commit)
from e1d66fc8929ff79495414e48068192a65c7d072d (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/…
[View More]changelog | 1 +
x2goserver-compat/Makefile | 8 ++++----
x2goserver-extensions/Makefile | 8 ++++----
x2goserver-fmbindings/Makefile | 8 ++++----
x2goserver-printing/Makefile | 8 ++++----
x2goserver-pyhoca/Makefile | 8 ++++----
x2goserver-xsession/Makefile | 10 +++++-----
x2goserver/Makefile | 8 ++++----
8 files changed, 30 insertions(+), 29 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 611f584..b18f45e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x2goserver (3.1.1.3-0~x2go1) UNRELEASED; urgency=low
* New upstream version (3.1.1.3):
- Do not block /etc/X11/Xresources with a directory (in Makefile).
- Avoid using archaic tools during free port detection.
+ - Avoid using ls in Makefiles.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 29 Jun 2012 17:49:04 +0200
diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile
index 6bdc94c..d8a3c95 100755
--- a/x2goserver-compat/Makefile
+++ b/x2goserver-compat/Makefile
@@ -19,10 +19,10 @@ BINDIR=$(PREFIX)/bin
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
man_pages = `cd man && find * -type f`
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index d3bbbb6..13cf560 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -19,10 +19,10 @@ LIBDIR=$(PREFIX)/lib/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features .placeholder)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features .placeholder)
man_pages = `cd man && find * -type f`
diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile
index a9d8da5..8661e83 100755
--- a/x2goserver-fmbindings/Makefile
+++ b/x2goserver-fmbindings/Makefile
@@ -19,10 +19,10 @@ LIBDIR=$(PREFIX)/lib/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && ls *.features)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features)
man_pages = `cd man && find * -type f`
diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile
index 28ee92a..1c956f4 100755
--- a/x2goserver-printing/Makefile
+++ b/x2goserver-printing/Makefile
@@ -19,10 +19,10 @@ BINDIR=$(PREFIX)/bin
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
man_pages = `cd man && find * -type f`
diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile
index c24be41..95ab06d 100755
--- a/x2goserver-pyhoca/Makefile
+++ b/x2goserver-pyhoca/Makefile
@@ -19,10 +19,10 @@ LIBDIR=$(PREFIX)/lib/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
man_pages = `cd man && find * -type f`
diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index 40e7bf7..50c2818 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -20,11 +20,11 @@ ETCDIR=/etc/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-#BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-ETC_FILES=$(shell cd etc && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
+#BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+ETC_FILES=$(shell cd etc && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
#man_pages = `cd man && find * -type f`
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index be689c5..115c929 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -19,10 +19,10 @@ LIBDIR=$(PREFIX)/lib/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-SBIN_SCRIPTS=$(shell cd sbin && ls)
-LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+SBIN_SCRIPTS=$(shell cd sbin && echo *)
+LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
man_pages = `cd man && find * -type f`
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).
[View Less]
The branch, release/4.0.1.x has been updated
via 5c11e7e4e870b057bccba4c87d2e42209d5e899a (commit)
from 1368c7b4026cf2c8b0c81c890179eaa8bfc39f58 (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:
.../bin}…
[View More]/.placeholder | 0
.../man/man8}/.placeholder | 0
2 files changed, 0 insertions(+), 0 deletions(-)
copy {x2goserver-extensions/lib/extensions/fail-resume.d => x2goserver-pyhoca/bin}/.placeholder (100%)
copy {x2goserver-extensions/lib/extensions/fail-resume.d => x2goserver-pyhoca/man/man8}/.placeholder (100%)
The diff of changes is:
diff --git a/x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder b/x2goserver-pyhoca/bin/.placeholder
similarity index 100%
copy from x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder
copy to x2goserver-pyhoca/bin/.placeholder
diff --git a/x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder b/x2goserver-pyhoca/man/man8/.placeholder
similarity index 100%
copy from x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder
copy to x2goserver-pyhoca/man/man8/.placeholder
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).
[View Less]
The branch, release/4.0.1.x has been updated
via f1f73d203353f5d5f29c156a0298a2de927602a4 (commit)
from 4b25144ff4a9b71347e04e841c0b7dee3eb5f86d (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/…
[View More]changelog | 6 ++++++
x2goserver-compat/VERSION.x2goserver-compat | 2 +-
.../VERSION.x2goserver-extensions | 2 +-
.../VERSION.x2goserver-fmbindings | 2 +-
x2goserver-printing/VERSION.x2goserver-printing | 2 +-
x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +-
x2goserver-xsession/VERSION.x2goserver-xsession | 2 +-
x2goserver/VERSION.x2goserver | 2 +-
8 files changed, 13 insertions(+), 7 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f31cd4e..6d36b6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x2goserver (3.1.1.3-0~x2go1) UNRELEASED; urgency=low
+
+ * Continue development...
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 29 Jun 2012 17:49:04 +0200
+
x2goserver (3.1.1.2-0~x2go1) unstable; urgency=low
[ Mike Gabriel ]
diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat
index 2fc27ca..c7271d2 100644
--- a/x2goserver-compat/VERSION.x2goserver-compat
+++ b/x2goserver-compat/VERSION.x2goserver-compat
@@ -1 +1 @@
-3.1.1.2
\ No newline at end of file
+3.1.1.3
\ No newline at end of file
diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions
index 2fc27ca..c7271d2 100644
--- a/x2goserver-extensions/VERSION.x2goserver-extensions
+++ b/x2goserver-extensions/VERSION.x2goserver-extensions
@@ -1 +1 @@
-3.1.1.2
\ No newline at end of file
+3.1.1.3
\ No newline at end of file
diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
index ff03238..c7271d2 100644
--- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
+++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
@@ -1 +1 @@
-3.1.1.2
+3.1.1.3
\ No newline at end of file
diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing
index 2fc27ca..c7271d2 100644
--- a/x2goserver-printing/VERSION.x2goserver-printing
+++ b/x2goserver-printing/VERSION.x2goserver-printing
@@ -1 +1 @@
-3.1.1.2
\ No newline at end of file
+3.1.1.3
\ No newline at end of file
diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
index 2fc27ca..c7271d2 100644
--- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
+++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
@@ -1 +1 @@
-3.1.1.2
\ No newline at end of file
+3.1.1.3
\ No newline at end of file
diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession
index 2fc27ca..c7271d2 100644
--- a/x2goserver-xsession/VERSION.x2goserver-xsession
+++ b/x2goserver-xsession/VERSION.x2goserver-xsession
@@ -1 +1 @@
-3.1.1.2
\ No newline at end of file
+3.1.1.3
\ No newline at end of file
diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver
index 2fc27ca..c7271d2 100644
--- a/x2goserver/VERSION.x2goserver
+++ b/x2goserver/VERSION.x2goserver
@@ -1 +1 @@
-3.1.1.2
\ No newline at end of file
+3.1.1.3
\ No newline at end of file
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).
[View Less]