[Xfce4-commits] <xfce4-settings:master> Fix license addresses.

Nick Schermer noreply at xfce.org
Wed May 25 19:18:01 CEST 2011


Updating branch refs/heads/master
         to be6159736d625762d29fd6581a90c965c4923874 (commit)
       from 5a5a2fcc4c5e76322925fbab0f6a0e8f73f79648 (commit)

commit be6159736d625762d29fd6581a90c965c4923874
Author: Nick Schermer <nick at xfce.org>
Date:   Wed May 25 19:16:19 2011 +0200

    Fix license addresses.

 autogen.sh                                         |   17 +++++++++++++++--
 dialogs/accessibility-settings/main.c              |    7 +++----
 dialogs/appearance-settings/images.h               |    7 +++----
 dialogs/appearance-settings/main.c                 |    7 +++----
 dialogs/display-settings/edid.h                    |    9 ++++-----
 dialogs/display-settings/main.c                    |    7 +++----
 dialogs/display-settings/xfce-randr.c              |    7 +++----
 dialogs/display-settings/xfce-randr.h              |    7 +++----
 dialogs/keyboard-settings/command-dialog.c         |    8 +++-----
 dialogs/keyboard-settings/command-dialog.h         |    8 +++-----
 dialogs/keyboard-settings/main.c                   |    7 +++----
 dialogs/keyboard-settings/xfce-keyboard-settings.c |    7 +++----
 dialogs/keyboard-settings/xfce-keyboard-settings.h |    7 +++----
 dialogs/mouse-settings/main.c                      |    6 +++---
 xfce4-settings-editor/main.c                       |    6 +++---
 xfce4-settings-editor/main_window.c                |    6 +++---
 xfce4-settings-editor/main_window.h                |    6 +++---
 xfce4-settings-manager/main.c                      |    1 -
 .../xfce-settings-manager-dialog.h                 |    1 -
 xfce4-settings-manager/xfce-text-renderer.c        |    7 +++----
 xfce4-settings-manager/xfce-text-renderer.h        |    7 +++----
 xfsettingsd/accessibility.c                        |    7 +++----
 xfsettingsd/accessibility.h                        |    7 +++----
 xfsettingsd/clipboard-manager.c                    |    6 +++---
 xfsettingsd/clipboard-manager.h                    |    6 +++---
 xfsettingsd/debug.c                                |    6 +++---
 xfsettingsd/debug.h                                |    6 +++---
 xfsettingsd/displays.c                             |    7 +++----
 xfsettingsd/displays.h                             |    7 +++----
 xfsettingsd/keyboard-layout.c                      |    7 +++----
 xfsettingsd/keyboard-layout.h                      |    7 +++----
 xfsettingsd/keyboard-shortcuts.c                   |    8 +++-----
 xfsettingsd/keyboard-shortcuts.h                   |    8 +++-----
 xfsettingsd/keyboards.c                            |    7 +++----
 xfsettingsd/keyboards.h                            |    7 +++----
 xfsettingsd/main.c                                 |    7 +++----
 xfsettingsd/pointers.c                             |    6 +++---
 xfsettingsd/pointers.h                             |    7 +++----
 38 files changed, 121 insertions(+), 140 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 72ab6b9..dbf6204 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,20 @@
 #!/bin/sh
 #
-# Copyright (c) 2002-2009
-#         The Xfce development team. All rights reserved.
+# Copyright (c) 2002-2009 The Xfce development team. All rights reserved.
+#
+# This library 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 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.
+#
+# 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
 #
 # Written for Xfce by Benedikt Meurer <benny at xfce.org>
 #                 and Brian Tarricone <brian at tarricone.org>.
diff --git a/dialogs/accessibility-settings/main.c b/dialogs/accessibility-settings/main.c
index 5271fd7..889063c 100644
--- a/dialogs/accessibility-settings/main.c
+++ b/dialogs/accessibility-settings/main.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Stephan Arts <stephan at xfce.org>
  *                     Jannis Pohlmann <jannis at xfce.org>
@@ -13,9 +12,9 @@
  *  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., 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/dialogs/appearance-settings/images.h b/dialogs/appearance-settings/images.h
index 7762ed9..2a71799 100644
--- a/dialogs/appearance-settings/images.h
+++ b/dialogs/appearance-settings/images.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Nick Schermer <nick at xfce.org>
  *
@@ -12,9 +11,9 @@
  *  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., 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/dialogs/appearance-settings/main.c b/dialogs/appearance-settings/main.c
index d599ec5..76b0ee0 100644
--- a/dialogs/appearance-settings/main.c
+++ b/dialogs/appearance-settings/main.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Stephan Arts <stephan at xfce.org>
  *  Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>
@@ -13,9 +12,9 @@
  *  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., 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/dialogs/display-settings/edid.h b/dialogs/display-settings/edid.h
index d9cbb5d..4ea5cd0 100644
--- a/dialogs/display-settings/edid.h
+++ b/dialogs/display-settings/edid.h
@@ -14,11 +14,10 @@
  * 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 the Gnome Library; see the file COPYING.LIB.  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 the Gnome Library; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
  * Author: Soren Sandmann <sandmann at redhat.com>
  */
 
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index f4f3b2a..97440d2 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Nick Schermer <nick at xfce.org>
  *  Copyright (C) 2010 Lionel Le Folgoc <lionel at lefolgoc.net>
@@ -13,9 +12,9 @@
  *  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., 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/dialogs/display-settings/xfce-randr.c b/dialogs/display-settings/xfce-randr.c
index c40f50d..a6de2ae 100644
--- a/dialogs/display-settings/xfce-randr.c
+++ b/dialogs/display-settings/xfce-randr.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Nick Schermer <nick at xfce.org>
  *  Copyright (C) 2010 Lionel Le Folgoc <lionel at lefolgoc.net>
@@ -13,9 +12,9 @@
  *  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., 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/dialogs/display-settings/xfce-randr.h b/dialogs/display-settings/xfce-randr.h
index fc3fc03..93bbdbb 100644
--- a/dialogs/display-settings/xfce-randr.h
+++ b/dialogs/display-settings/xfce-randr.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Nick Schermer <nick at xfce.org>
  *  Copyright (C) 2010 Lionel Le Folgoc <lionel at lefolgoc.net>
@@ -13,9 +12,9 @@
  *  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., 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 <xfconf/xfconf.h>
diff --git a/dialogs/keyboard-settings/command-dialog.c b/dialogs/keyboard-settings/command-dialog.c
index 4e1c26d..7216c7b 100644
--- a/dialogs/keyboard-settings/command-dialog.c
+++ b/dialogs/keyboard-settings/command-dialog.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* vi:set sw=2 sts=2 ts=2 et ai: */
 /*-
  * Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>.
@@ -13,10 +12,9 @@
  * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/dialogs/keyboard-settings/command-dialog.h b/dialogs/keyboard-settings/command-dialog.h
index 0f084da..5fe229f 100644
--- a/dialogs/keyboard-settings/command-dialog.h
+++ b/dialogs/keyboard-settings/command-dialog.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* vi:set sw=2 sts=2 ts=2 et ai: */
 /*-
  * Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>.
@@ -13,10 +12,9 @@
  * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef __COMMAND_DIALOG_H__
diff --git a/dialogs/keyboard-settings/main.c b/dialogs/keyboard-settings/main.c
index cc247cf..73f4e83 100644
--- a/dialogs/keyboard-settings/main.c
+++ b/dialogs/keyboard-settings/main.c
@@ -12,10 +12,9 @@
  * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index cd33c9b..704515a 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -15,10 +15,9 @@
  * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.h b/dialogs/keyboard-settings/xfce-keyboard-settings.h
index 0a6a772..30b1dcf 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.h
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.h
@@ -12,10 +12,9 @@
  * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef __XFCE_KEYBOARD_SETTINGS_H__
diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
index 2f644d5..c656d93 100644
--- a/dialogs/mouse-settings/main.c
+++ b/dialogs/mouse-settings/main.c
@@ -12,9 +12,9 @@
  *  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., 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/xfce4-settings-editor/main.c b/xfce4-settings-editor/main.c
index 4a805c4..cda9cde 100644
--- a/xfce4-settings-editor/main.c
+++ b/xfce4-settings-editor/main.c
@@ -11,9 +11,9 @@
  *  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., 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/xfce4-settings-editor/main_window.c b/xfce4-settings-editor/main_window.c
index 44699a7..144c979 100644
--- a/xfce4-settings-editor/main_window.c
+++ b/xfce4-settings-editor/main_window.c
@@ -12,9 +12,9 @@
  *  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., 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/xfce4-settings-editor/main_window.h b/xfce4-settings-editor/main_window.h
index bfb48e1..223e2a7 100644
--- a/xfce4-settings-editor/main_window.h
+++ b/xfce4-settings-editor/main_window.h
@@ -11,9 +11,9 @@
  *  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., 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.
  */
 
 
diff --git a/xfce4-settings-manager/main.c b/xfce4-settings-manager/main.c
index 7d6ad53..71332f6 100644
--- a/xfce4-settings-manager/main.c
+++ b/xfce4-settings-manager/main.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  xfce4-settings-manager
  *
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.h b/xfce4-settings-manager/xfce-settings-manager-dialog.h
index c745cff..467bff0 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.h
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  xfce4-settings-manager
  *
diff --git a/xfce4-settings-manager/xfce-text-renderer.c b/xfce4-settings-manager/xfce-text-renderer.c
index 1989003..d013a2e 100644
--- a/xfce4-settings-manager/xfce-text-renderer.c
+++ b/xfce4-settings-manager/xfce-text-renderer.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*-
  * Copyright (c) 2008      Jannis Pohlmann <jannis at xfce.org>
  * Copyright (c) 2005-2006 Benedikt Meurer <benny at xfce.org>
@@ -13,9 +12,9 @@
  * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/xfce4-settings-manager/xfce-text-renderer.h b/xfce4-settings-manager/xfce-text-renderer.h
index f94120d..b4a2384 100644
--- a/xfce4-settings-manager/xfce-text-renderer.h
+++ b/xfce4-settings-manager/xfce-text-renderer.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*-
  * Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>
  * Copyright (c) 2005 Benedikt Meurer <benny at xfce.org>
@@ -13,9 +12,9 @@
  * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef __XFCE_TEXT_RENDERER_H__
diff --git a/xfsettingsd/accessibility.c b/xfsettingsd/accessibility.c
index 5581c4b..edaf1d2 100644
--- a/xfsettingsd/accessibility.c
+++ b/xfsettingsd/accessibility.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Stephan Arts <stephan at xfce.org>
  *
@@ -12,9 +11,9 @@
  *  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., 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.
  *
  *  XKB Extension code taken from the original mcs-keyboard-plugin written
  *  by Olivier Fourdan.
diff --git a/xfsettingsd/accessibility.h b/xfsettingsd/accessibility.h
index a6b5b76..3469fa9 100644
--- a/xfsettingsd/accessibility.h
+++ b/xfsettingsd/accessibility.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Stephan Arts <stephan at xfce.org>
  *
@@ -12,9 +11,9 @@
  *  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., 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.
  *
  *  XKB Extension code taken from the original mcs-keyboard-plugin written
  *  by Olivier Fourdan.
diff --git a/xfsettingsd/clipboard-manager.c b/xfsettingsd/clipboard-manager.c
index 6ff2773..dbf2f0d 100644
--- a/xfsettingsd/clipboard-manager.c
+++ b/xfsettingsd/clipboard-manager.c
@@ -16,9 +16,9 @@
  * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/xfsettingsd/clipboard-manager.h b/xfsettingsd/clipboard-manager.h
index 5b74895..1082f36 100644
--- a/xfsettingsd/clipboard-manager.h
+++ b/xfsettingsd/clipboard-manager.h
@@ -12,9 +12,9 @@
  * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/xfsettingsd/debug.c b/xfsettingsd/debug.c
index a981719..67d53d9 100644
--- a/xfsettingsd/debug.c
+++ b/xfsettingsd/debug.c
@@ -11,9 +11,9 @@
  *  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., 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/xfsettingsd/debug.h b/xfsettingsd/debug.h
index 2d30177..228913e 100644
--- a/xfsettingsd/debug.h
+++ b/xfsettingsd/debug.h
@@ -11,9 +11,9 @@
  *  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., 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 __DEBUG_H__
diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index c34a1f9..e86e847 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Nick Schermer <nick at xfce.org>
  *  Copyright (C) 2010 Lionel Le Folgoc <lionel at lefolgoc.net>
@@ -13,9 +12,9 @@
  *  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., 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/xfsettingsd/displays.h b/xfsettingsd/displays.h
index 46b8f43..8574b20 100644
--- a/xfsettingsd/displays.h
+++ b/xfsettingsd/displays.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Nick Schermer <nick at xfce.org>
  *
@@ -12,9 +11,9 @@
  *  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., 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 __DISPLAYS_H__
diff --git a/xfsettingsd/keyboard-layout.c b/xfsettingsd/keyboard-layout.c
index 129f158..ba2b61c 100644
--- a/xfsettingsd/keyboard-layout.c
+++ b/xfsettingsd/keyboard-layout.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Olivier Fourdan <olivier at xfce.org>
  *
@@ -12,9 +11,9 @@
  *  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., 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.
  *
  */
 
diff --git a/xfsettingsd/keyboard-layout.h b/xfsettingsd/keyboard-layout.h
index cc10d08..c223347 100644
--- a/xfsettingsd/keyboard-layout.h
+++ b/xfsettingsd/keyboard-layout.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Olivier Fourdan <olivier at xfce.org>
  *
@@ -12,9 +11,9 @@
  *  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., 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.
  *
  */
 
diff --git a/xfsettingsd/keyboard-shortcuts.c b/xfsettingsd/keyboard-shortcuts.c
index b77d91d..c964025 100644
--- a/xfsettingsd/keyboard-shortcuts.c
+++ b/xfsettingsd/keyboard-shortcuts.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* vi:set sw=2 sts=2 ts=2 et ai: */
 /*-
  * Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>.
@@ -13,10 +12,9 @@
  * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/xfsettingsd/keyboard-shortcuts.h b/xfsettingsd/keyboard-shortcuts.h
index 31be46e..eee978f 100644
--- a/xfsettingsd/keyboard-shortcuts.h
+++ b/xfsettingsd/keyboard-shortcuts.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* vi:set sw=2 sts=2 ts=2 et ai: */
 /*-
  * Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>.
@@ -13,10 +12,9 @@
  * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef __XFCE_KEYBOARD_SHORTCUTS_HELPER_H__
diff --git a/xfsettingsd/keyboards.c b/xfsettingsd/keyboards.c
index f5c7edc..0512513 100644
--- a/xfsettingsd/keyboards.c
+++ b/xfsettingsd/keyboards.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Stephan Arts <stephan at xfce.org>
  *
@@ -12,9 +11,9 @@
  *  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., 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.
  *
  *  XKB Extension code taken from the original mcs-keyboard-plugin written
  *  by Olivier Fourdan.
diff --git a/xfsettingsd/keyboards.h b/xfsettingsd/keyboards.h
index ff91248..ff2c174 100644
--- a/xfsettingsd/keyboards.h
+++ b/xfsettingsd/keyboards.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Stephan Arts <stephan at xfce.org>
  *
@@ -12,9 +11,9 @@
  *  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., 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.
  *
  *  XKB Extension code taken from the original mcs-keyboard-plugin written
  *  by Olivier Fourdan.
diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c
index 075d291..91758e1 100644
--- a/xfsettingsd/main.c
+++ b/xfsettingsd/main.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Stephan Arts <stephan at xfce.org>
  *  Copyright (c) 2008 Nick Schermer <nick at xfce.org>
@@ -14,9 +13,9 @@
  *  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., 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/xfsettingsd/pointers.c b/xfsettingsd/pointers.c
index c66c562..98f691f 100644
--- a/xfsettingsd/pointers.c
+++ b/xfsettingsd/pointers.c
@@ -11,9 +11,9 @@
  *  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., 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/xfsettingsd/pointers.h b/xfsettingsd/pointers.h
index af1bb81..fb22088 100644
--- a/xfsettingsd/pointers.h
+++ b/xfsettingsd/pointers.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  *  Copyright (c) 2008 Nick Schermer <nick at xfce.org>
  *
@@ -12,9 +11,9 @@
  *  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., 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 __POINTERS_H__



More information about the Xfce4-commits mailing list