From bcb8c7d1a311e4b30e4f8c4ce8d789a994f64d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= Date: Wed, 28 May 2014 13:20:18 +0200 Subject: [PATCH] custom/glue: fix some file headers (licences and authors) Most of the contents of these files come from their *.custom counterparts of the 0.9.x version of the bindings, so I'm reinstating their author/licence info here. In some cases, the content is pristine to the previous version (no modification since then), so for these cases the current licence is replaced completely with the previous licence. These were spotted while creating a first version of a debian package (creating a debian/copyright info file requires you to audit all this). This is not (yet) part of BGO#725937. --- sources/custom/Element.cs | 35 +++++++++++++++++++--------- sources/custom/Iterator.cs | 4 +++- sources/custom/NavigationAdapter.cs | 26 +++++++++++++-------- sources/custom/Object.cs | 10 +++++++- sources/custom/Pipeline.cs | 36 ++++++++++++++++------------- sources/custom/Version.cs | 3 ++- sources/glue/gobject.c | 28 +++++++++++++--------- 7 files changed, 91 insertions(+), 51 deletions(-) diff --git a/sources/custom/Element.cs b/sources/custom/Element.cs index 24c53f0990..7d54a4ebf9 100644 --- a/sources/custom/Element.cs +++ b/sources/custom/Element.cs @@ -1,17 +1,30 @@ -// Copyright (C) 2013 Stephan Sundermann -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. // -// This program is distributed in the hope that it will be useful, +// Element.cs +// +// Authors: +// Khaled Mohammed +// Sebastian Dröge +// Stephan Sundermann +// +// Copyright (C) 2006 Khaled Mohammed +// Copyright (C) 2006 Novell, Inc. +// Copyright (C) 2009 Sebastian Dröge +// Copyright (C) 2013 Stephan Sundermann +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +// 02110-1301 USA namespace Gst { using System; diff --git a/sources/custom/Iterator.cs b/sources/custom/Iterator.cs index 543c5e6504..4a32278795 100644 --- a/sources/custom/Iterator.cs +++ b/sources/custom/Iterator.cs @@ -1,11 +1,13 @@ // Iterator.cs - Custom iterator wrapper for IEnumerable // // Authors: +// Maarten Bosmans // Sebastian Dröge // Stephan Sundermann // -// Copyright (c) 2013 Stephan Sundermann +// Copyright (c) 2009 Maarten Bosmans // Copyright (c) 2009 Sebastian Dröge +// Copyright (c) 2013 Stephan Sundermann // // This program is free software; you can redistribute it and/or // modify it under the terms of version 2 of the Lesser GNU General diff --git a/sources/custom/NavigationAdapter.cs b/sources/custom/NavigationAdapter.cs index 5a1d27440e..4319793b87 100644 --- a/sources/custom/NavigationAdapter.cs +++ b/sources/custom/NavigationAdapter.cs @@ -1,17 +1,23 @@ -// Copyright (C) 2013 Stephan Sundermann // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. +// Authors: +// Sebastian Dröge // -// This program is distributed in the hope that it will be useful, +// Copyright (C) 2009 Sebastian Dröge +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +// 02110-1301 USA namespace Gst.Video { diff --git a/sources/custom/Object.cs b/sources/custom/Object.cs index 55a960d090..11e6c66544 100644 --- a/sources/custom/Object.cs +++ b/sources/custom/Object.cs @@ -1,4 +1,12 @@ -// Copyright (C) 2013 Stephan Sundermann +// +// Authors: +// Andrés G. Aragoneses +// Sebastian Dröge +// Stephan Sundermann +// +// Copyright (c) 2009 Sebastian Dröge +// Copyright (c) 2013 Andrés G. Aragoneses +// Copyright (C) 2013 Stephan Sundermann // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as diff --git a/sources/custom/Pipeline.cs b/sources/custom/Pipeline.cs index 740727b6ba..d4c639313f 100644 --- a/sources/custom/Pipeline.cs +++ b/sources/custom/Pipeline.cs @@ -1,24 +1,28 @@ -// Copyright (C) 2013 Stephan Sundermann -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. // -// This program is distributed in the hope that it will be useful, +// Pipeline.cs +// +// Authors: +// Sebastian Dröge +// +// Copyright (C) 2009 Sebastian Dröge +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +// 02110-1301 USA namespace Gst { - using System; - using System.Collections; - using System.Runtime.InteropServices; - partial class Pipeline { public Pipeline () : this (null) {} } -} \ No newline at end of file +} diff --git a/sources/custom/Version.cs b/sources/custom/Version.cs index 3f815bf363..87ca1c5858 100644 --- a/sources/custom/Version.cs +++ b/sources/custom/Version.cs @@ -19,7 +19,8 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +// 02110-1301 USA using System; using System.Runtime.InteropServices; diff --git a/sources/glue/gobject.c b/sources/glue/gobject.c index ccec825455..e056f42d2d 100644 --- a/sources/glue/gobject.c +++ b/sources/glue/gobject.c @@ -1,17 +1,23 @@ -// Copyright (C) 2013 Stephan Sundermann -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. // -// This program is distributed in the hope that it will be useful, +// Authors: +// Sebastian Dröge +// +// Copyright (C) 2009 Sebastian Dröge +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +// 02110-1301 USA #include