The branch, build-baikal has been updated via 8b1b91fcb8cb8644f22312190e1edc5ba3c05b74 (commit) from cbd564c7c77a32ea29b7694c2f5676acc68c756c (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: Makefile.PL | 2 +- debian/changelog | 20 ++++++++++---------- debian/config | 4 ++-- debian/control | 8 ++++---- debian/po/de.po | 4 ++-- debian/po/templates.pot | 4 ++-- debian/templates | 6 +++--- x2goserver-common/VERSION.x2goserver-common | 2 +- 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 +- 15 files changed, 32 insertions(+), 32 deletions(-) The diff of changes is: diff --git a/Makefile.PL b/Makefile.PL index 68d6fde..e5d620c 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -5,5 +5,5 @@ use ExtUtils::MakeMaker; WriteMakefile(FIRST_MAKEFILE => 'Makefile.perl', PMLIBDIRS => ['X2Go'], NAME => '', - VERSION => '3.2.0.0', + VERSION => '4.1.0.0', ); diff --git a/debian/changelog b/debian/changelog index f8c1904..20fd0cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] - * Bump next upstream version to 3.2.0.0. - * New upstream version (3.2.0.0): + * Bump development upstream version to 4.1.0.0. + * New upstream version (4.1.0.0): - Transform x2gologlevel.pm into proper Perl module X2Go::Log. - Transform x2godbwrapper.pm into proper Perl module X2Go::Server::DB. - Transform x2gosqlitewrapper.pl into small wrapper script and move the @@ -31,36 +31,36 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low to libx2go-server-db-perl and x2goserver-common). [ Orion Poplawski ] - * New upstream version (3.2.0.0): + * New upstream version (4.1.0.0): - Use new script x2gopath in Perl::API. (Fixes: #86). -- Reinhard Tartler <siretart@tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 -x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.0-0~x2go1) UNRELEASED; urgency=low [ Jan Engelhardt ] - * New upstream version (3.1.1.10): + * New upstream version (4.0.0.0): - Replace script x2gobasepath by script x2gopath that makes it much easier for distro packagers to tweak the installation paths of X2Go Server components. [ Mike Gabriel ] - * New upstream version (3.1.1.10): + * New upstream version (4.0.0.0): - Adapt Xinerama path in x2gopath: use $base for detecting the path to the Xinerama libs, as well, as is done with all the other paths. - Fix mounting of multiple paths, thanks to Pascal Vibet. (Fixes: #67). [ Orion Poplawski ] - * New upstream version (3.1.1.10): + * New upstream version (4.0.0.0): - Honour CFLAGS when compiling the server's sgid wrapper script (Fixes: #83). [ Oleksandr Shneyder ] - * New upstream version (3.1.1.10): + * New upstream version (4.0.0.0): - Fix SSHFS mounting from Ubuntu clients. - Create /tmp/.X11-unix if not exists. [ Reinhard Tartler ] - * New upstream version (3.1.1.10): + * New upstream version (4.0.0.0): - Introduce /etc/x2go/x2goagent.options to allow overriding x2goagent options. This new configuration file specifies default options that clients can override. diff --git a/debian/config b/debian/config index 58fc25f..26035e1 100755 --- a/debian/config +++ b/debian/config @@ -14,11 +14,11 @@ if dpkg --compare-versions "$LASTVERSION" lt "3.1.0.0" && \ fi -if dpkg --compare-versions "$LASTVERSION" lt "3.2.0.0" && \ +if dpkg --compare-versions "$LASTVERSION" lt "4.1.0.0" && \ [ -e /etc/x2go/x2gosql/sql ] && \ egrep "^backend=postgres.*" /etc/x2go/x2gosql/sql >/dev/null; then - db_input critical x2goserver/upgrade-3_2_0_0 || true + db_input critical x2goserver/upgrade-4_1_0_0 || true db_go fi \ No newline at end of file diff --git a/debian/control b/debian/control index 1c321e9..9110cfa 100644 --- a/debian/control +++ b/debian/control @@ -78,9 +78,9 @@ Depends: ${misc:Depends}, adduser, Breaks: - x2goserver (<< 3.2.0.0-0~), + x2goserver (<< 4.1.0.0-0~), Replaces: - x2goserver (<< 3.2.0.0-0~), + x2goserver (<< 4.1.0.0-0~), Description: X2Go Server (common files) X2Go is a server based computing environment with - session resuming @@ -128,9 +128,9 @@ Depends: libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~), x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), Breaks: - x2goserver (<< 3.2.0.0-0~), + x2goserver (<< 4.1.0.0-0~), Replaces: - x2goserver (<< 3.2.0.0-0~), + x2goserver (<< 4.1.0.0-0~), Description: Perl X2Go::Server:DB package X2Go is a server based computing environment with - session resuming diff --git a/debian/po/de.po b/debian/po/de.po index 069909c..6377a73 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -51,8 +51,8 @@ msgstr "X2Go Server Upgrade" #. Type: text #. Description #: ../templates:2001 -msgid "You are upgrading from an X2Go Server version (< 3.2.0.0). Between 3.2.0.0 and 3.1.1.x the package structure has undergone a major change." -msgstr "Sie aktualisieren X2Go Server von einer Version (< 3.2.0.0). Seit 3.1.1.x wurde das Paket einigen strukturellen �nderungen unterzogen." +msgid "You are upgrading from an X2Go Server version (< 4.1.0.0). Between 4.1.0.0 and 4.0.0.x the package structure has undergone a major change." +msgstr "Sie aktualisieren X2Go Server von einer Version (< 4.1.0.0). Seit 4.0.0.x wurde das Paket einigen strukturellen �nderungen unterzogen." #. Type: text #. Description diff --git a/debian/po/templates.pot b/debian/po/templates.pot index d18be4d..082ae26 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -50,8 +50,8 @@ msgstr "" #. Description #: ../templates:2001 msgid "" -"You are upgrading from an X2Go Server version (< 3.2.0.0). Between 3.2.0.0 " -"and 3.1.1.x the package structure has undergone a major change." +"You are upgrading from an X2Go Server version (< 4.1.0.0). Between 4.1.0.0 " +"and 4.0.0.x the package structure has undergone a major change." msgstr "" #. Type: text diff --git a/debian/templates b/debian/templates index 153d971..4eeed86 100644 --- a/debian/templates +++ b/debian/templates @@ -8,11 +8,11 @@ _Description: X2Go Server / PostgreSQL Upgrade using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-pgsql-database.gz -Template: x2goserver/upgrade-3_2_0_0 +Template: x2goserver/upgrade-4_1_0_0 Type: text _Description: X2Go Server Upgrade - You are upgrading from an X2Go Server version (< 3.2.0.0). Between - 3.2.0.0 and 3.1.1.x the package structure has undergone a major + You are upgrading from an X2Go Server version (< 4.1.0.0). Between + 4.1.0.0 and 4.0.0.x the package structure has undergone a major change. . Note that most of the Perl code in X2Go Server has been moved into diff --git a/x2goserver-common/VERSION.x2goserver-common b/x2goserver-common/VERSION.x2goserver-common index 6744a5d..4961368 100644 --- a/x2goserver-common/VERSION.x2goserver-common +++ b/x2goserver-common/VERSION.x2goserver-common @@ -1 +1 @@ -3.2.0.0 \ No newline at end of file +4.1.0.0 \ No newline at end of file diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 6744a5d..4961368 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.2.0.0 \ No newline at end of file +4.1.0.0 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 6744a5d..4961368 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.2.0.0 \ No newline at end of file +4.1.0.0 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 6744a5d..4961368 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.2.0.0 \ No newline at end of file +4.1.0.0 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 6744a5d..4961368 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.2.0.0 \ No newline at end of file +4.1.0.0 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 6744a5d..4961368 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.2.0.0 \ No newline at end of file +4.1.0.0 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 6744a5d..4961368 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.2.0.0 \ No newline at end of file +4.1.0.0 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 6744a5d..4961368 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.2.0.0 \ No newline at end of file +4.1.0.0 \ 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).