This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 7f685cf889d694ef0cc9e82ebc68578486259986 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Nov 29 01:25:22 2018 +0100 debian/copyright{,.in}: merge copyright entries. --- debian/changelog | 2 ++ debian/copyright | 8 -------- debian/copyright.in | 10 ---------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index c5ce9a3..f608b7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -96,6 +96,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium + More curly braces, quotes etc. * debian/control: + Bump nxagent dependency up to 3.5.99.17+. + * debian/copyright{,.in}: + + Merge copyright entries. [ Orion Poplawski ] * New upstream version (4.1.0.3): diff --git a/debian/copyright b/debian/copyright index 4918039..a589bfb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -61,11 +61,6 @@ Files: X2Go/Config.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, 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 - 2011-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> - 2011-2018, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> License: GPL-2+ Files: x2goserver/lib/x2gocheckport @@ -80,8 +75,6 @@ Files: Makefile.docupload x2goserver-x2goagent/bin/.keep x2goserver-x2goagent/share/x2go/x2gofeature.d/x2goserver-x2goagent.features Copyright: 2010-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - 2012-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - 2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-2+ Comment: File header of x2goserver-x2goagent/bin/x2goagent says GPL-3+, but... @@ -101,7 +94,6 @@ Copyright: 2007-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2007-2018, X2Go Project - http:wiki.x2go.org 2010-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 2013-2015, Guangzhou Nianguan Electronics Technology Co.Ltd. <opensource@gznianguan.com> - 2013-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-2+ Files: x2goserver-extensions/bin/x2goserver-run-extensions diff --git a/debian/copyright.in b/debian/copyright.in index a6596f4..90f3372 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -185,11 +185,6 @@ Files: X2Go/Config.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, 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 - 2011-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> - 2011-2018, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> License: GPL (v2 or later) FIXME @@ -222,9 +217,6 @@ Files: X2Go/Server/DB.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, 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 2017-2018, Walid Moghrabi <w.moghrabi@servicemagic.eu> 2018, Mihai Moldovan <ionic@ionic.de> License: GPL (v2 or later) @@ -237,7 +229,6 @@ Copyright: 2007-2018, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2007-2018, X2Go Project - http:wiki.x2go.org 2010-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 2013-2015, Guangzhou Nianguan Electronics Technology Co.Ltd. <opensource@gznianguan.com> - 2013-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL (v2 or later) FIXME @@ -253,7 +244,6 @@ License: GPL (v2 or later) Files: Makefile.docupload x2goserver-x2goagent/share/x2go/x2gofeature.d/x2goserver-x2goagent.features Copyright: 2010-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - 2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL (v2 or later) FIXME -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git