[Xfce4-commits] <xfce4-radio-plugin:master> Changed the license to GPLv3

Stefan Ott noreply at xfce.org
Fri Nov 5 00:22:01 CET 2010


Updating branch refs/heads/master
         to bb0ef8e8081a83bb81e31a74fc895ef990601667 (commit)
       from 5a253d301d2da6bb2c9e815db6649cf8b9bb7ef7 (commit)

commit bb0ef8e8081a83bb81e31a74fc895ef990601667
Author: Stefan Ott <stefan at ott.net>
Date:   Fri Nov 5 00:16:43 2010 +0100

    Changed the license to GPLv3

 NEWS                       |    4 ++++
 configure.in.in            |    2 +-
 panel-plugin/radio.c       |   21 ++++++++++-----------
 panel-plugin/radio.h       |   21 ++++++++++-----------
 panel-plugin/v4l1.c        |   21 ++++++++++-----------
 panel-plugin/v4l1.h        |   21 ++++++++++-----------
 panel-plugin/v4l2.c        |   21 ++++++++++-----------
 panel-plugin/v4l2.h        |   21 ++++++++++-----------
 panel-plugin/xfce4-radio.c |    7 +++----
 panel-plugin/xfce4-radio.h |    7 +++----
 10 files changed, 71 insertions(+), 75 deletions(-)

diff --git a/NEWS b/NEWS
index 41fd3a5..81e93fa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 Get the latest version of this plugin at http://goodies.xfce.org/
 ===============================================================================
 
+v0.4.5 (xx xxx 2010):
+=====================
+ * Changed the license to GPLv3
+
 v0.4.4 (04 Nov 2010):
 =====================
  * The "time is money"-release
diff --git a/configure.in.in b/configure.in.in
index 53c32fa..11e85bf 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -2,7 +2,7 @@ dnl configure.ac
 dnl
 dnl xfce4-radio-plugin - <Plugin for xfce4-panel>
 dnl
-dnl 2006-2009 Stefan Ott <stefan at ott.net>
+dnl 2006-2010 Stefan Ott <stefan at ott.net>
 dnl
 
 m4_define([radio_plugin_version],[0.4.4])
diff --git a/panel-plugin/radio.c b/panel-plugin/radio.c
index aa9e753..4b8cd4c 100644
--- a/panel-plugin/radio.c
+++ b/panel-plugin/radio.c
@@ -1,17 +1,16 @@
 /*
- *  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 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 3 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/panel-plugin/radio.h b/panel-plugin/radio.h
index 4fdda67..e7e4949 100644
--- a/panel-plugin/radio.h
+++ b/panel-plugin/radio.h
@@ -1,17 +1,16 @@
 /*
- *  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 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 3 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _RADIO_H
diff --git a/panel-plugin/v4l1.c b/panel-plugin/v4l1.c
index 104c33c..6bfc316 100644
--- a/panel-plugin/v4l1.c
+++ b/panel-plugin/v4l1.c
@@ -1,17 +1,16 @@
 /*
- *  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 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 3 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/panel-plugin/v4l1.h b/panel-plugin/v4l1.h
index cd6f58d..1a80119 100644
--- a/panel-plugin/v4l1.h
+++ b/panel-plugin/v4l1.h
@@ -1,17 +1,16 @@
 /*
- *  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 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 3 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _V4L1_H
diff --git a/panel-plugin/v4l2.c b/panel-plugin/v4l2.c
index eae9ac7..931d3d2 100644
--- a/panel-plugin/v4l2.c
+++ b/panel-plugin/v4l2.c
@@ -1,17 +1,16 @@
 /*
- *  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 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 3 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/panel-plugin/v4l2.h b/panel-plugin/v4l2.h
index 63d2ae6..2b224c8 100644
--- a/panel-plugin/v4l2.h
+++ b/panel-plugin/v4l2.h
@@ -1,17 +1,16 @@
 /*
- *  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 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 3 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _V4L2_H
diff --git a/panel-plugin/xfce4-radio.c b/panel-plugin/xfce4-radio.c
index 2264c14..826e8b4 100644
--- a/panel-plugin/xfce4-radio.c
+++ b/panel-plugin/xfce4-radio.c
@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2006-2010 Stefan Ott, All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * 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,
@@ -14,8 +14,7 @@
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/panel-plugin/xfce4-radio.h b/panel-plugin/xfce4-radio.h
index 73a58e8..7267d67 100644
--- a/panel-plugin/xfce4-radio.h
+++ b/panel-plugin/xfce4-radio.h
@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2006-2010 Stefan Ott, All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * 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,
@@ -14,8 +14,7 @@
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _XFCE4_RADIO_H



More information about the Xfce4-commits mailing list