[X2Go-Commits] [x2gothinclient] 01/01: common: update copyright notices, whitespace fixes. Happy new year!
git-admin at x2go.org
git-admin at x2go.org
Fri Jan 9 03:38:34 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gothinclient.
commit b3a5d8a7d81959925e61bb5bbc1313795a86586a
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Jan 9 03:38:28 2015 +0100
common: update copyright notices, whitespace fixes. Happy new year!
---
cdmanager/init/x2gothinclient-cdmanager.init | 2 +-
cdmanager/powerej/eject.cpp | 4 ++--
cdmanager/x2gocdmanager | 12 ++++++------
common/lib/x2gothinclient_init | 4 ++--
debian/copyright | 10 +++++-----
.../init/x2gothinclient-displaymanager.init | 2 +-
displaymanager/sbin/x2gothinclientd | 8 ++++----
management/etc/x2gothinclient_settings | 2 +-
management/sbin/x2gothinclient_cleanup | 4 ++--
management/sbin/x2gothinclient_create | 8 ++++----
management/sbin/x2gothinclient_preptftpboot | 6 +++---
management/sbin/x2gothinclient_shell | 6 +++---
management/sbin/x2gothinclient_update | 8 ++++----
management/sbin/x2gothinclient_upgrade | 6 +++---
.../share/etc/x2gothinclient-displaymanager_start | 2 +-
.../share/etc/x2gothinclient-minidesktop_start | 2 +-
.../005_x2gothinclient-wipe-home | 2 +-
.../010_x2gothinclient-fresh-home | 2 +-
.../950_x2gothinclient-minidesktop | 2 +-
usbmount/x2gousbmount | 4 ++--
20 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/cdmanager/init/x2gothinclient-cdmanager.init b/cdmanager/init/x2gothinclient-cdmanager.init
index d291598..bafde41 100644
--- a/cdmanager/init/x2gothinclient-cdmanager.init
+++ b/cdmanager/init/x2gothinclient-cdmanager.init
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/cdmanager/powerej/eject.cpp b/cdmanager/powerej/eject.cpp
index 0ee9b9a..b35b8b9 100644
--- a/cdmanager/powerej/eject.cpp
+++ b/cdmanager/powerej/eject.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
+ * Copyright (C) 2005-2015 by Oleksandr Shneyder *
* oleksandr.shneyder at obviously-nice.de *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
{
QApplication app(argc,argv);
app.setStyle(new QPlastiqueStyle());
-
+
// QFrame*fr =new QFrame(0,Qt::WindowStaysOnTopHint|Qt::X11BypassWindowManagerHint);
MPushButton*fr =new MPushButton();
fr->setFixedSize(24,12);
diff --git a/cdmanager/x2gocdmanager b/cdmanager/x2gocdmanager
index d2b563a..7fbcc25 100755
--- a/cdmanager/x2gocdmanager
+++ b/cdmanager/x2gocdmanager
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# Copyright (C) 2007-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2007-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# X2Go is free software; you can redistribute it and/or modify
@@ -31,11 +31,11 @@ sub catch_term
# fork to background, check if forked state is ok...
my $pid = fork();
-if (not defined $pid)
+if (not defined $pid)
{
print "resources not avilable.\n";
-}
-elsif ($pid != 0)
+}
+elsif ($pid != 0)
{
open (F,">/var/run/x2gocdmanager.pid");
print F "$pid\n";
@@ -79,7 +79,7 @@ elsif ($pid == 0 )
while(sleep 4)
{
- # scan for SCSI-like CD/DVD drives, do this in intervals of
+ # scan for SCSI-like CD/DVD drives, do this in intervals of
# four seconds (to notice plugged-in USB-devices)
my @scsidrives;
my $otp=`lsscsi`;
@@ -106,7 +106,7 @@ elsif ($pid == 0 )
{
print "can't ioctl\n";
}
- elsif($rez==101)
+ elsif($rez==101)
{
push(@cdarray, at drives[$i]);
}
diff --git a/common/lib/x2gothinclient_init b/common/lib/x2gothinclient_init
index fdf5e56..87c35f8 100755
--- a/common/lib/x2gothinclient_init
+++ b/common/lib/x2gothinclient_init
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2007-2014 X2Go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2015 X2Go Project - http://wiki.x2go.org
#
# 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
@@ -17,7 +17,7 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
#
-# Copyright (C) 2011-2014 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2011-2015 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
set -e
diff --git a/debian/copyright b/debian/copyright
index ed5a302..95d63a3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,14 +4,14 @@ Upstream-Contact: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Source: http://wiki.x2go.org
Files: *
-Copyright: 2005-2014, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
- 2005-2014, Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
- 2005-2014, obviously nice - http://www.obviouslynice.de
+Copyright: 2005-2015, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+ 2005-2015, Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+ 2005-2015, obviously nice - http://www.obviouslynice.de
License: GPL-2+
Files: debian/*
-Copyright: 2005-2010, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
- 2010-2014, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Copyright: 2005-2015, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+ 2010-2015, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
License: GPL-2+
License: GPL-2+
diff --git a/displaymanager/init/x2gothinclient-displaymanager.init b/displaymanager/init/x2gothinclient-displaymanager.init
index 6923035..83bde1c 100644
--- a/displaymanager/init/x2gothinclient-displaymanager.init
+++ b/displaymanager/init/x2gothinclient-displaymanager.init
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/displaymanager/sbin/x2gothinclientd b/displaymanager/sbin/x2gothinclientd
index 06d67d3..d05609e 100755
--- a/displaymanager/sbin/x2gothinclientd
+++ b/displaymanager/sbin/x2gothinclientd
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# Copyright (C) 2007-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2007-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# X2Go is free software; you can redistribute it and/or modify
@@ -74,11 +74,11 @@ system("su x2gothinclient -c \". /etc/x2go/x2gothinclient_init\"");
# fork to background, check if forked state is ok...
my $pid = fork();
-if (not defined $pid)
+if (not defined $pid)
{
print "resources not avilable.\n";
-}
-elsif ($pid != 0)
+}
+elsif ($pid != 0)
{
open (F,">/var/run/x2gothinclient.pid");
print F "$pid\n";
diff --git a/management/etc/x2gothinclient_settings b/management/etc/x2gothinclient_settings
index c4806e4..7c5c8ad 100644
--- a/management/etc/x2gothinclient_settings
+++ b/management/etc/x2gothinclient_settings
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/management/sbin/x2gothinclient_cleanup b/management/sbin/x2gothinclient_cleanup
index ae758a4..74305cd 100755
--- a/management/sbin/x2gothinclient_cleanup
+++ b/management/sbin/x2gothinclient_cleanup
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
@@ -37,7 +37,7 @@ TC_CHROOT="${TC_CHROOT:-$TC_BASE/chroot}"
TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}"
TC_TFTP_BOOT="${TC_TFTP_BOOT:-/srv/tftp}"
-[ "x$USER" == "xroot" ] || {
+[ "x$USER" == "xroot" ] || {
echo "ERROR: X2Go Thin Client management scripts have to run"
echo "as super-user root."
exit -2
diff --git a/management/sbin/x2gothinclient_create b/management/sbin/x2gothinclient_create
index 1eb9efc..6dcaa32 100755
--- a/management/sbin/x2gothinclient_create
+++ b/management/sbin/x2gothinclient_create
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
@@ -55,13 +55,13 @@ if [ "x$TC_FLAVOUR" != "xminidesktop" ] && [ "x$TC_FLAVOUR" != "xdisplaymanager"
TC_FLAVOUR="displaymanager"
fi
-test -e "$TC_CHROOT" && {
+test -e "$TC_CHROOT" && {
echo "ERROR: X2Go Thin Client chroot already exists at $TC_CHROOT."
echo "Clear $TC_BASE/ and then run $(basename $0) again..."
exit -1
}
-[ "x$USER" == "xroot" ] || {
+[ "x$USER" == "xroot" ] || {
echo "ERROR: X2Go Thin Client management scripts have to run as super-user root."
exit -2
}
@@ -168,7 +168,7 @@ mkdir -p /var/lib/xkb
mkdir -p /var/lib/nfs
mkdir -p /var/lib/dbus
mkdir -p /etc/network
-ln -sf /dev/shm /etc/network/run
+ln -sf /dev/shm /etc/network/run
# disable service restarts
test -e /sbin/start-stop-daemon.real || mv /sbin/start-stop-daemon /sbin/start-stop-daemon.real
diff --git a/management/sbin/x2gothinclient_preptftpboot b/management/sbin/x2gothinclient_preptftpboot
index 346fb13..0a67182 100755
--- a/management/sbin/x2gothinclient_preptftpboot
+++ b/management/sbin/x2gothinclient_preptftpboot
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
@@ -42,13 +42,13 @@ TC_TFTP_BOOT="${TC_TFTP_BOOT:-/srv/tftp}"
mkdir -p "$TC_TFTP_BOOT"
-test -e "$TC_TFTP_BOOT/pxelinux.cfg" && {
+test -e "$TC_TFTP_BOOT/pxelinux.cfg" && {
echo "PXE boot files already found at $TC_TFTP_BOOT."
echo "Clear $TC_TFTP_BOOT/ and then run $(basename $0) again..."
exit -1
}
-[ "x$USER" == "xroot" ] || {
+[ "x$USER" == "xroot" ] || {
echo "ERROR: X2Go Thin Client management scripts have to run"
echo "as super-user root."
exit -2
diff --git a/management/sbin/x2gothinclient_shell b/management/sbin/x2gothinclient_shell
index 8125605..ebb51ec 100755
--- a/management/sbin/x2gothinclient_shell
+++ b/management/sbin/x2gothinclient_shell
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
@@ -35,13 +35,13 @@ source $ETCDIR/x2gothinclient_settings
TC_SHELL="${TC_SHELL:-bash}"
TC_CHROOT="${TC_CHROOT:-/opt/x2gothinclient}"
-test -e "$TC_CHROOT" || {
+test -e "$TC_CHROOT" || {
echo "ERROR: X2Go Thin Client chroot does not exist at $TC_CHROOT."
echo "Run x2gothinclient_create to create it..."
exit -1
}
-[ "x$USER" == "xroot" ] || {
+[ "x$USER" == "xroot" ] || {
echo "ERROR: X2Go Thin Client management scripts have to run"
echo "as super-user root."
exit -2
diff --git a/management/sbin/x2gothinclient_update b/management/sbin/x2gothinclient_update
index 3757cb8..932e03e 100755
--- a/management/sbin/x2gothinclient_update
+++ b/management/sbin/x2gothinclient_update
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
@@ -36,19 +36,19 @@ TC_BASE="${TC_BASE:-/opt/x2gothinclient}"
TC_CHROOT="${TC_CHROOT:-$TC_BASE/chroot}"
TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}"
-test -e "$TC_CHROOT" || {
+test -e "$TC_CHROOT" || {
echo "ERROR: X2Go Thin Client chroot does not exist at $TC_CHROOT."
echo "Run x2gothinclient_create to create it..."
exit -1
}
-test -e "$TC_CONFIG" || {
+test -e "$TC_CONFIG" || {
echo "ERROR: No X2Go Thin Client configuration found"
echo "at $TC_CONFIG. Please check..."
exit -1
}
-[ "x$USER" == "xroot" ] || {
+[ "x$USER" == "xroot" ] || {
echo "ERROR: X2Go Thin Client management scripts have to run"
echo "as super-user root."
exit -2
diff --git a/management/sbin/x2gothinclient_upgrade b/management/sbin/x2gothinclient_upgrade
index 80244aa..43fc110 100755
--- a/management/sbin/x2gothinclient_upgrade
+++ b/management/sbin/x2gothinclient_upgrade
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
@@ -34,13 +34,13 @@ source $ETCDIR/x2gothinclient_settings
TC_CHROOT="${TC_CHROOT:-/opt/x2gothinclient}"
-test -e "$TC_CHROOT" || {
+test -e "$TC_CHROOT" || {
echo "ERROR: X2Go Thin Client chroot does not exist at $TC_CHROOT."
echo "Run x2gothinclient_create to create it..."
exit -1
}
-[ "x$USER" == "xroot" ] || {
+[ "x$USER" == "xroot" ] || {
echo "ERROR: X2Go Thin Client management scripts have to run"
echo "as super-user root."
exit -2
diff --git a/management/share/etc/x2gothinclient-displaymanager_start b/management/share/etc/x2gothinclient-displaymanager_start
index de1475f..542ce8f 100755
--- a/management/share/etc/x2gothinclient-displaymanager_start
+++ b/management/share/etc/x2gothinclient-displaymanager_start
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/management/share/etc/x2gothinclient-minidesktop_start b/management/share/etc/x2gothinclient-minidesktop_start
index 915798d..12f609a 100755
--- a/management/share/etc/x2gothinclient-minidesktop_start
+++ b/management/share/etc/x2gothinclient-minidesktop_start
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home b/management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home
index e427752..30f1f3c 100755
--- a/management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home
+++ b/management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home b/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home
index df8fe63..ba235f9 100755
--- a/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home
+++ b/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/management/share/etc/x2gothinclient_init.d/950_x2gothinclient-minidesktop b/management/share/etc/x2gothinclient_init.d/950_x2gothinclient-minidesktop
index 2dddcc7..0360422 100755
--- a/management/share/etc/x2gothinclient_init.d/950_x2gothinclient-minidesktop
+++ b/management/share/etc/x2gothinclient_init.d/950_x2gothinclient-minidesktop
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/usbmount/x2gousbmount b/usbmount/x2gousbmount
index 472e2ef..e56624f 100755
--- a/usbmount/x2gousbmount
+++ b/usbmount/x2gousbmount
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# Copyright (C) 2007-2012 by X2Go project, http://wiki.x2go.org
+# Copyright (C) 2007-2015 by X2Go project, http://wiki.x2go.org
# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# X2Go is free software; you can redistribute it and/or modify
@@ -63,7 +63,7 @@ if ( check_x2gothinclientd() || ( -d "/usr/share/doc/x2gothinclient-minidesktop
print F "action: $action, device: $dev, model: $model ($ldev), total: $name\n";
mkdir("/media");
mkdir("/media/$name");
- print F "$name\n";
+ int F "$name\n";
if ( $action eq "add")
{
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
More information about the x2go-commits
mailing list