[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.3.0-28-ga80a66a

X2Go dev team git-admin at x2go.org
Sun Dec 30 15:34:17 CET 2012


The branch, master has been updated
       via  a80a66a717fa53396e285eec23825bf38095d8a0 (commit)
       via  5910fe66e72738529e750995f1c5229fcd2b5f58 (commit)
      from  53034885f767dbb2211afa9f88f28e2af77645cc (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 a80a66a717fa53396e285eec23825bf38095d8a0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 30 15:34:13 2012 +0100

    release 4.0.0.0

commit 5910fe66e72738529e750995f1c5229fcd2b5f58
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 30 15:33:55 2012 +0100

    Bump version to 4.0.0.0 (for Baikal bundle release).

-----------------------------------------------------------------------

Summary of changes:
 VERSION                    |    2 +-
 debian/changelog           |   23 ++++++++++++-----------
 desktop/x2goclient.desktop |    4 ++--
 version.h                  |    2 +-
 x2goplugin.rc              |   10 +++++-----
 5 files changed, 21 insertions(+), 20 deletions(-)

The diff of changes is:
diff --git a/VERSION b/VERSION
index 3447687..fd5e525 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.99.3.1
+4.0.0.0
diff --git a/debian/changelog b/debian/changelog
index b0d9de3..639874c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,33 +1,33 @@
-x2goclient (3.99.3.1-0~x2go1) UNRELEASED; urgency=low
+x2goclient (4.0.0.0-0~x2go1) unstable; urgency=low
 
   [ Christoffer Krakou ]
-  * New upstream version (3.99.3.1):
+  * New upstream version (4.0.0.0):
     - Update Danish translation.
     - Update Danish translation (SSH proxy feature).
 
   [ Daniel Lindgren ]
-  * New upstream version (3.99.3.1):
+  * New upstream version (4.0.0.0):
     - Update Swedish translation.
 
   [ Ezra Bühler ]
-  * New upstream version (3.99.3.1):
+  * New upstream version (4.0.0.0):
     - Make it possible to resume a session using the keyboard only.
       Also fix the tab order in the resume session dialog by
       changing the focus policy of the main window. (Fixes: #80).
 
   [ Heinz-M. Graesing ]
-  * New upstream version (3.99.3.1):
+  * New upstream version (4.0.0.0):
     - Update refurbished X2Go Logo set. License for the X2Go Logos is GPL-2.0+.
       The inner X2Go logo background is now white (non-transparent) which should
       fix poor display results for X2Go icons in application menus using a dark
       theme. (Fixes: #59).
 
   [ Jan Engelhardt ]
-  * New upstream version (3.99.3.1):
+  * New upstream version (4.0.0.0):
     - Fix Debian-like Qt path (qmake will handle it internally).
 
   [ Oleksandr Shneyder ]
-  * New upstream version (3.99.3.1):
+  * New upstream version (4.0.0.0):
     - Translation files updated.
     - Russian translation updated.
     - Add support for pgp cards in broker mode.
@@ -42,19 +42,20 @@ x2goclient (3.99.3.1-0~x2go1) UNRELEASED; urgency=low
     - Add OpenSSL license exception.
 
   [ Ricardo Diaz ]
-  * New upstream version (3.99.3.1):
+  * New upstream version (4.0.0.0):
     - Update Spanish translation file.
 
   [ Mike Gabriel ]
-  * New upstream version (3.99.3.1):
+  * New upstream version (4.0.0.0):
     - Update German translation file.
     - Get rid of br html tags in client<->broker communication (Fixes: #81).
+    - Bump version to 4.0.0.0 (for Baikal bundle release).
 
   [ Terje Andersen ]
-  * New upstream version (3.99.3.1):
+  * New upstream version (4.0.0.0):
     - Update Bokmal (Norway) translation file.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 07 Nov 2012 16:26:49 +0100
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 30 Dec 2012 15:34:02 +0100
 
 x2goclient (3.99.3.0-0~x2go1) unstable; urgency=low
 
diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop
index d72bdf4..6ae7fe9 100644
--- a/desktop/x2goclient.desktop
+++ b/desktop/x2goclient.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Version=3.99.3.1
+Version=1.0
 Type=Application
 Name=X2Go Client
-Exec=/usr/bin/x2goclient
+Exec=x2goclient
 Icon=x2goclient
 StartupWMClass=x2goclient
 X-Window-Icon=x2goclient
diff --git a/version.h b/version.h
index e0497dc..e6b40e3 100644
--- a/version.h
+++ b/version.h
@@ -15,5 +15,5 @@
 *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
 ***************************************************************************/
 
-#define VERSION "3.99.3.1"
+#define VERSION "4.0.0.0"
 
diff --git a/x2goplugin.rc b/x2goplugin.rc
index 4e3b3b7..3e40602 100644
--- a/x2goplugin.rc
+++ b/x2goplugin.rc
@@ -1,8 +1,8 @@
 1 TYPELIB "x2goplugin.rc"
 
 1 VERSIONINFO
- FILEVERSION 3,99,3,1
- PRODUCTVERSION 3,99,3,1
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
  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, 3 ,1\0"
+            VALUE "FileVersion", "4, 0, 0 ,0\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.3.1\0"
-            VALUE "ProductVersion", "3, 99, 3, 1\0"
+            VALUE "ProductName", "X2GoClient Plug-in 4.0.0.0\0"
+            VALUE "ProductVersion", "4, 0, 0, 0\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).




More information about the x2go-commits mailing list