[X2go-Commits] nxcompext.git - master (branch) updated: 3.4.0.2-3-g75a05a6

The branch, master has been updated via 75a05a65fb014c9c058788dd242d633829b30ebc (commit) via 4aeb6343f5f3ff320d97bdd2b0839b9ccc516e50 (commit) via 64bf311d3c15bb48e24ee46ab7c8a00e2a52203c (commit) from 758ea1363e435d984ed6d5f077167c3ef64b56f5 (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 75a05a65fb014c9c058788dd242d633829b30ebc Author: Reinhard Tartler <siretart@tauware.de> Date: Wed Jun 29 15:50:07 2011 +0200 update debian/changelog commit 4aeb6343f5f3ff320d97bdd2b0839b9ccc516e50 Merge: 758ea1363e435d984ed6d5f077167c3ef64b56f5 64bf311d3c15bb48e24ee46ab7c8a00e2a52203c Author: Reinhard Tartler <siretart@tauware.de> Date: Wed Jun 29 15:49:34 2011 +0200 Merge commit 'upstream/3.5.0-1' Conflicts: CHANGELOG VERSION debian/changelog debian/compat debian/control debian/rules commit 64bf311d3c15bb48e24ee46ab7c8a00e2a52203c Author: Reinhard Tartler <siretart@tauware.de> Date: Wed Jun 29 15:48:40 2011 +0200 Imported Upstream version 3.5.0-1 ----------------------------------------------------------------------- Summary of changes: Alpha.c | 2 +- Alpha.h | 2 +- Bitmap.c | 2 +- Bitmap.h | 2 +- CHANGELOG | 8 +++----- Clean.c | 2 +- Clean.h | 2 +- Colormap.c | 2 +- Colormap.h | 2 +- Jpeg.c | 2 +- Jpeg.h | 2 +- LICENSE | 2 +- Makefile.in | 2 +- Mask.c | 2 +- Mask.h | 2 +- NXlib.c | 2 +- NXlib.h | 2 +- NXlibint.h | 2 +- Pgn.c | 2 +- Pgn.h | 2 +- Rgb.c | 2 +- Rgb.h | 2 +- Rle.c | 2 +- Rle.h | 2 +- VERSION | 3 +-- Z.c | 2 +- Z.h | 2 +- debian/changelog | 6 ++++++ 28 files changed, 35 insertions(+), 32 deletions(-) The diff of changes is: diff --git a/Alpha.c b/Alpha.c index 15bebca..ff922af 100644 --- a/Alpha.c +++ b/Alpha.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Alpha.h b/Alpha.h index d785cef..4e9cef4 100644 --- a/Alpha.h +++ b/Alpha.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Bitmap.c b/Bitmap.c index 1b67155..80f5c96 100644 --- a/Bitmap.c +++ b/Bitmap.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Bitmap.h b/Bitmap.h index 211c956..f0074b4 100644 --- a/Bitmap.h +++ b/Bitmap.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/CHANGELOG b/CHANGELOG index de97f0a..941e9b4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,10 @@ ChangeLog: -nxcompext-3.4.0.2 +nxcompext-3.5.0-1 -- Adds make install/uninstall functionality +- Opened the 3.5.0 branch based on nxcompext-3.4.0-1. -nxcompext-3.4.0.1 - -- Change of version numbering scheme, upstream code now maintained by X2go project +- Updated copyright to year 2011. nxcompext-3.4.0-1 diff --git a/Clean.c b/Clean.c index 2283d26..3ddacdb 100644 --- a/Clean.c +++ b/Clean.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Clean.h b/Clean.h index 3cf6543..16636dc 100644 --- a/Clean.h +++ b/Clean.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Colormap.c b/Colormap.c index d14b48a..5d40bf6 100644 --- a/Colormap.c +++ b/Colormap.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Colormap.h b/Colormap.h index 0056257..3bf828c 100644 --- a/Colormap.h +++ b/Colormap.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Jpeg.c b/Jpeg.c index 63c94ae..0eac08a 100644 --- a/Jpeg.c +++ b/Jpeg.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Jpeg.h b/Jpeg.h index 2121352..c62899b 100644 --- a/Jpeg.h +++ b/Jpeg.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/LICENSE b/LICENSE index 12eb657..87b3c0e 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/. NXCOMPEXT library and NX extensions to X are copyright of NoMachine. Redistribution and use of this software is allowed according to the diff --git a/Makefile.in b/Makefile.in index 1325e88..6895876 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ ############################################################################ # # -# Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com. # +# Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com. # # # # NXCOMPEXT, NX protocol compression and NX extensions to this software # # are copyright of NoMachine. Redistribution and use of the present # diff --git a/Mask.c b/Mask.c index 980b700..2427de2 100644 --- a/Mask.c +++ b/Mask.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Mask.h b/Mask.h index 35d23c6..180edea 100644 --- a/Mask.h +++ b/Mask.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/NXlib.c b/NXlib.c index 5c68fb7..f8a81b6 100644 --- a/NXlib.c +++ b/NXlib.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/NXlib.h b/NXlib.h index 497ac5b..6d7895d 100644 --- a/NXlib.h +++ b/NXlib.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/NXlibint.h b/NXlibint.h index de1a3df..c96a596 100644 --- a/NXlibint.h +++ b/NXlibint.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Pgn.c b/Pgn.c index 31337cf..609ff95 100644 --- a/Pgn.c +++ b/Pgn.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Pgn.h b/Pgn.h index 6f84188..8de35c6 100644 --- a/Pgn.h +++ b/Pgn.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Rgb.c b/Rgb.c index 7a3dddd..9cf03b4 100644 --- a/Rgb.c +++ b/Rgb.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Rgb.h b/Rgb.h index 499509a..8fd33f3 100644 --- a/Rgb.h +++ b/Rgb.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Rle.c b/Rle.c index 1fb46e8..45f177c 100644 --- a/Rle.c +++ b/Rle.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Rle.h b/Rle.h index cfc2d6d..a41cf5c 100644 --- a/Rle.h +++ b/Rle.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, 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 261f9ad..1545d96 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1 @@ -3.4.0.2 - +3.5.0 diff --git a/Z.c b/Z.c index 8593f2a..c28a990 100644 --- a/Z.c +++ b/Z.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Z.h b/Z.h index 53dd3d7..04f5384 100644 --- a/Z.h +++ b/Z.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/debian/changelog b/debian/changelog index 7df16f0..f8908d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nxcompext (1:3.5.0-1-0~x2go1) unstable; urgency=low + + * New upstream version + + -- Reinhard Tartler <siretart@tauware.de> Wed, 29 Jun 2011 15:49:59 +0200 + nxcompext (1:3.4.0.2-0~x2go1) unstable; urgency=low * new upstream version: hooks/post-receive -- nxcompext.git (NX compext library) 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 "nxcompext.git" (NX compext library).