This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 95d26f9b4c557d4fd33e4d3b46793bf4a7314650 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Nov 29 01:29:18 2018 +0100 debian/copyright{,.in}: fix links to our wiki and update to HTTPS. --- debian/changelog | 1 + debian/copyright | 16 ++++++++-------- debian/copyright.in | 18 +++++++++--------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index f608b7f..41c7291 100644 --- a/debian/changelog +++ b/debian/changelog @@ -98,6 +98,7 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium + Bump nxagent dependency up to 3.5.99.17+. * debian/copyright{,.in}: + Merge copyright entries. + + Fix links to our wiki and update to HTTPS. [ Orion Poplawski ] * New upstream version (4.1.0.3): diff --git a/debian/copyright b/debian/copyright index a589bfb..9682c43 100644 --- a/debian/copyright +++ b/debian/copyright @@ -60,7 +60,7 @@ Files: X2Go/Config.pm x2goserver/share/x2gofeature.d/x2goserver.features Copyright: 2007-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2007-2018, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - 2007-2018, X2Go Project - http:wiki.x2go.org + 2007-2018, X2Go Project - https://wiki.x2go.org License: GPL-2+ Files: x2goserver/lib/x2gocheckport @@ -91,14 +91,14 @@ Files: X2Go/Server.pm X2Go/Utils.pm Copyright: 2007-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2007-2018, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - 2007-2018, X2Go Project - http:wiki.x2go.org + 2007-2018, X2Go Project - https://wiki.x2go.org 2010-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 2013-2015, Guangzhou Nianguan Electronics Technology Co.Ltd. <opensource@gznianguan.com> License: GPL-2+ Files: x2goserver-extensions/bin/x2goserver-run-extensions x2goserver/bin/x2gosetkeyboard -Copyright: 2007-2018, X2Go Project - http:wiki.x2go.org +Copyright: 2007-2018, X2Go Project - https://wiki.x2go.org 2011-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2011-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 2011-2018, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> @@ -107,11 +107,11 @@ License: GPL-2+ Files: X2Go/SupeReNicer.pm Copyright: 2013-2015, Guangzhou Nianguan Electronics Technology Co.Ltd. <opensource@gznianguan.com> 2013-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - 2013-2018, X2Go Project - http://wiki.x2go.org + 2013-2018, X2Go Project - https://wiki.x2go.org License: GPL-2+ Files: x2goserver/bin/x2gopath -Copyright: 2007-2018, X2Go Project - http:wiki.x2go.org +Copyright: 2007-2018, X2Go Project - https://wiki.x2go.org 2012-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2012-2015, Jan Engelhard <jengelh@inai.de> 2012-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> @@ -124,12 +124,12 @@ Copyright: 2011-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-2+ Files: x2goserver/bin/x2gofeaturelist -Copyright: 2007-2018 X2Go Project - http://wiki.x2go.org +Copyright: 2007-2018 X2Go Project - https://wiki.x2go.org 2011-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-2+ Files: x2goserver-fmbindings/bin/x2gofm -Copyright: 2007-2018, X2Go Project - http://wiki.x2go.org +Copyright: 2007-2018, X2Go Project - https://wiki.x2go.org 2012-2015, Milan Knížek <knizek.confy@gmail.com> 2012-2018, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> License: GPL-2+ @@ -137,7 +137,7 @@ License: GPL-2+ Files: x2goserver-desktopsharing/bin/x2goresume-desktopsharing x2goserver-desktopsharing/bin/x2gosuspend-desktopsharing x2goserver-desktopsharing/bin/x2goterminate-desktopsharing -Copyright: 2007-2018, X2Go Project - http:wiki.x2go.org +Copyright: 2007-2018, X2Go Project - https://wiki.x2go.org 2011-2018, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> 2011-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2011-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> diff --git a/debian/copyright.in b/debian/copyright.in index 90f3372..48930db 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: FIXME Upstream-Contact: FIXME Source: FIXME @@ -184,7 +184,7 @@ Files: X2Go/Config.pm x2goserver/share/x2gofeature.d/x2goserver.features Copyright: 2007-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2007-2018, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - 2007-2018, X2Go Project - http:wiki.x2go.org + 2007-2018, X2Go Project - https://wiki.x2go.org License: GPL (v2 or later) FIXME @@ -216,7 +216,7 @@ Files: X2Go/Server/DB.pm x2goserver/sbin/x2godbadmin Copyright: 2007-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2007-2018, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - 2007-2018, X2Go Project - http:wiki.x2go.org + 2007-2018, X2Go Project - https://wiki.x2go.org 2017-2018, Walid Moghrabi <w.moghrabi@servicemagic.eu> 2018, Mihai Moldovan <ionic@ionic.de> License: GPL (v2 or later) @@ -226,7 +226,7 @@ Files: X2Go/Server.pm X2Go/Utils.pm Copyright: 2007-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2007-2018, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - 2007-2018, X2Go Project - http:wiki.x2go.org + 2007-2018, X2Go Project - https://wiki.x2go.org 2010-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 2013-2015, Guangzhou Nianguan Electronics Technology Co.Ltd. <opensource@gznianguan.com> License: GPL (v2 or later) @@ -234,7 +234,7 @@ License: GPL (v2 or later) Files: x2goserver-extensions/bin/x2goserver-run-extensions x2goserver/bin/x2gosetkeyboard -Copyright: 2007-2018, X2Go Project - http:wiki.x2go.org +Copyright: 2007-2018, X2Go Project - https://wiki.x2go.org 2011-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2011-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 2011-2018, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> @@ -256,12 +256,12 @@ License: UNKNOWN Files: X2Go/SupeReNicer.pm Copyright: 2013-2015, Guangzhou Nianguan Electronics Technology Co.Ltd. <opensource@gznianguan.com> 2013-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - 2013-2018, X2Go Project - http:wiki.x2go.org + 2013-2018, X2Go Project - https://wiki.x2go.org License: GPL (v2 or later) FIXME Files: x2goserver/bin/x2gopath -Copyright: 2007-2018, X2Go Project - http:wiki.x2go.org +Copyright: 2007-2018, X2Go Project - https://wiki.x2go.org 2012-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2012-2015, Jan Engelhard <jengelh@inai.de> 2012-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> @@ -276,13 +276,13 @@ License: GPL (v2 or later) FIXME Files: x2goserver/bin/x2gofeaturelist -Copyright: 2007-2018, X2Go Project - http:wiki.x2go.org +Copyright: 2007-2018, X2Go Project - https://wiki.x2go.org 2011-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL (v2 or later) FIXME Files: x2goserver-fmbindings/bin/x2gofm -Copyright: 2007-2018, X2Go Project - http:wiki.x2go.org +Copyright: 2007-2018, X2Go Project - https://wiki.x2go.org 2012-2015, Milan KnÞek <knizek.confy@gmail.com> 2012-2018, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> License: GPL (v2 or later) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git