[Xfce4-commits] <xfce4-embed-plugin:master> Updated license text at the top of source files.
David Schneider
noreply at xfce.org
Thu May 17 03:58:02 CEST 2012
Updating branch refs/heads/master
to 30a30c7d8b10e3b2bb94240472fc56753bfacf93 (commit)
from b8d6251d38c6570dbcbd05eb833d09c6beaf83bf (commit)
commit 30a30c7d8b10e3b2bb94240472fc56753bfacf93
Author: David Schneider <dnschneid at gmail.com>
Date: Wed May 16 18:48:58 2012 -0700
Updated license text at the top of source files.
COPYING.LIB | 58 ++++++++++++++++++++++++++++++++++++-----
configure.ac.in | 5 +--
panel-plugin/embed-dialogs.c | 12 ++++----
panel-plugin/embed-dialogs.h | 12 ++++----
panel-plugin/embed.c | 12 ++++----
panel-plugin/embed.h | 12 ++++----
panel-plugin/ewmh.c | 12 ++++----
panel-plugin/ewmh.h | 12 ++++----
8 files changed, 89 insertions(+), 46 deletions(-)
diff --git a/COPYING.LIB b/COPYING.LIB
index 191a97f..5bc8fb2 100644
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -1,15 +1,15 @@
- GNU LIBRARY GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ Version 2, June 1991
Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the library GPL. It is
numbered 2 because it goes with version 2 of the ordinary GPL.]
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -99,7 +99,7 @@ works together with the library.
Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one.
- GNU LIBRARY GENERAL PUBLIC LICENSE
+ GNU LIBRARY GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library which
@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -434,4 +434,48 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library 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
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/configure.ac.in b/configure.ac.in
index 62655c5..bea17fb 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,8 +1,7 @@
-dnl $Id$
dnl
-dnl xfce4-embed-plugin - A window-embedding plugin for the Xfce panel
+dnl xfce4-embed-plugin - Embed arbitrary windows into the Xfce panel
dnl
-dnl 2011 David Schneider <dnschneid at gmail.com>
+dnl 2012 David Schneider <dnschneid at gmail.com>
dnl
dnl ***************************
diff --git a/panel-plugin/embed-dialogs.c b/panel-plugin/embed-dialogs.c
index 27e30cc..da56b88 100644
--- a/panel-plugin/embed-dialogs.c
+++ b/panel-plugin/embed-dialogs.c
@@ -1,6 +1,6 @@
-/* $Id$
+/* xfce4-embed-plugin - Embed arbitrary windows into the Xfce panel
*
- * Copyright (c) 2011 David Schneider <dnschneid at gmail.com>
+ * Copyright (C) 2012 David Schneider <dnschneid 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
@@ -10,11 +10,11 @@
* 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.
+ * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/panel-plugin/embed-dialogs.h b/panel-plugin/embed-dialogs.h
index 98596fd..7f09d90 100644
--- a/panel-plugin/embed-dialogs.h
+++ b/panel-plugin/embed-dialogs.h
@@ -1,6 +1,6 @@
-/* $Id$
+/* xfce4-embed-plugin - Embed arbitrary windows into the Xfce panel
*
- * Copyright (c) 2011 David Schneider <dnschneid at gmail.com>
+ * Copyright (C) 2012 David Schneider <dnschneid 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
@@ -10,11 +10,11 @@
* 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.
+ * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __EMBED_DIALOGS_H__
diff --git a/panel-plugin/embed.c b/panel-plugin/embed.c
index ef977e2..9370b6a 100644
--- a/panel-plugin/embed.c
+++ b/panel-plugin/embed.c
@@ -1,6 +1,6 @@
-/* $Id$
+/* xfce4-embed-plugin - Embed arbitrary windows into the Xfce panel
*
- * Copyright (c) 2011 David Schneider <dnschneid at gmail.com>
+ * Copyright (C) 2012 David Schneider <dnschneid 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
@@ -10,11 +10,11 @@
* 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.
+ * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/panel-plugin/embed.h b/panel-plugin/embed.h
index 1070677..ff0dd87 100644
--- a/panel-plugin/embed.h
+++ b/panel-plugin/embed.h
@@ -1,6 +1,6 @@
-/* $Id$
+/* xfce4-embed-plugin - Embed arbitrary windows into the Xfce panel
*
- * Copyright (c) 2011 David Schneider <dnschneid at gmail.com>
+ * Copyright (C) 2012 David Schneider <dnschneid 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
@@ -10,11 +10,11 @@
* 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.
+ * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __EMBED_H__
diff --git a/panel-plugin/ewmh.c b/panel-plugin/ewmh.c
index 0f1cd99..f728bbf 100644
--- a/panel-plugin/ewmh.c
+++ b/panel-plugin/ewmh.c
@@ -1,6 +1,6 @@
-/* $Id$
+/* xfce4-embed-plugin - Embed arbitrary windows into the Xfce panel
*
- * Copyright (c) 2011 David Schneider <dnschneid at gmail.com>
+ * Copyright (C) 2012 David Schneider <dnschneid 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
@@ -10,11 +10,11 @@
* 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.
+ * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/panel-plugin/ewmh.h b/panel-plugin/ewmh.h
index 2a59337..81ccc84 100644
--- a/panel-plugin/ewmh.h
+++ b/panel-plugin/ewmh.h
@@ -1,6 +1,6 @@
-/* $Id$
+/* xfce4-embed-plugin - Embed arbitrary windows into the Xfce panel
*
- * Copyright (c) 2011 David Schneider <dnschneid at gmail.com>
+ * Copyright (C) 2012 David Schneider <dnschneid 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
@@ -10,11 +10,11 @@
* 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.
+ * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __EWMH_H__
More information about the Xfce4-commits
mailing list