[X2Go-Commits] [x2godesktopsharing] 03/07: Fix copyright headers (development started in 2006, not 2009). - Drop Oleksandr and Heinz from the x2godesktopsharing.features file. No work contributed by them.
git-admin at x2go.org
git-admin at x2go.org
Sat Nov 17 11:32:38 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2godesktopsharing.
commit 3819ba7032f649d131ad90e5e200e37553831c82
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Nov 17 11:05:39 2018 +0100
Fix copyright headers (development started in 2006, not 2009). - Drop Oleksandr and Heinz from the x2godesktopsharing.features file. No work contributed by them.
---
accessaction.cpp | 2 +-
accessaction.h | 2 +-
debian/changelog | 3 +++
debian/copyright | 10 +++++-----
listdialog.cpp | 2 +-
main.cpp | 2 +-
share/x2gofeature.d/x2godesktopsharing.features | 4 +---
sharetray.cpp | 2 +-
sharetray.h | 2 +-
simplelocalsocket.cpp | 2 +-
simplelocalsocket.h | 2 +-
11 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/accessaction.cpp b/accessaction.cpp
index 55bca8c..941af2e 100644
--- a/accessaction.cpp
+++ b/accessaction.cpp
@@ -4,7 +4,7 @@
// Description:
//
//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009-2015
+// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006-2015
//
// Copyright: See COPYING file that comes with this distribution
//
diff --git a/accessaction.h b/accessaction.h
index 0f8f5cb..6a2ea0d 100644
--- a/accessaction.h
+++ b/accessaction.h
@@ -4,7 +4,7 @@
// Description:
//
//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009-2015
+// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006-2015
//
// Copyright: See COPYING file that comes with this distribution
//
diff --git a/debian/changelog b/debian/changelog
index 1721724..3419b9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,9 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium
src:pkg).
- Re-generate .ts translation files (run Qt5's lupdate).
- dlg.ui: Update the about dialog.
+ - Fix copyright headers (development started in 2006, not 2009).
+ - Drop Oleksandr and Heinz from the x2godesktopsharing.features file. No
+ work contributed by them.
* debian/*:
+ Convert to DH packaging style. Build against Qt5.
* debian/control:
diff --git a/debian/copyright b/debian/copyright
index 913147d..b616b37 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -73,12 +73,12 @@ Files: main.cpp
listdialog.cpp
simplelocalsocket.cpp
simplelocalsocket.h
-Copyright: 2009-2015, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+Copyright: 2006-2015, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
License: GPL-2+
Files: sharetray.cpp
sharetray.h
-Copyright: 2009-2015, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+Copyright: 2006-2015, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
2018, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
License: GPL-2+
@@ -87,9 +87,9 @@ Files: bin/x2goresume-desktopsharing
bin/x2goterminate-desktopsharing
share/x2gofeature.d/x2godesktopsharing.features
Copyright: 2007-2015, X2Go Project - http:wiki.x2go.org
- 2011-2015, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
- 2011-2015, Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
- 2011-2015, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ 2006-2015, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+ 2006-2015, Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+ 2006-2015, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
License: GPL-2+
Files: debian/*
diff --git a/listdialog.cpp b/listdialog.cpp
index e582ab0..1fb7a62 100644
--- a/listdialog.cpp
+++ b/listdialog.cpp
@@ -4,7 +4,7 @@
// Description:
//
//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009-2015
+// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006-2015
//
// Copyright: See COPYING file that comes with this distribution
//
diff --git a/main.cpp b/main.cpp
index d33a0ec..ade535f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2015 by Oleksandr Shneyder *
+ * Copyright (C) 2006-2015 by Oleksandr Shneyder *
* oleksandr.shneyder at obviously-nice.de *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/share/x2gofeature.d/x2godesktopsharing.features b/share/x2gofeature.d/x2godesktopsharing.features
index 26e2518..baa85f9 100755
--- a/share/x2gofeature.d/x2godesktopsharing.features
+++ b/share/x2gofeature.d/x2godesktopsharing.features
@@ -1,6 +1,7 @@
#!/bin/bash
# Copyright (C) 2007-2015 X2Go Project - http://wiki.x2go.org
+# Copyright (C) 2011-2018 Mike Gabriel <mike.gabriel at 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
@@ -16,9 +17,6 @@
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2011-2015 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
X2GO_LIB_PATH=`x2gopath libexec`
diff --git a/sharetray.cpp b/sharetray.cpp
index c0e34c2..2290d7f 100644
--- a/sharetray.cpp
+++ b/sharetray.cpp
@@ -4,7 +4,7 @@
// Description:
//
//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009-2015
+// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006-2015
// Mike Gabriel <mike.gabriel at das-netzwerkteam.de>, (C) 2011-2018
//
// Copyright: See COPYING file that comes with this distribution
diff --git a/sharetray.h b/sharetray.h
index 8a76b78..67a2e17 100644
--- a/sharetray.h
+++ b/sharetray.h
@@ -4,7 +4,7 @@
// Description:
//
//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009-2015
+// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006-2015
// Mike Gabriel <mike.gabriel at das-netzwerkteam.de>, (C) 2011-2018
//
// Copyright: See COPYING file that comes with this distribution
diff --git a/simplelocalsocket.cpp b/simplelocalsocket.cpp
index d8e6f00..8962de5 100644
--- a/simplelocalsocket.cpp
+++ b/simplelocalsocket.cpp
@@ -4,7 +4,7 @@
// Description:
//
//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009-2015
+// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006-2015
//
// Copyright: See COPYING file that comes with this distribution
//
diff --git a/simplelocalsocket.h b/simplelocalsocket.h
index ad831ff..7994aef 100644
--- a/simplelocalsocket.h
+++ b/simplelocalsocket.h
@@ -4,7 +4,7 @@
// Description:
//
//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009-2015
+// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006-2015
//
// Copyright: See COPYING file that comes with this distribution
//
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
More information about the x2go-commits
mailing list