summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Estienne <sebastien.estienne@gmail.com>2005-09-24 15:16:24 +0000
committerSebastien Estienne <sebastien.estienne@gmail.com>2005-09-24 15:16:24 +0000
commitfd81f5abd1b275b30c93aa8f36b4c91b2a63ef8c (patch)
treef34c5d43e05fa1106fc45bff296ffa1febf0814b
parent6889184926dd1a1089ef3187fcb82670e0bf14b9 (diff)
fix licencing issue
git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@17 3be567f1-68ff-0310-b24a-ad7cc433fd2f
-rw-r--r--COPYING (renamed from LICENSE)4
-rw-r--r--Makefile.am2
-rwxr-xr-xsrc/service-discovery-applet.in22
-rwxr-xr-xsrc/service-discovery-config.in22
4 files changed, 17 insertions, 33 deletions
diff --git a/LICENSE b/COPYING
index 5b6e7c6..d60c31a 100644
--- a/LICENSE
+++ b/COPYING
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/Makefile.am b/Makefile.am
index fe4946f..6d61bcb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,4 +6,4 @@ SUBDIRS = \
scripts \
servers
-EXTRA_DIST = README INSTALL AUTHORS
+EXTRA_DIST = README INSTALL AUTHORS COPYING
diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in
index bdb0b57..0f6f1bb 100755
--- a/src/service-discovery-applet.in
+++ b/src/service-discovery-applet.in
@@ -1,21 +1,13 @@
#!@PYTHON@
# -*-python-*-
-# This file is part of service-discovery-applet (sd-applet).
+# Copyright (C) 2005 by Sebastien Estienne
#
-# sd-applet 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 of the
-# License, or (at your option) any later version.
-#
-# sd-applet 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 Lesser General Public
-# License along with sd-applet; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# This file may be distributed and/or modified under the terms of
+# the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# This file is distributed without any warranty; without even the implied
+# warranty of merchantability or fitness for a particular purpose.
+# See "COPYING" in the source distribution for more information.
#
# $id$
#
diff --git a/src/service-discovery-config.in b/src/service-discovery-config.in
index 420ec7e..30dede2 100755
--- a/src/service-discovery-config.in
+++ b/src/service-discovery-config.in
@@ -1,21 +1,13 @@
#!@PYTHON@
# -*-python-*-
-# This file is part of service-discovery-applet (sd-applet).
+# Copyright (C) 2005 by Sebastien Estienne
#
-# sd-applet 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 of the
-# License, or (at your option) any later version.
-#
-# sd-applet 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 Lesser General Public
-# License along with sd-applet; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# This file may be distributed and/or modified under the terms of
+# the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# This file is distributed without any warranty; without even the implied
+# warranty of merchantability or fitness for a particular purpose.
+# See "COPYING" in the source distribution for more information.
#
# $id$
#