[Xfce4-commits] <xfconf:master> Fix licenses and use new FSF address.

Nick Schermer noreply at xfce.org
Fri Mar 25 12:40:01 CET 2011


Updating branch refs/heads/master
         to ed2db07ccace659ce9e06f334f41ad09419d6cb1 (commit)
       from 9d8927b5a9e16e3782fe37a64f90a47ad1d3c3c1 (commit)

commit ed2db07ccace659ce9e06f334f41ad09419d6cb1
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Mar 25 11:05:35 2011 +0100

    Fix licenses and use new FSF address.

 autogen.sh                                         |   16 +++++++++++-
 common/make-exo-alias.pl                           |   20 +++++++--------
 common/xfconf-common-private.h                     |   19 ++++++++-------
 common/xfconf-errors.c                             |   19 ++++++++-------
 common/xfconf-gvaluefuncs.c                        |   17 +++++++------
 common/xfconf-gvaluefuncs.h                        |   17 +++++++------
 common/xfconf-types.c                              |   19 ++++++++-------
 docs/spec/perchannel-xml.dtd                       |   17 +++++++++++++
 tests/Makefile.inc                                 |   15 ++++++++++++
 tests/get-properties/t-get-arrayv.c                |    2 +-
 tests/get-properties/t-get-boolean.c               |    2 +-
 tests/get-properties/t-get-double.c                |    2 +-
 tests/get-properties/t-get-int.c                   |    2 +-
 tests/get-properties/t-get-string.c                |    2 +-
 tests/get-properties/t-get-stringlist.c            |    2 +-
 tests/get-properties/t-get-uint64.c                |    2 +-
 tests/has-properties/t-has-arrayv.c                |    2 +-
 tests/has-properties/t-has-boolean.c               |    2 +-
 tests/has-properties/t-has-double.c                |    2 +-
 tests/has-properties/t-has-int.c                   |    2 +-
 tests/has-properties/t-has-string.c                |    2 +-
 tests/has-properties/t-has-stringlist.c            |    2 +-
 tests/has-properties/t-has-uint64.c                |    2 +-
 tests/list-channels/t-list-channels.c              |    2 +-
 tests/object-bindings/t-object-bindings.c          |    2 +-
 .../t-string-changed-signal-detailed.c             |    2 +-
 .../t-string-changed-signal.c                      |    2 +-
 tests/reset-properties/t-reset-arrayv.c            |    2 +-
 tests/reset-properties/t-reset-boolean.c           |    2 +-
 tests/reset-properties/t-reset-double.c            |    2 +-
 tests/reset-properties/t-reset-int.c               |    2 +-
 tests/reset-properties/t-reset-string.c            |    2 +-
 tests/reset-properties/t-reset-stringlist.c        |    2 +-
 tests/reset-properties/t-reset-uint64.c            |    2 +-
 tests/set-properties/t-set-arrayv.c                |    2 +-
 tests/set-properties/t-set-boolean.c               |    2 +-
 tests/set-properties/t-set-double.c                |    2 +-
 tests/set-properties/t-set-int.c                   |    2 +-
 tests/set-properties/t-set-string.c                |    2 +-
 tests/set-properties/t-set-stringlist.c            |    2 +-
 tests/set-properties/t-set-uint64.c                |    2 +-
 tests/tests-common.h                               |    2 +-
 xfconf-perl/Xfconf.pm.in                           |   25 +++++++++----------
 xfconf-perl/xfconfperl.h                           |   20 ++++++++++++++++
 xfconf-perl/xs/Xfconf.xs                           |   21 ++++++++--------
 xfconf-perl/xs/XfconfBinding.xs                    |   21 ++++++++--------
 xfconf-perl/xs/XfconfChannel.xs                    |   21 ++++++++--------
 xfconf-query/main.c                                |    7 ++---
 xfconf/abicheck.sh                                 |   20 +++++++--------
 xfconf/xfconf-binding.c                            |   17 +++++++------
 xfconf/xfconf-binding.h                            |   17 +++++++------
 xfconf/xfconf-cache.c                              |   17 +++++++------
 xfconf/xfconf-cache.h                              |   17 +++++++------
 xfconf/xfconf-channel.c                            |   17 +++++++------
 xfconf/xfconf-channel.h                            |   17 +++++++------
 xfconf/xfconf-errors.h                             |   19 ++++++++-------
 xfconf/xfconf-private.h                            |   21 ++++++++--------
 xfconf/xfconf-types.h                              |   19 ++++++++-------
 xfconf/xfconf.c                                    |   19 ++++++++-------
 xfconf/xfconf.h                                    |   19 ++++++++-------
 xfconf/xfconf.symbols                              |   17 +++++++------
 xfconfd/main.c                                     |    2 +-
 xfconfd/xfconf-locking-utils.c                     |    2 +-
 xfconfd/xfconf-locking-utils.h                     |    2 +-
 64 files changed, 327 insertions(+), 255 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 126c86b..c563634 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,12 +1,24 @@
 #!/bin/sh
 #
-# $Id: autogen.sh 23241 2006-09-29 19:05:15Z kelnos $
-#
 # Copyright (c) 2002-2005
 #         The Xfce development team. All rights reserved.
 #
 # Written for Xfce by Benedikt Meurer <benny at xfce.org>.
 #
+# 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; version 2 of the License ONLY.
+#
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+#
 
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <<EOF
diff --git a/common/make-exo-alias.pl b/common/make-exo-alias.pl
index f17ff01..ffc8189 100644
--- a/common/make-exo-alias.pl
+++ b/common/make-exo-alias.pl
@@ -3,20 +3,18 @@
 # Copyright (c) 2004 The GLib Development Team.
 # Copyright (c) 2005 Benedikt Meurer <benny at xfce.org>.
 #
-# 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 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; version 2 of the License ONLY.
 #
-# This library is distributed in the hope that it will be useful,
+# 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.
+# 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 Library General Public
-# License along with this library; 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
 #
 
 my $option_def = 0;
diff --git a/common/xfconf-common-private.h b/common/xfconf-common-private.h
index d683ccc..729e08e 100644
--- a/common/xfconf-common-private.h
+++ b/common/xfconf-common-private.h
@@ -3,18 +3,19 @@
  *
  *  Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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.
+ *  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 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 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
  */
 
 #ifndef __XFCONF_COMMON_PRIVATE_H__
diff --git a/common/xfconf-errors.c b/common/xfconf-errors.c
index e3f9558..38d1201 100644
--- a/common/xfconf-errors.c
+++ b/common/xfconf-errors.c
@@ -3,18 +3,19 @@
  *
  *  Copyright (c) 2007 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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.
+ *  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 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 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
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/common/xfconf-gvaluefuncs.c b/common/xfconf-gvaluefuncs.c
index 77153c9..8f8ff47 100644
--- a/common/xfconf-gvaluefuncs.c
+++ b/common/xfconf-gvaluefuncs.c
@@ -3,17 +3,18 @@
  *
  *  Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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 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 General Public License
- *  along with this program; if not, write to the Free Software
+ *  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
  */
 
diff --git a/common/xfconf-gvaluefuncs.h b/common/xfconf-gvaluefuncs.h
index fff9580..602dd62 100644
--- a/common/xfconf-gvaluefuncs.h
+++ b/common/xfconf-gvaluefuncs.h
@@ -3,17 +3,18 @@
  *
  *  Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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 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 General Public License
- *  along with this program; if not, write to the Free Software
+ *  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
  */
 
diff --git a/common/xfconf-types.c b/common/xfconf-types.c
index f531dd0..534c318 100644
--- a/common/xfconf-types.c
+++ b/common/xfconf-types.c
@@ -3,18 +3,19 @@
  *
  *  Copyright (c) 2007 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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.
+ *  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 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 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
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/docs/spec/perchannel-xml.dtd b/docs/spec/perchannel-xml.dtd
index dff0013..847c94c 100644
--- a/docs/spec/perchannel-xml.dtd
+++ b/docs/spec/perchannel-xml.dtd
@@ -1,3 +1,20 @@
+<!--
+  Copyright (c) 2007-2009 Brian Tarricone <bjt23 at cornell.edu>
+  
+  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; version 2 of the License ONLY.
+  
+  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+-->
+
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!ELEMENT channel property*>
diff --git a/tests/Makefile.inc b/tests/Makefile.inc
index 59fda73..2ed3431 100644
--- a/tests/Makefile.inc
+++ b/tests/Makefile.inc
@@ -1,3 +1,18 @@
+# Copyright (c) 2007 Brian Tarricone <bjt23 at cornell.edu>
+#
+# 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; version 2 of the License ONLY.
+#
+# 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.
+#
+# 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
+
 check_SCRIPTS = $(addsuffix .sh,$(check_PROGRAMS))
 
 TESTS = $(check_SCRIPTS)
diff --git a/tests/get-properties/t-get-arrayv.c b/tests/get-properties/t-get-arrayv.c
index 58eb74b..c658e16 100644
--- a/tests/get-properties/t-get-arrayv.c
+++ b/tests/get-properties/t-get-arrayv.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/get-properties/t-get-boolean.c b/tests/get-properties/t-get-boolean.c
index 9c222d2..a58df09 100644
--- a/tests/get-properties/t-get-boolean.c
+++ b/tests/get-properties/t-get-boolean.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/get-properties/t-get-double.c b/tests/get-properties/t-get-double.c
index 016cd3b..a8c7ced 100644
--- a/tests/get-properties/t-get-double.c
+++ b/tests/get-properties/t-get-double.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/get-properties/t-get-int.c b/tests/get-properties/t-get-int.c
index 9cca5c7..6cb6b34 100644
--- a/tests/get-properties/t-get-int.c
+++ b/tests/get-properties/t-get-int.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/get-properties/t-get-string.c b/tests/get-properties/t-get-string.c
index dc3f167..efdd832 100644
--- a/tests/get-properties/t-get-string.c
+++ b/tests/get-properties/t-get-string.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/get-properties/t-get-stringlist.c b/tests/get-properties/t-get-stringlist.c
index 0b6e4d4..8e478e2 100644
--- a/tests/get-properties/t-get-stringlist.c
+++ b/tests/get-properties/t-get-stringlist.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/get-properties/t-get-uint64.c b/tests/get-properties/t-get-uint64.c
index 92cc424..001531c 100644
--- a/tests/get-properties/t-get-uint64.c
+++ b/tests/get-properties/t-get-uint64.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/has-properties/t-has-arrayv.c b/tests/has-properties/t-has-arrayv.c
index d5d33ea..45a5660 100644
--- a/tests/has-properties/t-has-arrayv.c
+++ b/tests/has-properties/t-has-arrayv.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/has-properties/t-has-boolean.c b/tests/has-properties/t-has-boolean.c
index acbc010..c7a0d1c 100644
--- a/tests/has-properties/t-has-boolean.c
+++ b/tests/has-properties/t-has-boolean.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/has-properties/t-has-double.c b/tests/has-properties/t-has-double.c
index e837ec9..66548f5 100644
--- a/tests/has-properties/t-has-double.c
+++ b/tests/has-properties/t-has-double.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/has-properties/t-has-int.c b/tests/has-properties/t-has-int.c
index 7925710..22a2c4b 100644
--- a/tests/has-properties/t-has-int.c
+++ b/tests/has-properties/t-has-int.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/has-properties/t-has-string.c b/tests/has-properties/t-has-string.c
index 6f8e39e..c661d40 100644
--- a/tests/has-properties/t-has-string.c
+++ b/tests/has-properties/t-has-string.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/has-properties/t-has-stringlist.c b/tests/has-properties/t-has-stringlist.c
index 812ac11..c092e44 100644
--- a/tests/has-properties/t-has-stringlist.c
+++ b/tests/has-properties/t-has-stringlist.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/has-properties/t-has-uint64.c b/tests/has-properties/t-has-uint64.c
index 4edd27e..d399cc0 100644
--- a/tests/has-properties/t-has-uint64.c
+++ b/tests/has-properties/t-has-uint64.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/list-channels/t-list-channels.c b/tests/list-channels/t-list-channels.c
index caf38ae..f5c1e06 100644
--- a/tests/list-channels/t-list-channels.c
+++ b/tests/list-channels/t-list-channels.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/object-bindings/t-object-bindings.c b/tests/object-bindings/t-object-bindings.c
index a00395e..2a8ec25 100644
--- a/tests/object-bindings/t-object-bindings.c
+++ b/tests/object-bindings/t-object-bindings.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/property-changed-signal/t-string-changed-signal-detailed.c b/tests/property-changed-signal/t-string-changed-signal-detailed.c
index a1e5dad..f84cbbc 100644
--- a/tests/property-changed-signal/t-string-changed-signal-detailed.c
+++ b/tests/property-changed-signal/t-string-changed-signal-detailed.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/property-changed-signal/t-string-changed-signal.c b/tests/property-changed-signal/t-string-changed-signal.c
index 7be5bc3..aac6023 100644
--- a/tests/property-changed-signal/t-string-changed-signal.c
+++ b/tests/property-changed-signal/t-string-changed-signal.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/reset-properties/t-reset-arrayv.c b/tests/reset-properties/t-reset-arrayv.c
index bc1e8d6..3123bc5 100644
--- a/tests/reset-properties/t-reset-arrayv.c
+++ b/tests/reset-properties/t-reset-arrayv.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/reset-properties/t-reset-boolean.c b/tests/reset-properties/t-reset-boolean.c
index 58fb488..7f0ff9f 100644
--- a/tests/reset-properties/t-reset-boolean.c
+++ b/tests/reset-properties/t-reset-boolean.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/reset-properties/t-reset-double.c b/tests/reset-properties/t-reset-double.c
index 41b6112..25f3bd8 100644
--- a/tests/reset-properties/t-reset-double.c
+++ b/tests/reset-properties/t-reset-double.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/reset-properties/t-reset-int.c b/tests/reset-properties/t-reset-int.c
index 7a1c1a0..1d79328 100644
--- a/tests/reset-properties/t-reset-int.c
+++ b/tests/reset-properties/t-reset-int.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/reset-properties/t-reset-string.c b/tests/reset-properties/t-reset-string.c
index 535190c..864dcd0 100644
--- a/tests/reset-properties/t-reset-string.c
+++ b/tests/reset-properties/t-reset-string.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/reset-properties/t-reset-stringlist.c b/tests/reset-properties/t-reset-stringlist.c
index c40e788..6ccae52 100644
--- a/tests/reset-properties/t-reset-stringlist.c
+++ b/tests/reset-properties/t-reset-stringlist.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/reset-properties/t-reset-uint64.c b/tests/reset-properties/t-reset-uint64.c
index 692ae64..4b90ef1 100644
--- a/tests/reset-properties/t-reset-uint64.c
+++ b/tests/reset-properties/t-reset-uint64.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/set-properties/t-set-arrayv.c b/tests/set-properties/t-set-arrayv.c
index 5fd2ed7..766e96b 100644
--- a/tests/set-properties/t-set-arrayv.c
+++ b/tests/set-properties/t-set-arrayv.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/set-properties/t-set-boolean.c b/tests/set-properties/t-set-boolean.c
index 5a78f2d..79a6d97 100644
--- a/tests/set-properties/t-set-boolean.c
+++ b/tests/set-properties/t-set-boolean.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/set-properties/t-set-double.c b/tests/set-properties/t-set-double.c
index ade54c9..98dc7a2 100644
--- a/tests/set-properties/t-set-double.c
+++ b/tests/set-properties/t-set-double.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/set-properties/t-set-int.c b/tests/set-properties/t-set-int.c
index 6b0b526..753cafb 100644
--- a/tests/set-properties/t-set-int.c
+++ b/tests/set-properties/t-set-int.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/set-properties/t-set-string.c b/tests/set-properties/t-set-string.c
index 09faa15..76667d4 100644
--- a/tests/set-properties/t-set-string.c
+++ b/tests/set-properties/t-set-string.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/set-properties/t-set-stringlist.c b/tests/set-properties/t-set-stringlist.c
index 471f983..5bf64eb 100644
--- a/tests/set-properties/t-set-stringlist.c
+++ b/tests/set-properties/t-set-stringlist.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/set-properties/t-set-uint64.c b/tests/set-properties/t-set-uint64.c
index 0bb3e0b..32650b4 100644
--- a/tests/set-properties/t-set-uint64.c
+++ b/tests/set-properties/t-set-uint64.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "tests-common.h"
diff --git a/tests/tests-common.h b/tests/tests-common.h
index 54fec2f..b6216c3 100644
--- a/tests/tests-common.h
+++ b/tests/tests-common.h
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef __XFCONF_TESTS_COMMON_H__
diff --git a/xfconf-perl/Xfconf.pm.in b/xfconf-perl/Xfconf.pm.in
index c87e121..0069279 100644
--- a/xfconf-perl/Xfconf.pm.in
+++ b/xfconf-perl/Xfconf.pm.in
@@ -1,19 +1,18 @@
 #
 # Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
 #
-# This program 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.
-# 
-# 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.
-# 
-# You should have received a copy of the GNU Lesser 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.
+ *  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; version 2 of the License ONLY.
+ *
+ *  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 { package Xfce4::Xfconf;
     use 5.008;
diff --git a/xfconf-perl/xfconfperl.h b/xfconf-perl/xfconfperl.h
index eec65af..8efda59 100644
--- a/xfconf-perl/xfconfperl.h
+++ b/xfconf-perl/xfconfperl.h
@@ -1,3 +1,23 @@
+/*
+ *  xfconf-perl
+ *
+ *  Copyright (c) 2009 Brian Tarricone <brian at tarricone.org>
+ *
+ *  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; version 2
+ *  of the License ONLY.
+ *
+ *  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
+ *  Lesser General Public License for more details.
+ *
+ *  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
+ */
+
 #ifndef __XFCONFPERL_H__
 #define __XFCONFPERL_H__
 
diff --git a/xfconf-perl/xs/Xfconf.xs b/xfconf-perl/xs/Xfconf.xs
index 0b8e333..e5c48ad 100644
--- a/xfconf-perl/xs/Xfconf.xs
+++ b/xfconf-perl/xs/Xfconf.xs
@@ -3,19 +3,18 @@
 /*
  * Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
  *
- * This program 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.
+ *  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; version 2 of the License ONLY.
  *
- * 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 Lesser 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
  */
 
 #include "xfconfperl.h"
diff --git a/xfconf-perl/xs/XfconfBinding.xs b/xfconf-perl/xs/XfconfBinding.xs
index c234503..4ca8f4c 100644
--- a/xfconf-perl/xs/XfconfBinding.xs
+++ b/xfconf-perl/xs/XfconfBinding.xs
@@ -1,19 +1,18 @@
 /*
  * Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
  *
- * This program 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.
+ *  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; version 2 of the License ONLY.
  *
- * 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 Lesser 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
  */
 
 #include "xfconfperl.h"
diff --git a/xfconf-perl/xs/XfconfChannel.xs b/xfconf-perl/xs/XfconfChannel.xs
index 00a82fb..12126b0 100644
--- a/xfconf-perl/xs/XfconfChannel.xs
+++ b/xfconf-perl/xs/XfconfChannel.xs
@@ -1,19 +1,18 @@
 /*
  * Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
  *
- * This program 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.
+ *  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; version 2 of the License ONLY.
  *
- * 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 Lesser 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
  */
 
 #include "xfconfperl.h"
diff --git a/xfconf-query/main.c b/xfconf-query/main.c
index fd6bdc4..b6febd1 100644
--- a/xfconf-query/main.c
+++ b/xfconf-query/main.c
@@ -4,17 +4,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.
+ *  the Free Software Foundation; version 2 of the License ONLY.
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/xfconf/abicheck.sh b/xfconf/abicheck.sh
index afb8318..4684846 100755
--- a/xfconf/abicheck.sh
+++ b/xfconf/abicheck.sh
@@ -3,20 +3,18 @@
 # Copyright (c) 2004 The GLib Development Team.
 # Copyright (c) 2005 Benedikt Meurer <benny at xfce.org>.
 #
-# 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 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; version 2 of the License ONLY.
 #
-# This library is distributed in the hope that it will be useful,
+# 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.
+# 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 Library General Public
-# License along with this library; 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
 #
 
 cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES ${srcdir:-.}/xfconf.symbols | sed -e '/^$/d' -e 's/ XFCONF_GNUC.*$//' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
diff --git a/xfconf/xfconf-binding.c b/xfconf/xfconf-binding.c
index c532822..6cfced6 100644
--- a/xfconf/xfconf-binding.c
+++ b/xfconf/xfconf-binding.c
@@ -4,17 +4,18 @@
  *  Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
  *  Copyright (c) 2009 Nick Schermer <nick at xfce.org>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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 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 General Public License
- *  along with this program; if not, write to the Free Software
+ *  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
  */
 
diff --git a/xfconf/xfconf-binding.h b/xfconf/xfconf-binding.h
index 956bf9e..915716a 100644
--- a/xfconf/xfconf-binding.h
+++ b/xfconf/xfconf-binding.h
@@ -3,17 +3,18 @@
  *
  *  Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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 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 General Public License
- *  along with this program; if not, write to the Free Software
+ *  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
  */
 
diff --git a/xfconf/xfconf-cache.c b/xfconf/xfconf-cache.c
index 432982b..71d57a0 100644
--- a/xfconf/xfconf-cache.c
+++ b/xfconf/xfconf-cache.c
@@ -3,17 +3,18 @@
  *
  *  Copyright (c) 2009 Brian Tarricone <brian at tarricone.org>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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 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 General Public License
- *  along with this program; if not, write to the Free Software
+ *  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
  */
 
diff --git a/xfconf/xfconf-cache.h b/xfconf/xfconf-cache.h
index 025ec8a..35f61b2 100644
--- a/xfconf/xfconf-cache.h
+++ b/xfconf/xfconf-cache.h
@@ -3,17 +3,18 @@
  *
  *  Copyright (c) 2009 Brian Tarricone <brian at tarricone.org>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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 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 General Public License
- *  along with this program; if not, write to the Free Software
+ *  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
  */
 
diff --git a/xfconf/xfconf-channel.c b/xfconf/xfconf-channel.c
index be214a9..e3a3e31 100644
--- a/xfconf/xfconf-channel.c
+++ b/xfconf/xfconf-channel.c
@@ -3,17 +3,18 @@
  *
  *  Copyright (c) 2007-2008 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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 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 General Public License
- *  along with this program; if not, write to the Free Software
+ *  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
  */
 
diff --git a/xfconf/xfconf-channel.h b/xfconf/xfconf-channel.h
index bcaa97f..e6287a5 100644
--- a/xfconf/xfconf-channel.h
+++ b/xfconf/xfconf-channel.h
@@ -3,17 +3,18 @@
  *
  *  Copyright (c) 2007-2008 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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 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 General Public License
- *  along with this program; if not, write to the Free Software
+ *  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
  */
 
diff --git a/xfconf/xfconf-errors.h b/xfconf/xfconf-errors.h
index 470ebb4..4b489fd 100644
--- a/xfconf/xfconf-errors.h
+++ b/xfconf/xfconf-errors.h
@@ -3,18 +3,19 @@
  *
  *  Copyright (c) 2007 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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.
+ *  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 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 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
  */
 
 #ifndef __XFCONF_ERRORS_H__
diff --git a/xfconf/xfconf-private.h b/xfconf/xfconf-private.h
index eb55915..472a245 100644
--- a/xfconf/xfconf-private.h
+++ b/xfconf/xfconf-private.h
@@ -1,20 +1,21 @@
 /*
- *  xfce-power-manager
+ *  xfconf
  *
  *  Copyright (c) 2007 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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.
+ *  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 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 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
  */
 
 #ifndef __XFCONF_PRIVATE_H__
diff --git a/xfconf/xfconf-types.h b/xfconf/xfconf-types.h
index 5a91c0a..6b6a3f8 100644
--- a/xfconf/xfconf-types.h
+++ b/xfconf/xfconf-types.h
@@ -3,18 +3,19 @@
  *
  *  Copyright (c) 2007 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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.
+ *  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 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 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
  */
 
 #ifndef __XFCONF_TYPES_H__
diff --git a/xfconf/xfconf.c b/xfconf/xfconf.c
index 1f10e95..64e2719 100644
--- a/xfconf/xfconf.c
+++ b/xfconf/xfconf.c
@@ -3,18 +3,19 @@
  *
  *  Copyright (c) 2007 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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.
+ *  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 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 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
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/xfconf/xfconf.h b/xfconf/xfconf.h
index 1d3258a..8a41ef7 100644
--- a/xfconf/xfconf.h
+++ b/xfconf/xfconf.h
@@ -3,18 +3,19 @@
  *
  *  Copyright (c) 2007 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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.
+ *  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 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 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
  */
 
 #ifndef __XFCONF_H__
diff --git a/xfconf/xfconf.symbols b/xfconf/xfconf.symbols
index d047bb1..a60d095 100644
--- a/xfconf/xfconf.symbols
+++ b/xfconf/xfconf.symbols
@@ -3,17 +3,18 @@
  *
  *  Copyright (c) 2007 Brian Tarricone <bjt23 at cornell.edu>
  *
- *  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; version 2 of the License ONLY.
+ *  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; version 2
+ *  of the License ONLY.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  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 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 General Public License
- *  along with this program; if not, write to the Free Software
+ *  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
  */
 
diff --git a/xfconfd/main.c b/xfconfd/main.c
index 2d8a80f..72e90e1 100644
--- a/xfconfd/main.c
+++ b/xfconfd/main.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/xfconfd/xfconf-locking-utils.c b/xfconfd/xfconf-locking-utils.c
index d5446b7..3a19b4d 100644
--- a/xfconfd/xfconf-locking-utils.c
+++ b/xfconfd/xfconf-locking-utils.c
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/xfconfd/xfconf-locking-utils.h b/xfconfd/xfconf-locking-utils.h
index 68757a5..c0a35b2 100644
--- a/xfconfd/xfconf-locking-utils.h
+++ b/xfconfd/xfconf-locking-utils.h
@@ -14,7 +14,7 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef __XFCONF_UTIL_H__



More information about the Xfce4-commits mailing list