[X2go-Commits] nxproxy.git - master (branch) updated: 3.4.0.3-4-ge6b40d4

[X2go dev team]

The branch, master has been updated
       via  e6b40d420e7de2d9ab1a0657d835bcb6f957e351 (commit)
       via  4b35c3d9b82e0957f85bf2503bb339d888cb3b2c (commit)
       via  945164f919652c5a98da4a85d7922e32cbb74c74 (commit)
       via  d870e934b235555a868132063530683654bbf7e8 (commit)
      from  06c9494d5f2ac258f268ef0987899484cdf9aec5 (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 e6b40d420e7de2d9ab1a0657d835bcb6f957e351
Merge: 4b35c3d9b82e0957f85bf2503bb339d888cb3b2c 06c9494d5f2ac258f268ef0987899484cdf9aec5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 30 16:34:06 2011 +0200

    Merge branch 'master' of ssh://code.x2go.org/srv/git/code.x2go.org/nxproxy

commit 4b35c3d9b82e0957f85bf2503bb339d888cb3b2c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 29 15:45:23 2011 +0200

    update debian/changelog

commit 945164f919652c5a98da4a85d7922e32cbb74c74
Merge: a466c83adab0d6964b1be5ed8fd734155ffb735e d870e934b235555a868132063530683654bbf7e8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 29 15:44:49 2011 +0200

    Merge commit 'upstream/3.5.0-1'
    
    Conflicts:
    	CHANGELOG
    	VERSION
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/rules

commit d870e934b235555a868132063530683654bbf7e8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 29 15:43:47 2011 +0200

    Imported Upstream version 3.5.0-1

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

Summary of changes:
 CHANGELOG        |    8 +++-----
 LICENSE          |    2 +-
 Main.c           |    2 +-
 VERSION          |    2 +-
 debian/changelog |    6 ++++++
 5 files changed, 12 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/CHANGELOG b/CHANGELOG
index ad92dc6..e5dff2e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,10 @@
 ChangeLog:
 
-nxproxy-3.4.0.2
+nxproxy-3.5.0-1
 
-- Adds make install/uninstall functionality.
+- Opened the 3.5.0 branch based on nxproxy-3.4.0-2.
 
-nxproxy-3.4.0.2
-
-- Changed version numbering scheme, upstream now maintained by X2go project.
+- Updated copyright to year 2011.
 
 nxproxy-3.4.0-2
 
diff --git a/LICENSE b/LICENSE
index 4d4dc28..64522ca 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2001, 2009 NoMachine - http://www.nomachine.com/.
+Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/.
 
 NXPROXY and NX extensions to this software are copyright of NoMachine.
 Redistribution and use of this software is allowed according to the
diff --git a/Main.c b/Main.c
index 4fe65e8..48c6855 100644
--- a/Main.c
+++ b/Main.c
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXPROXY, NX protocol compression and NX extensions to this software    */
 /* are copyright of NoMachine. Redistribution and use of the present      */
diff --git a/VERSION b/VERSION
index f43b747..1545d96 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.4.0.3
+3.5.0
diff --git a/debian/changelog b/debian/changelog
index 07bc1ca..3dee715 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nxproxy (3.5.0-1-0~x2go1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Reinhard Tartler <siretart at tauware.de>  Wed, 29 Jun 2011 15:45:13 +0200
+
 nxproxy (3.4.0.3-0~x2go2) lucid; urgency=low
 
   * Additional packaging changes (thanks to Stéphane Graber)


hooks/post-receive
-- 
nxproxy.git (NX Proxy tool)

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 "nxproxy.git" (NX Proxy tool).