x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

pinentry-x2go.git - build-main (branch) updated: 0.7.5.3
by git-admin＠x2go.org 13 Jun '12

13 Jun '12

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(a)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(a)klaralvdalens-datakonsult.se>. Modified by Marcus Brinkmann <marcus(a)g10code.de>. - + Modified for X2Go by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + and Mike Gabriel <mike.gabriel(a)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(a)klaralvdalens-datakonsult.se>. - + Modified for X2Go by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + and Mike Gabriel <mike.gabriel(a)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(a)klaralvdalens-datakonsult.se>. + Modified for X2Go by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + and Mike Gabriel <mike.gabriel(a)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(a)obviously-nice.de>, (C) 2007 +// Author: Oleksandr Shneyder <oleksandr.shneyder(a)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(a)obviously-nice.de>, (C) 2007 +// Author: Oleksandr Shneyder <oleksandr.shneyder(a)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).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.2-2-gf38965c
by git-admin＠x2go.org 13 Jun '12

13 Jun '12

The branch, master has been updated via f38965ce12afc675472586823ac0f0332af02330 (commit) from 56828d6ace2f929784e432e0ac84b7a632287733 (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 f38965ce12afc675472586823ac0f0332af02330 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 13 17:11:59 2012 +0200 release 0.7.5.3 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 750c5b2..18a7366 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -pinentry-x2go (0.7.5.3-0~x2go1) UNRELEASED; urgency=low +pinentry-x2go (0.7.5.3-0~x2go1) unstable; urgency=low * Update of copyright information in several file headers. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Jun 2012 17:11:05 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Jun 2012 17:11:48 +0200 pinentry-x2go (0.7.5.2-0~x2go1) unstable; urgency=low 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).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.2-1-g56828d6
by git-admin＠x2go.org 13 Jun '12

13 Jun '12

The branch, master has been updated 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 ----------------------------------------------------------------- commit 56828d6ace2f929784e432e0ac84b7a632287733 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 13 17:11:35 2012 +0200 Update of copyright information in several file headers. ----------------------------------------------------------------------- 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..750c5b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pinentry-x2go (0.7.5.3-0~x2go1) UNRELEASED; urgency=low + + * Update of copyright information in several file headers. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Jun 2012 17:11:05 +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(a)klaralvdalens-datakonsult.se>. Modified by Marcus Brinkmann <marcus(a)g10code.de>. - + Modified for X2Go by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + and Mike Gabriel <mike.gabriel(a)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(a)klaralvdalens-datakonsult.se>. - + Modified for X2Go by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + and Mike Gabriel <mike.gabriel(a)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(a)klaralvdalens-datakonsult.se>. + Modified for X2Go by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + and Mike Gabriel <mike.gabriel(a)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(a)obviously-nice.de>, (C) 2007 +// Author: Oleksandr Shneyder <oleksandr.shneyder(a)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(a)obviously-nice.de>, (C) 2007 +// Author: Oleksandr Shneyder <oleksandr.shneyder(a)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).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.1-6-g832c370
by git-admin＠x2go.org 13 Jun '12

13 Jun '12

The branch, master has been updated via 832c370405f2a6531297e89cf9181553a63e3eb8 (commit) from 3524a67d1a2ff7705b1b3b5083148e48abf5df52 (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 832c370405f2a6531297e89cf9181553a63e3eb8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 13 15:11:34 2012 +0200 release 0.7.5.2 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 43be673..94f4c20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pinentry-x2go (0.7.5.2-0~x2go1) UNRELEASED; urgency=low +pinentry-x2go (0.7.5.2-0~x2go1) unstable; urgency=low * New upstream version (0.7.5.2): - Strip code project down to its essentials, remove a lot of unneeded @@ -8,7 +8,7 @@ pinentry-x2go (0.7.5.2-0~x2go1) UNRELEASED; urgency=low - Replace string pinentry-qt with pinentry-x2go. * Make dh_clean remove all build cruft. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Oct 2011 02:03:51 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Jun 2012 15:11:19 +0200 pinentry-x2go (0.7.5.1-0~x2go1) unstable; urgency=low 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).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.1-5-g3524a67
by git-admin＠x2go.org 13 Jun '12

13 Jun '12

The branch, master has been updated via 3524a67d1a2ff7705b1b3b5083148e48abf5df52 (commit) from 72957640b97caee20329b4681d3cf97503c43a53 (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 3524a67d1a2ff7705b1b3b5083148e48abf5df52 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 13 15:08:43 2012 +0200 Make dh_clean remove all build cruft. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/rules | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8d72377..43be673 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ pinentry-x2go (0.7.5.2-0~x2go1) UNRELEASED; urgency=low - Make code tree fully build with autotools, see README file for further info. - Replace string pinentry-qt with pinentry-x2go. + * Make dh_clean remove all build cruft. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Oct 2011 02:03:51 +0200 diff --git a/debian/rules b/debian/rules index 0de53b1..50927c2 100755 --- a/debian/rules +++ b/debian/rules @@ -10,3 +10,22 @@ export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) override_dh_auto_install: +override_dh_auto_clean: + dh_auto_clean + rm -f INSTALL + rm -f Makefile.in + rm -f aclocal.m4 + rm -f assuan/Makefile.in + rm -f confdefs.h + rm -f config.guess + rm -f config.sub + rm -f configure + rm -f debian/autoreconf.after + rm -f debian/autoreconf.before + rm -f depcomp + rm -f doc/Makefile + rm -f doc/Makefile.in + rm -f install-sh + rm -f missing + rm -f pinentry/Makefile.in + rm -f secmem/Makefile.in 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).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.1-4-g7295764
by git-admin＠x2go.org 13 Jun '12

13 Jun '12

The branch, master has been updated via 72957640b97caee20329b4681d3cf97503c43a53 (commit) from c726abf576fa5516c78d2c58fcef870d2ad1971d (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 72957640b97caee20329b4681d3cf97503c43a53 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 13 15:05:20 2012 +0200 Replace string pinentry-qt with pinentry-x2go. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pinentry-x2go/main.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5f70312..8d72377 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ pinentry-x2go (0.7.5.2-0~x2go1) UNRELEASED; urgency=low cruft. - Make code tree fully build with autotools, see README file for further info. + - Replace string pinentry-qt with pinentry-x2go. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Oct 2011 02:03:51 +0200 diff --git a/pinentry-x2go/main.cpp b/pinentry-x2go/main.cpp index 363021b..cade908 100644 --- a/pinentry-x2go/main.cpp +++ b/pinentry-x2go/main.cpp @@ -131,7 +131,7 @@ int main (int argc, char *argv[]) { pin_is_known=false; - pinentry_init ("pinentry-qt"); + pinentry_init ("pinentry-x2go"); QString gpghome=getenv("GNUPGHOME"); QString cardid=getenv("CARDAPPID"); if(QFile::exists(gpghome+"/pins")) @@ -173,7 +173,7 @@ main (int argc, char *argv[]) *new_argv = (char*)malloc (n); if (!new_argv || !*new_argv) { - fprintf (stderr, "pinentry-qt: can't fixup argument list: %s\n", + fprintf (stderr, "pinentry-x2go: can't fixup argument list: %s\n", strerror (errno)); exit (EXIT_FAILURE); @@ -224,7 +224,7 @@ main (int argc, char *argv[]) /* Consumes all arguments. */ if (pinentry_parse_opts (argc, argv)) { - printf ("pinentry-qt (pinentry) " VERSION "\n"); + printf ("pinentry-x2go (pinentry) " VERSION "\n"); exit (EXIT_SUCCESS); } 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).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.1-3-gc726abf
by git-admin＠x2go.org 13 Jun '12

13 Jun '12

The branch, master has been updated via c726abf576fa5516c78d2c58fcef870d2ad1971d (commit) from d2060291d5cc7beb92f78168e48ececfe765d552 (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 c726abf576fa5516c78d2c58fcef870d2ad1971d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 13 15:03:09 2012 +0200 fix several lintian issues ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + debian/changelog | 6 ++++-- debian/control | 4 ++-- debian/copyright | 6 +++--- debian/upstream/changelog | 1 + 5 files changed, 11 insertions(+), 7 deletions(-) create mode 120000 ChangeLog create mode 120000 debian/upstream/changelog The diff of changes is: diff --git a/ChangeLog b/ChangeLog new file mode 120000 index 0000000..91d036c --- /dev/null +++ b/ChangeLog @@ -0,0 +1 @@ +debian/upstream/changelog \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 8201b55..5f70312 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ pinentry-x2go (0.7.5.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.7.5.2): - - Strip code project down to its essentials, remove a lot of unneeded cruft. - - Make code tree fully build with autotools, see README file for further info. + - Strip code project down to its essentials, remove a lot of unneeded + cruft. + - Make code tree fully build with autotools, see README file for further + info. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Oct 2011 02:03:51 +0200 diff --git a/debian/control b/debian/control index 2e50afe..bd84839 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libqt4-gui, libcap-dev, libglib2.0-dev (>= 2.15.5), m4, qt4-qmake, libqt4-dev, autoreconf +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libqt4-gui, libcap-dev, libglib2.0-dev (>= 2.15.5), m4, qt4-qmake, libqt4-dev, dh-autoreconf Standards-Version: 3.9.2 Homepage: http://code.x2go.org/releases/source/pinentry-x2go Vcs-Git: git://code.x2go.org/pinentry-x2go.git @@ -12,7 +12,7 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=pinentry-x2go.git;a=summary Package: pinentry-x2go Architecture: any -Depends: ${misc:Depends}, libqt4-gui +Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-gui Description: Qt4-based PIN or pass-phrase entry dialog for x2goclient This package contains a program that allows for entry of PINs or pass phrases. diff --git a/debian/copyright b/debian/copyright index 09cf10b..572d896 100644 --- a/debian/copyright +++ b/debian/copyright @@ -19,8 +19,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the -Free Software Foundation, Inc., -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Copyright (C) 2007 Oleksandr Shneyder oleksandr.shneyder(a)obviously-nice.de @@ -42,5 +42,5 @@ Security related bug reports: <security(a)gnupg.org> Robert Bihlmeyer <robbe(a)orcus.priv.at> Werner Koch, g10 Code GmbH <wk(a)gnupg.org> -Steffen Hansen, Klar�lvdalens Datakonsult AB <steffen(a)klaralvdalens-datakonsult.se> +Steffen Hansen, Klarälvdalens Datakonsult AB <steffen(a)klaralvdalens-datakonsult.se> Marcus Brinkmann, g10 Code GmbH <marcus(a)g10code.com> diff --git a/debian/upstream/changelog b/debian/upstream/changelog new file mode 120000 index 0000000..0891c85 --- /dev/null +++ b/debian/upstream/changelog @@ -0,0 +1 @@ +../changelog \ No newline at end of file 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).

1 0

python-x2go.git - master (branch) updated: 0.2.0.5-1-g1cfff12
by git-admin＠x2go.org 12 Jun '12

12 Jun '12

The branch, master has been updated via 1cfff12e78fdcd63758a31100f3decbbc6be98a4 (commit) from 3b1c605aceda599b49b84248308e31ee9af9af95 (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 1cfff12e78fdcd63758a31100f3decbbc6be98a4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 12 15:52:03 2012 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 638a7df..2aa2f35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-x2go (0.2.0.6-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Jun 2012 15:51:52 +0200 + python-x2go (0.2.0.5-0~x2go1) unstable; urgency=low * Bugfix release (0.2.0.4): hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - build-main (branch) updated: 0.2.0.5
by git-admin＠x2go.org 12 Jun '12

12 Jun '12

The branch, build-main has been updated via 3b1c605aceda599b49b84248308e31ee9af9af95 (commit) via 6bd98163227c4fc161dc438636d6941f55f39f51 (commit) via 4113c80b06c3a503dbe4cc4723145f74b5e98a8a (commit) from b7d446e991635f3bd996c932b5da7334b85e06be (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: debian/changelog | 8 ++++++++ x2go/__init__.py | 2 +- x2go/defaults.py | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f759dea..638a7df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-x2go (0.2.0.5-0~x2go1) unstable; urgency=low + + * Bugfix release (0.2.0.4): + - Fix for building Python X2Go in pbuilder environment. Catch + Xlib.error.DisplayConnectionError and ignore it. Now the real fix!!! + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Jun 2012 15:50:17 +0200 + python-x2go (0.2.0.4-0~x2go1) unstable; urgency=low * Bugfix release (0.2.0.4): diff --git a/x2go/__init__.py b/x2go/__init__.py index 4c38720..f61053f 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.0.4' +__VERSION__ = '0.2.0.5' from gevent import monkey monkey.patch_all() diff --git a/x2go/defaults.py b/x2go/defaults.py index b106225..350a288 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -40,7 +40,9 @@ if X2GOCLIENT_OS != 'Windows': # handle missing X displays on package build try: X_DISPLAY = Xlib.display.Display() - except Xlib.error.DisplayNameError, Xlib.error.DisplayConnectionError: + except Xlib.error.DisplayNameError: + X_DISPLAY = None + except Xlib.error.DisplayConnectionError: X_DISPLAY = None LOCAL_HOME = os.path.normpath(os.path.expanduser('~')) hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.2.0.4-3-g3b1c605
by git-admin＠x2go.org 12 Jun '12

12 Jun '12

The branch, master has been updated via 3b1c605aceda599b49b84248308e31ee9af9af95 (commit) from 6bd98163227c4fc161dc438636d6941f55f39f51 (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 3b1c605aceda599b49b84248308e31ee9af9af95 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 12 15:50:32 2012 +0200 release 0.2.0.5 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 27d8c56..638a7df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -python-x2go (0.2.0.5-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.2.0.5-0~x2go1) unstable; urgency=low * Bugfix release (0.2.0.4): - Fix for building Python X2Go in pbuilder environment. Catch Xlib.error.DisplayConnectionError and ignore it. Now the real fix!!! - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Jun 2012 10:10:29 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Jun 2012 15:50:17 +0200 python-x2go (0.2.0.4-0~x2go1) unstable; urgency=low hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits