x2go-commits September 2013

x2go-commits@lists.x2go.org

2 participants
2415 discussions

x2gothinclient.git - master (branch) updated: 1.1.0.0-2-g3dd9651
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, master has been updated via 3dd9651fdad6742994b4bab2e9ae29bcf8ff9f43 (commit) from e8581d73ba1c426a85aaf24e17070f3e73b28e7c (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 | 1 + x2gousbmount/x2gousbmount | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 756b260..1671e22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x2gothinclient (1.1.0.0-0~x2go2) UNRELEASED; urgency=low * New upstream version (1.1.0.1): - Switch to VT-7 on TC shutdown. + - Syntax fix in x2gousbmount script. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 17 Aug 2013 00:35:31 +0200 diff --git a/x2gousbmount/x2gousbmount b/x2gousbmount/x2gousbmount index 0a5123b..7bf7b5a 100755 --- a/x2gousbmount/x2gousbmount +++ b/x2gousbmount/x2gousbmount @@ -21,7 +21,7 @@ use strict; use File::Path::Expand; -check_x2gothinclientd() { +sub check_x2gothinclientd { my $x=`ps ax | grep x2gothinclient`; if ( $x=~m/thinclientd/ ) { hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.1.0.0-1-ge8581d7
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, master has been updated discards f15d4e8fc0dda3ffb2126155d7aced2f1f5e30da (commit) via e8581d73ba1c426a85aaf24e17070f3e73b28e7c (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (f15d4e8fc0dda3ffb2126155d7aced2f1f5e30da) \ N -- N -- N (e8581d73ba1c426a85aaf24e17070f3e73b28e7c) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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: VERSION | 2 +- debian/changelog | 7 ++++--- x2gothinclient/sbin/x2gothinclientd | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index 238afc2..a6bbdb5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.0.1 +1.1.0.0 diff --git a/debian/changelog b/debian/changelog index b02a143..756b260 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low +x2gothinclient (1.1.0.0-0~x2go2) UNRELEASED; urgency=low - * Continue development... + * New upstream version (1.1.0.1): + - Switch to VT-7 on TC shutdown. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 19 Jul 2013 23:38:57 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 17 Aug 2013 00:35:31 +0200 x2gothinclient (1.1.0.0-0~x2go1) unstable; urgency=low diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 0fac6b4..9f502da 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -101,6 +101,7 @@ elsif ($pid == 0 ) # when used with plymouth, make sure we stay on the correct terminal system("killall Xorg"); system("shutdown -h now"); + system("chvt 7"); } # test if XServer is running, if not launch it... if ( check_x() ==0 ) hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.1.0.0-2-g3f13cd0
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, master has been updated discards b8774a3a8f2af738b53bb62f26466a931e983217 (commit) discards 3dd9651fdad6742994b4bab2e9ae29bcf8ff9f43 (commit) discards e8581d73ba1c426a85aaf24e17070f3e73b28e7c (commit) via 3f13cd0a6466012d297d5772ae79a54355c59691 (commit) via f15d4e8fc0dda3ffb2126155d7aced2f1f5e30da (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (b8774a3a8f2af738b53bb62f26466a931e983217) \ N -- N -- N (3f13cd0a6466012d297d5772ae79a54355c59691) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 3f13cd0a6466012d297d5772ae79a54355c59691 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 11 21:45:54 2013 +0200 Revert "Continue development..." This reverts commit f15d4e8fc0dda3ffb2126155d7aced2f1f5e30da. commit f15d4e8fc0dda3ffb2126155d7aced2f1f5e30da Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jul 19 23:39:19 2013 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 14 -------------- x2gothinclient/sbin/x2gothinclientd | 1 - x2gothinclientmanagement/sbin/x2gothinclient_shell | 2 +- x2gousbmount/x2gousbmount | 2 +- 4 files changed, 2 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0d09f7b..5f97dce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,3 @@ -x2gothinclient (1.1.0.0-0~x2go2) UNRELEASED; urgency=low - - [ Mike Gabriel ] - * New upstream version (1.1.0.1): - - Switch to VT-7 on TC shutdown. - - Syntax fix in x2gousbmount script. - - [ Arnold Krille ] - * New upstream version (1.1.0.1): - - Extend x2gothinclient_shell to run anything given as arguments and - fall back to $TC_SHELL when nothing is given. (Fixes: #301). - - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 17 Aug 2013 00:35:31 +0200 - x2gothinclient (1.1.0.0-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 9f502da..0fac6b4 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -101,7 +101,6 @@ elsif ($pid == 0 ) # when used with plymouth, make sure we stay on the correct terminal system("killall Xorg"); system("shutdown -h now"); - system("chvt 7"); } # test if XServer is running, if not launch it... if ( check_x() ==0 ) diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index ba4ec21..42f4f5d 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -82,7 +82,7 @@ export X2GO_HANDLE_DAEMONS=false mount /root -${*:-/bin/$TC_SHELL} +/bin/$TC_SHELL umount /root diff --git a/x2gousbmount/x2gousbmount b/x2gousbmount/x2gousbmount index 7bf7b5a..0a5123b 100755 --- a/x2gousbmount/x2gousbmount +++ b/x2gousbmount/x2gousbmount @@ -21,7 +21,7 @@ use strict; use File::Path::Expand; -sub check_x2gothinclientd { +check_x2gothinclientd() { my $x=`ps ax | grep x2gothinclient`; if ( $x=~m/thinclientd/ ) { hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.1.0.0-3-gb8774a3
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, wheezy-tce has been updated via b8774a3a8f2af738b53bb62f26466a931e983217 (commit) from 3dd9651fdad6742994b4bab2e9ae29bcf8ff9f43 (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 b8774a3a8f2af738b53bb62f26466a931e983217 Author: Arnold Krille <a.krille(a)b-c-s.de> Date: Wed Sep 11 21:44:07 2013 +0200 Extend x2gothinclient_shell to run anything given as arguments and fall back to $TC_SHELL when nothing is given. (Fixes: #301). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ x2gothinclientmanagement/sbin/x2gothinclient_shell | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1671e22..0d09f7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ x2gothinclient (1.1.0.0-0~x2go2) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (1.1.0.1): - Switch to VT-7 on TC shutdown. - Syntax fix in x2gousbmount script. + [ Arnold Krille ] + * New upstream version (1.1.0.1): + - Extend x2gothinclient_shell to run anything given as arguments and + fall back to $TC_SHELL when nothing is given. (Fixes: #301). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 17 Aug 2013 00:35:31 +0200 x2gothinclient (1.1.0.0-0~x2go1) unstable; urgency=low diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 42f4f5d..ba4ec21 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -82,7 +82,7 @@ export X2GO_HANDLE_DAEMONS=false mount /root -/bin/$TC_SHELL +${*:-/bin/$TC_SHELL} umount /root hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.1.0.0-1-ge8581d7
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, wheezy-tce has been updated via e8581d73ba1c426a85aaf24e17070f3e73b28e7c (commit) from 37470492cb86f3dd411f468c4a333840795776f3 (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 e8581d73ba1c426a85aaf24e17070f3e73b28e7c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Aug 17 00:36:13 2013 +0200 Switch to VT-7 on TC shutdown. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2gothinclient/sbin/x2gothinclientd | 1 + 2 files changed, 8 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5f97dce..756b260 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2gothinclient (1.1.0.0-0~x2go2) UNRELEASED; urgency=low + + * New upstream version (1.1.0.1): + - Switch to VT-7 on TC shutdown. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 17 Aug 2013 00:35:31 +0200 + x2gothinclient (1.1.0.0-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 0fac6b4..9f502da 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -101,6 +101,7 @@ elsif ($pid == 0 ) # when used with plymouth, make sure we stay on the correct terminal system("killall Xorg"); system("shutdown -h now"); + system("chvt 7"); } # test if XServer is running, if not launch it... if ( check_x() ==0 ) hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.1.0.0-2-g3dd9651
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, wheezy-tce has been updated via 3dd9651fdad6742994b4bab2e9ae29bcf8ff9f43 (commit) from e8581d73ba1c426a85aaf24e17070f3e73b28e7c (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 3dd9651fdad6742994b4bab2e9ae29bcf8ff9f43 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Aug 17 00:36:29 2013 +0200 Syntax fix in x2gousbmount script. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gousbmount/x2gousbmount | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 756b260..1671e22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x2gothinclient (1.1.0.0-0~x2go2) UNRELEASED; urgency=low * New upstream version (1.1.0.1): - Switch to VT-7 on TC shutdown. + - Syntax fix in x2gousbmount script. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 17 Aug 2013 00:35:31 +0200 diff --git a/x2gousbmount/x2gousbmount b/x2gousbmount/x2gousbmount index 0a5123b..7bf7b5a 100755 --- a/x2gousbmount/x2gousbmount +++ b/x2gousbmount/x2gousbmount @@ -21,7 +21,7 @@ use strict; use File::Path::Expand; -check_x2gothinclientd() { +sub check_x2gothinclientd { my $x=`ps ax | grep x2gothinclient`; if ( $x=~m/thinclientd/ ) { hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.6-1-gaee2f12
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, master has been updated via aee2f125143bb22c2f8725bc3fd9bfb45c0ea0c0 (commit) from 6b339e1d0187725eb6af4a96e52f38e948712b44 (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 aee2f125143bb22c2f8725bc3fd9bfb45c0ea0c0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 11 21:35:11 2013 +0200 Set Pinentry title to X2Go Pinpad (was: X2GO ...). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ pinentry-x2go/pinentry-x2go_de.ts | 2 +- pinentry-x2go/pinentrydialog.cpp | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bd639fa..a2c5a22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pinentry-x2go (0.7.5.7-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.7.5.7): + - Set Pinentry title to X2Go Pinpad (was: X2GO ...). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 11 Sep 2013 21:34:23 +0200 + pinentry-x2go (0.7.5.6-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/pinentry-x2go/pinentry-x2go_de.ts b/pinentry-x2go/pinentry-x2go_de.ts index fb3a6c2..5fe011d 100644 --- a/pinentry-x2go/pinentry-x2go_de.ts +++ b/pinentry-x2go/pinentry-x2go_de.ts @@ -4,7 +4,7 @@ <name>PinEntryDialog</name> <message> <location filename="pinentrydialog.cpp" line="35"/> - <source>X2GO Pinpad</source> + <source>X2Go Pinpad</source> <translation></translation> </message> <message> diff --git a/pinentry-x2go/pinentrydialog.cpp b/pinentry-x2go/pinentrydialog.cpp index baa40f5..0f92f01 100644 --- a/pinentry-x2go/pinentrydialog.cpp +++ b/pinentry-x2go/pinentrydialog.cpp @@ -35,7 +35,7 @@ PinEntryDialog::PinEntryDialog( QWidget* parent, const char* , bool ) : QDialog( parent ), _grabbed( false ) { - setWindowTitle(tr("X2GO Pinpad")); + setWindowTitle(tr("X2Go Pinpad")); _icon = new QLabel( this ); _icon->setPixmap( QMessageBox::standardIcon( QMessageBox::Information ) ); 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.6-2-g7d14c22
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, master has been updated via 7d14c221844031f5280bb3e041243968b4050c8a (commit) from aee2f125143bb22c2f8725bc3fd9bfb45c0ea0c0 (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 7d14c221844031f5280bb3e041243968b4050c8a Author: Orion Poplawski <orion(a)cora.nwra.com> Date: Wed Sep 11 21:39:12 2013 +0200 Fix FSF address in license headers. (Fixes: #303). ----------------------------------------------------------------------- Summary of changes: COPYING | 2 +- assuan/assuan-buffer.c | 2 +- assuan/assuan-defs.h | 2 +- assuan/assuan-handler.c | 2 +- assuan/assuan-listen.c | 2 +- assuan/assuan-pipe-server.c | 2 +- assuan/assuan-util.c | 2 +- assuan/assuan.h | 2 +- debian/changelog | 5 +++++ pinentry-x2go/pinentrydialog.h | 4 ++-- pinentry/pinentry-curses.c | 4 ++-- pinentry/pinentry-curses.h | 4 ++-- pinentry/pinentry.h | 4 ++-- secmem/memory.h | 2 +- secmem/secmem.c | 2 +- secmem/util.c | 2 +- secmem/util.h | 2 +- 17 files changed, 25 insertions(+), 20 deletions(-) The diff of changes is: diff --git a/COPYING b/COPYING index c7aea18..f406e2b 100644 --- a/COPYING +++ b/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/assuan/assuan-buffer.c b/assuan/assuan-buffer.c index df09d3d..537d89b 100644 --- a/assuan/assuan-buffer.c +++ b/assuan/assuan-buffer.c @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA */ #include <config.h> diff --git a/assuan/assuan-defs.h b/assuan/assuan-defs.h index 6c502bf..54f5699 100644 --- a/assuan/assuan-defs.h +++ b/assuan/assuan-defs.h @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef ASSUAN_DEFS_H diff --git a/assuan/assuan-handler.c b/assuan/assuan-handler.c index 947ab9d..ab884c5 100644 --- a/assuan/assuan-handler.c +++ b/assuan/assuan-handler.c @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA */ #include <config.h> diff --git a/assuan/assuan-listen.c b/assuan/assuan-listen.c index db63ad2..417f68b 100644 --- a/assuan/assuan-listen.c +++ b/assuan/assuan-listen.c @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA */ #include <config.h> diff --git a/assuan/assuan-pipe-server.c b/assuan/assuan-pipe-server.c index 5c5d124..683c3e2 100644 --- a/assuan/assuan-pipe-server.c +++ b/assuan/assuan-pipe-server.c @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA */ #include <config.h> diff --git a/assuan/assuan-util.c b/assuan/assuan-util.c index c2c899f..426beb5 100644 --- a/assuan/assuan-util.c +++ b/assuan/assuan-util.c @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA */ #include <config.h> diff --git a/assuan/assuan.h b/assuan/assuan.h index ada5d64..4c33548 100644 --- a/assuan/assuan.h +++ b/assuan/assuan.h @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef ASSUAN_H diff --git a/debian/changelog b/debian/changelog index a2c5a22..0c5b752 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ pinentry-x2go (0.7.5.7-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (0.7.5.7): - Set Pinentry title to X2Go Pinpad (was: X2GO ...). + [ Orion Poplawski ] + * New upstream version (0.7.5.7): + - Fix FSF address in license headers. (Fixes: #303). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 11 Sep 2013 21:34:23 +0200 pinentry-x2go (0.7.5.6-0~x2go1) unstable; urgency=low diff --git a/pinentry-x2go/pinentrydialog.h b/pinentry-x2go/pinentrydialog.h index 5e2b247..0ed47d0 100644 --- a/pinentry-x2go/pinentrydialog.h +++ b/pinentry-x2go/pinentrydialog.h @@ -17,8 +17,8 @@ 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 */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA */ #ifndef __PINENTRYDIALOG_H__ #define __PINENTRYDIALOG_H__ diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c index ace02ba..cc9e8ca 100644 --- a/pinentry/pinentry-curses.c +++ b/pinentry/pinentry-curses.c @@ -15,8 +15,8 @@ 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 */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/pinentry/pinentry-curses.h b/pinentry/pinentry-curses.h index e05593f..f1f947c 100644 --- a/pinentry/pinentry-curses.h +++ b/pinentry/pinentry-curses.h @@ -15,8 +15,8 @@ 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 */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA */ #ifndef PINENTRY_CURSES_H #define PINENTRY_CURSES_H diff --git a/pinentry/pinentry.h b/pinentry/pinentry.h index 55a5894..3da209d 100644 --- a/pinentry/pinentry.h +++ b/pinentry/pinentry.h @@ -15,8 +15,8 @@ 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 */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA */ #ifndef PINENTRY_H #define PINENTRY_H diff --git a/secmem/memory.h b/secmem/memory.h index c6d04b8..48b7413 100644 --- a/secmem/memory.h +++ b/secmem/memory.h @@ -14,7 +14,7 @@ * * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301. */ #ifndef _MEMORY_H diff --git a/secmem/secmem.c b/secmem/secmem.c index 796108d..7fb63ec 100644 --- a/secmem/secmem.c +++ b/secmem/secmem.c @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA */ #include <config.h> diff --git a/secmem/util.c b/secmem/util.c index 580fd34..47b2328 100644 --- a/secmem/util.c +++ b/secmem/util.c @@ -13,7 +13,7 @@ * * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301. */ #define _GNU_SOURCE 1 diff --git a/secmem/util.h b/secmem/util.h index 7986c99..8892fc6 100644 --- a/secmem/util.h +++ b/secmem/util.h @@ -14,7 +14,7 @@ * * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301. */ #ifndef _UTIL_H 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

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.6-7-g057048d
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, release/4.0.1.x has been updated via 057048d2f62841894c39a2ca00cd5a62a529d02f (commit) from afa555fcfdb84dcc005a38f7b0644813dde1e625 (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 057048d2f62841894c39a2ca00cd5a62a529d02f Author: Jürgen Hötzel <juergen(a)archlinux.org> Date: Wed Sep 11 21:21:33 2013 +0200 Use bash-builtin 'type' instead of to be avoided 'which'. (Fixes: #305). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2goserver/bin/x2goruncommand | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8493262..9ac7b64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,10 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low - Move xfonts-base from Recommends: field to Depends: field (bin:package x2goserver). + [ Jürgen Hötzel ] + * New upstream version (4.0.1.7): + - Use bash-builtin 'type' instead of to be avoided 'which'. (Fixes: #305). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 13:37:12 +0200 x2goserver (4.0.1.6-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index bca44f1..bd855c4 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -189,14 +189,14 @@ if [ "$cmd" == "TERMINAL" ]; then fi fi -EXEC=`which $cmd` +EXEC=`type -P $cmd` EXEC_WRAPPER="" BNAME=`basename "$EXEC"` if [ "$BNAME" == "rdesktop" ] then IMEXIT="true" - if which padsp >/dev/null; then + if type padsp >/dev/null; then EXEC_WRAPPER="padsp" args=" -r sound:local" fi hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-5-g2fd0892
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, master has been updated via 2fd089264b743449013522b386e7fc8086a552ae (commit) from 7eb59f32a8d39d03c4e426faf412f4a35f101766 (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 2fd089264b743449013522b386e7fc8086a552ae Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 11 15:53:41 2013 +0200 try to build without apache2 ----------------------------------------------------------------------- Summary of changes: debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/rules b/debian/rules index a7a4cfa..99a3a76 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) %: - dh $@ --parallel --with apache2 + dh $@ --parallel --with apache2 || dh $@ --parallel override_dh_auto_clean: dh_auto_clean 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).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2013