The branch, master has been updated via c75080d0571c29aa8a75b52e02a7a90610144739 (commit) via 9435e0168786933381c4d805e7a1fff60ada5185 (commit) from 462dcfefe3013bdd4c10fd4614eb884e5017ee4a (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 c75080d0571c29aa8a75b52e02a7a90610144739 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Aug 20 09:59:07 2012 +0200 release revision -0~x2go2 commit 9435e0168786933381c4d805e7a1fff60ada5185 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Aug 20 09:58:16 2012 +0200 Revert "Continue development..." This reverts commit 462dcfefe3013bdd4c10fd4614eb884e5017ee4a. ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 +++--- debian/control | 6 +++++- desktop/x2goclient.desktop | 2 +- version.h | 2 +- x2goplugin.rc | 10 +++++----- 6 files changed, 16 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index 7b9e24b..04a87a5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.99.2.3 +3.99.2.2 diff --git a/debian/changelog b/debian/changelog index 56953cf..28dec6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -x2goclient (3.99.2.3-0~x2go1) UNRELEASED; urgency=low +x2goclient (3.99.2.2-0~x2go2) unstable; urgency=low - * Continue development... + * Add Conflicts/Replaces for x2goclient-gtk. - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 15 Aug 2012 15:14:05 +0200 + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 20 Aug 2012 09:58:47 +0200 x2goclient (3.99.2.2-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index e522b31..f58d02b 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,11 @@ Depends: Recommends: openssh-server Suggests: - pinentry-x2go + pinentry-x2go +Conflicts: + x2goclient-gtk +Replaces: + x2goclient-gtk Description: X2Go Client application (Qt4) X2Go is a serverbased computing environment with - session resuming diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop index b54d1f8..9b38db6 100644 --- a/desktop/x2goclient.desktop +++ b/desktop/x2goclient.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=3.99.2.3 +Version=3.99.2.2 Type=Application Name=X2Go Client Exec=/usr/bin/x2goclient diff --git a/version.h b/version.h index e160175..98195c3 100644 --- a/version.h +++ b/version.h @@ -1,2 +1,2 @@ -#define VERSION "3.99.2.3" +#define VERSION "3.99.2.2" diff --git a/x2goplugin.rc b/x2goplugin.rc index 0dd82c7..c9604a6 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 3,99,2,3 - PRODUCTVERSION 3,99,2,3 + FILEVERSION 3,99,2,2 + PRODUCTVERSION 3,99,2,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "3, 99, 2 ,3\0" + VALUE "FileVersion", "3, 99, 2 ,2\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2012 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 3.99.2.3\0" - VALUE "ProductVersion", "3, 99, 2, 3\0" + VALUE "ProductName", "X2GoClient Plug-in 3.99.2.2\0" + VALUE "ProductVersion", "3, 99, 2, 2\0" END END BLOCK "VarFileInfo" 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).