The branch, build-main has been updated via f38965ce12afc675472586823ac0f0332af02330 (commit) via 56828d6ace2f929784e432e0ac84b7a632287733 (commit) from 832c370405f2a6531297e89cf9181553a63e3eb8 (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: NEWS | 5 +++++ VERSION | 2 +- debian/changelog | 6 ++++++ doc/version.texi | 4 ++-- pinentry-x2go/main.cpp | 7 +++++-- pinentry-x2go/pinentrydialog.cpp | 7 +++++-- pinentry-x2go/pinentrydialog.h | 5 ++++- pinentry-x2go/pinlineedit.cpp | 2 +- pinentry-x2go/pinlineedit.h | 2 +- 9 files changed, 30 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/NEWS b/NEWS index c29cc8c..7154e60 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +Noteworthy changes in version 0.7.5.3 (2012-06-13) +------------------------------------------------ + + * Update of copyright headers in pinentry-x2go folder. + Noteworthy changes in version 0.7.5.2 (2012-06-13) ------------------------------------------------ diff --git a/VERSION b/VERSION index e6c33cc..a87212e 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -0.7.5.2 +0.7.5.3 diff --git a/debian/changelog b/debian/changelog index 94f4c20..18a7366 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pinentry-x2go (0.7.5.3-0~x2go1) unstable; urgency=low + + * Update of copyright information in several file headers. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 13 Jun 2012 17:11:48 +0200 + pinentry-x2go (0.7.5.2-0~x2go1) unstable; urgency=low * New upstream version (0.7.5.2): diff --git a/doc/version.texi b/doc/version.texi index b12cdf8..245a38c 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ @set UPDATED 13 Octobre 2011 @set UPDATED-MONTH Octobre 2011 -@set EDITION 0.7.5.2 -@set VERSION 0.7.5.2 +@set EDITION 0.7.5.3 +@set VERSION 0.7.5.3 diff --git a/pinentry-x2go/main.cpp b/pinentry-x2go/main.cpp index cade908..bcab4ba 100644 --- a/pinentry-x2go/main.cpp +++ b/pinentry-x2go/main.cpp @@ -1,10 +1,13 @@ /* main.cpp - Secure KDE dialog for PIN entry. - Copyright (C) 2002 Klar�lvdalens Datakonsult AB + Copyright (C) 2002 Klarälvdalens Datakonsult AB Copyright (C) 2003 g10 Code GmbH + Copyright (C) 2007-2012 X2Go Project Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se>. Modified by Marcus Brinkmann <marcus@g10code.de>. - + Modified for X2Go by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + and Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the diff --git a/pinentry-x2go/pinentrydialog.cpp b/pinentry-x2go/pinentrydialog.cpp index 87eb2bf..baa40f5 100644 --- a/pinentry-x2go/pinentrydialog.cpp +++ b/pinentry-x2go/pinentrydialog.cpp @@ -1,7 +1,10 @@ /* pinentrydialog.cpp - A secure KDE dialog for PIN entry. - Copyright (C) 2002 Klar�lvdalens Datakonsult AB + Copyright (C) 2002 Klarälvdalens Datakonsult AB + Copyright (C) 2007-2012 X2Go Project Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se>. - + Modified for X2Go by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + and Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the diff --git a/pinentry-x2go/pinentrydialog.h b/pinentry-x2go/pinentrydialog.h index fff8e6f..5e2b247 100644 --- a/pinentry-x2go/pinentrydialog.h +++ b/pinentry-x2go/pinentrydialog.h @@ -1,6 +1,9 @@ /* pinentrydialog.h - A secure KDE dialog for PIN entry. - Copyright (C) 2002 Klar�lvdalens Datakonsult AB + Copyright (C) 2002 Klarälvdalens Datakonsult AB + Copyright (C) 2007-2012 X2Go Project Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se>. + Modified for X2Go by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + and Mike Gabriel <mike.gabriel@das-netzwerkteam.de> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/pinentry-x2go/pinlineedit.cpp b/pinentry-x2go/pinlineedit.cpp index 7e699ba..5aeb631 100644 --- a/pinentry-x2go/pinlineedit.cpp +++ b/pinentry-x2go/pinlineedit.cpp @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2007 +// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2007-2012 // // Copyright: See COPYING file that comes with this distribution // diff --git a/pinentry-x2go/pinlineedit.h b/pinentry-x2go/pinlineedit.h index 76c8c82..7c39b37 100644 --- a/pinentry-x2go/pinlineedit.h +++ b/pinentry-x2go/pinlineedit.h @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2007 +// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2007-2012 // // Copyright: See COPYING file that comes with this distribution // hooks/post-receive -- pinentry-x2go.git (PinEntry Dialog (Qt) for 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 "pinentry-x2go.git" (PinEntry Dialog (Qt) for X2Go Client).