[Xfce4-commits] <xfce4-netload-plugin:master> Update the license
Florian Rivoal
noreply at xfce.org
Wed Dec 8 04:00:01 CET 2010
Updating branch refs/heads/master
to f1c7c550d7ab799ff0afed8111a2de41288aadd2 (commit)
from a4e7c3519b5026c6abb4783e78c8381e12f0c2d2 (commit)
commit f1c7c550d7ab799ff0afed8111a2de41288aadd2
Author: Florian Rivoal <frivoal at xfce.org>
Date: Wed Dec 8 11:00:54 2010 +0900
Update the license
Clarify that wormulon is under GPL2 or later, and, after agreeing witn
Bernhard Walle, relicense xfce4-netload-plugin under GPL2 or later,
instead of GPL2 strictly.
COPYING | 41 +++++++++++++++++++++++++++++++++++++++++
panel-plugin/commandline.c | 19 +++++++++++--------
panel-plugin/global.h | 19 +++++++++++--------
panel-plugin/net.c | 19 +++++++++++--------
panel-plugin/net.h | 19 +++++++++++--------
panel-plugin/netload.c | 19 +++++++++++--------
panel-plugin/os.h | 19 +++++++++++--------
panel-plugin/utils.c | 19 +++++++++++--------
8 files changed, 118 insertions(+), 56 deletions(-)
diff --git a/COPYING b/COPYING
index c7aea18..772c26d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,44 @@
+xfce4-netload-plugin is copyright 2003-2007 Bernhard Walle <bernhard at bwalle.de>
+and copyright 2010 Florian Rivoal <frivoal at gmail.com>
+
+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 the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+
+=========
+
+wormulon is copyright (c) 2003 by Hendrik Scholz and licensed
+through the GNU General Public License.
+slurm is copyright (c) 2002-2003 by Hendrik Scholz and licensed
+through the GNU General Public License.
+
+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 the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+
+------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
diff --git a/panel-plugin/commandline.c b/panel-plugin/commandline.c
index aa47fd1..9493c66 100644
--- a/panel-plugin/commandline.c
+++ b/panel-plugin/commandline.c
@@ -2,16 +2,19 @@
* Copyright 2003,2005 Bernhard Walle <bernhard at bwalle.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 the Free Software Foundation; You may only use
- * version 2 of the License, you have no option to use any other version.
+ * 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 the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
*
- * This program 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 General Public License for more details.
+ * This program 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 General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 675 Mass
+ * Ave, Cambridge, MA 02139, USA.
*
* -------------------------------------------------------------------------------------------------
*/
diff --git a/panel-plugin/global.h b/panel-plugin/global.h
index 6767aea..fedd617 100644
--- a/panel-plugin/global.h
+++ b/panel-plugin/global.h
@@ -2,16 +2,19 @@
* Copyright 2005 Bernhard Walle <bernhard at bwalle.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 the Free Software Foundation; You may only use
- * version 2 of the License, you have no option to use any other version.
+ * 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 the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
*
- * This program 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 General Public License for more details.
+ * This program 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 General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 675 Mass
+ * Ave, Cambridge, MA 02139, USA.
*
* -------------------------------------------------------------------------------------------------
*/
diff --git a/panel-plugin/net.c b/panel-plugin/net.c
index d01954c..261e466 100644
--- a/panel-plugin/net.c
+++ b/panel-plugin/net.c
@@ -3,16 +3,19 @@
* Copyright 2010 Florian Rivoal <frivoal at gmail.com>
* -------------------------------------------------------------------------------------------------
*
- * 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 the Free Software Foundation; You may only use
- * version 2 of the License, you have no option to use any other version.
+ * 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 the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
*
- * This program 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 General Public License for more details.
+ * This program 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 General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 675 Mass
+ * Ave, Cambridge, MA 02139, USA.
*
* -------------------------------------------------------------------------------------------------
*/
diff --git a/panel-plugin/net.h b/panel-plugin/net.h
index 994043b..e8a48ea 100644
--- a/panel-plugin/net.h
+++ b/panel-plugin/net.h
@@ -3,16 +3,19 @@
* Copyright 2010 Florian Rivoal <frivoal at gmail.com>
* -------------------------------------------------------------------------------------------------
*
- * 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 the Free Software Foundation; You may only use
- * version 2 of the License, you have no option to use any other version.
+ * 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 the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
*
- * This program 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 General Public License for more details.
+ * This program 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 General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 675 Mass
+ * Ave, Cambridge, MA 02139, USA.
*
* -------------------------------------------------------------------------------------------------
*/
diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c
index c4960ec..b4868c4 100644
--- a/panel-plugin/netload.c
+++ b/panel-plugin/netload.c
@@ -3,16 +3,19 @@
* Copyright 2010 Florian Rivoal <frivoal at gmail.com>
* -------------------------------------------------------------------------------------------------
*
- * 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 the Free Software Foundation; You may only use
- * version 2 of the License, you have no option to use any other version.
+ * 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 the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
*
- * This program 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 General Public License for more details.
+ * This program 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 General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 675 Mass
+ * Ave, Cambridge, MA 02139, USA.
*
* -------------------------------------------------------------------------------------------------
*/
diff --git a/panel-plugin/os.h b/panel-plugin/os.h
index fb1ca24..5731580 100644
--- a/panel-plugin/os.h
+++ b/panel-plugin/os.h
@@ -3,16 +3,19 @@
* Copyright 2010 Florian Rivoal <frivoal at gmail.com>
* -------------------------------------------------------------------------------------------------
*
- * 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 the Free Software Foundation; You may only use
- * version 2 of the License, you have no option to use any other version.
+ * 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 the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
*
- * This program 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 General Public License for more details.
+ * This program 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 General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 675 Mass
+ * Ave, Cambridge, MA 02139, USA.
*
* -------------------------------------------------------------------------------------------------
*/
diff --git a/panel-plugin/utils.c b/panel-plugin/utils.c
index be09c7f..8ee5e89 100644
--- a/panel-plugin/utils.c
+++ b/panel-plugin/utils.c
@@ -2,16 +2,19 @@
* Copyright 2003, 2005 Bernhard Walle <bernhard at bwalle.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 the Free Software Foundation; You may only use
- * version 2 of the License, you have no option to use any other version.
+ * 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 the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
*
- * This program 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 General Public License for more details.
+ * This program 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 General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 675 Mass
+ * Ave, Cambridge, MA 02139, USA.
*
* -------------------------------------------------------------------------------------------------
*/
More information about the Xfce4-commits
mailing list