[gnome-initial-setup] Fix and update legal boilerplate
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup] Fix and update legal boilerplate
- Date: Wed, 5 Sep 2012 13:55:08 +0000 (UTC)
commit 2b5550527435c299a1063b8176a8483d011bab68
Author: Debarshi Ray <debarshir gnome org>
Date: Wed Sep 5 15:39:22 2012 +0200
Fix and update legal boilerplate
Some files written by Matthias Clasen (mclasen) were licensed under
GPLv3+. He has agreed to relicense them to GPLv2+:
<mclasen> rishi: ok, you're right, pw-utils is mine, fine to change
COPYING | 2 +-
gnome-initial-setup/gis-assistant-clutter.c | 18 +++++++++---------
gnome-initial-setup/gis-assistant-gtk.c | 18 +++++++++---------
gnome-initial-setup/gis-assistant-private.h | 18 +++++++++---------
gnome-initial-setup/gis-assistant.c | 18 +++++++++---------
.../pages/account/pw-utils-pwquality.c | 11 ++++++-----
gnome-initial-setup/pages/account/pw-utils.c | 11 ++++++-----
gnome-initial-setup/pages/account/pw-utils.h | 11 ++++++-----
.../pages/account/um-photo-dialog.c | 11 ++++++-----
.../pages/account/um-photo-dialog.h | 11 ++++++-----
gnome-initial-setup/pages/account/um-utils.c | 11 ++++++-----
gnome-initial-setup/pages/account/um-utils.h | 11 ++++++-----
.../goa/cc-online-accounts-add-account-dialog.c | 10 +++++-----
.../goa/cc-online-accounts-add-account-dialog.h | 10 +++++-----
.../pages/language/cc-common-language.c | 11 ++++++-----
.../pages/language/cc-common-language.h | 11 ++++++-----
gnome-initial-setup/pages/language/gdm-languages.c | 11 ++++++-----
gnome-initial-setup/pages/language/gdm-languages.h | 11 ++++++-----
gnome-initial-setup/pages/language/locarchive.h | 4 ++--
.../pages/location/cc-timezone-map.c | 11 ++++++-----
.../pages/location/cc-timezone-map.h | 11 ++++++-----
gnome-initial-setup/pages/location/tz.c | 13 +++++++------
gnome-initial-setup/pages/location/tz.h | 11 ++++++-----
23 files changed, 140 insertions(+), 125 deletions(-)
---
diff --git a/COPYING b/COPYING
index e8d7f96..dde37d1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-The source code of Gnome Documents is licensed to you under the GNU
+The source code of Gnome Initial Setup is licensed to you under the GNU
General Public License version 2, or (at your option) any later version.
========================================================================
diff --git a/gnome-initial-setup/gis-assistant-clutter.c b/gnome-initial-setup/gis-assistant-clutter.c
index 94463a5..c8abe7d 100644
--- a/gnome-initial-setup/gis-assistant-clutter.c
+++ b/gnome-initial-setup/gis-assistant-clutter.c
@@ -3,19 +3,19 @@
* Copyright (C) 2012 Red Hat
*
* 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.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
- * This program is 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
*
* Written by:
* Jasper St. Pierre <jstpierre mecheye net>
diff --git a/gnome-initial-setup/gis-assistant-gtk.c b/gnome-initial-setup/gis-assistant-gtk.c
index ce08163..773aea0 100644
--- a/gnome-initial-setup/gis-assistant-gtk.c
+++ b/gnome-initial-setup/gis-assistant-gtk.c
@@ -3,19 +3,19 @@
* Copyright (C) 2012 Red Hat
*
* 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.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
- * This program is 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
*
* Written by:
* Jasper St. Pierre <jstpierre mecheye net>
diff --git a/gnome-initial-setup/gis-assistant-private.h b/gnome-initial-setup/gis-assistant-private.h
index 9f4c2f0..793c52c 100644
--- a/gnome-initial-setup/gis-assistant-private.h
+++ b/gnome-initial-setup/gis-assistant-private.h
@@ -3,19 +3,19 @@
* Copyright (C) 2012 Red Hat
*
* 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.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
- * This program is 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
*/
#ifndef __GIS_ASSISTANT_PRIVATE_H__
diff --git a/gnome-initial-setup/gis-assistant.c b/gnome-initial-setup/gis-assistant.c
index 166ebc0..603b9a0 100644
--- a/gnome-initial-setup/gis-assistant.c
+++ b/gnome-initial-setup/gis-assistant.c
@@ -3,19 +3,19 @@
* Copyright (C) 2012 Red Hat
*
* 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.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
- * This program is 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
*
* Written by:
* Jasper St. Pierre <jstpierre mecheye net>
diff --git a/gnome-initial-setup/pages/account/pw-utils-pwquality.c b/gnome-initial-setup/pages/account/pw-utils-pwquality.c
index 8d2fde0..656d87b 100644
--- a/gnome-initial-setup/pages/account/pw-utils-pwquality.c
+++ b/gnome-initial-setup/pages/account/pw-utils-pwquality.c
@@ -2,10 +2,10 @@
*
* Copyright 2012 Red Hat, Inc,
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,8 @@
*
* 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
*
* Written by: Matthias Clasen <mclasen redhat com>
*/
diff --git a/gnome-initial-setup/pages/account/pw-utils.c b/gnome-initial-setup/pages/account/pw-utils.c
index ee8acec..cdafa23 100644
--- a/gnome-initial-setup/pages/account/pw-utils.c
+++ b/gnome-initial-setup/pages/account/pw-utils.c
@@ -2,10 +2,10 @@
*
* Copyright 2012 Red Hat, Inc,
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,8 @@
*
* 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
*
* Written by: Matthias Clasen <mclasen redhat com>
*/
diff --git a/gnome-initial-setup/pages/account/pw-utils.h b/gnome-initial-setup/pages/account/pw-utils.h
index a88ae34..fde331e 100644
--- a/gnome-initial-setup/pages/account/pw-utils.h
+++ b/gnome-initial-setup/pages/account/pw-utils.h
@@ -2,10 +2,10 @@
*
* Copyright 2012 Red Hat, Inc,
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,8 @@
*
* 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
*
* Written by: Matthias Clasen <mclasen redhat com>
*/
diff --git a/gnome-initial-setup/pages/account/um-photo-dialog.c b/gnome-initial-setup/pages/account/um-photo-dialog.c
index 52116df..79ecc74 100644
--- a/gnome-initial-setup/pages/account/um-photo-dialog.c
+++ b/gnome-initial-setup/pages/account/um-photo-dialog.c
@@ -2,10 +2,10 @@
*
* Copyright 2009-2010 Red Hat, Inc,
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,8 @@
*
* 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
*
* Written by: Matthias Clasen <mclasen redhat com>
*/
diff --git a/gnome-initial-setup/pages/account/um-photo-dialog.h b/gnome-initial-setup/pages/account/um-photo-dialog.h
index 697fe30..1819c97 100644
--- a/gnome-initial-setup/pages/account/um-photo-dialog.h
+++ b/gnome-initial-setup/pages/account/um-photo-dialog.h
@@ -2,10 +2,10 @@
*
* Copyright 2009-2010 Red Hat, Inc,
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,8 @@
*
* 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
*
* Written by: Matthias Clasen <mclasen redhat com>
*/
diff --git a/gnome-initial-setup/pages/account/um-utils.c b/gnome-initial-setup/pages/account/um-utils.c
index 3bfbdbb..5ad2e57 100644
--- a/gnome-initial-setup/pages/account/um-utils.c
+++ b/gnome-initial-setup/pages/account/um-utils.c
@@ -2,10 +2,10 @@
*
* Copyright 2009-2010 Red Hat, Inc,
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,8 @@
*
* 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
*
* Written by: Matthias Clasen <mclasen redhat com>
*/
diff --git a/gnome-initial-setup/pages/account/um-utils.h b/gnome-initial-setup/pages/account/um-utils.h
index ea30a89..ec534dc 100644
--- a/gnome-initial-setup/pages/account/um-utils.h
+++ b/gnome-initial-setup/pages/account/um-utils.h
@@ -2,10 +2,10 @@
*
* Copyright 2009-2010 Red Hat, Inc,
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,8 @@
*
* 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
*
* Written by: Matthias Clasen <mclasen redhat com>
*/
diff --git a/gnome-initial-setup/pages/goa/cc-online-accounts-add-account-dialog.c b/gnome-initial-setup/pages/goa/cc-online-accounts-add-account-dialog.c
index d3a71e1..6a01bfe 100644
--- a/gnome-initial-setup/pages/goa/cc-online-accounts-add-account-dialog.c
+++ b/gnome-initial-setup/pages/goa/cc-online-accounts-add-account-dialog.c
@@ -5,17 +5,17 @@
* 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; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 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
* 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., 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
*
* Author: Debarshi Ray <debarshir gnome org>
*/
diff --git a/gnome-initial-setup/pages/goa/cc-online-accounts-add-account-dialog.h b/gnome-initial-setup/pages/goa/cc-online-accounts-add-account-dialog.h
index 0f503cb..9f320f7 100644
--- a/gnome-initial-setup/pages/goa/cc-online-accounts-add-account-dialog.h
+++ b/gnome-initial-setup/pages/goa/cc-online-accounts-add-account-dialog.h
@@ -5,17 +5,17 @@
* 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; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 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
* 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., 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
*
* Author: Debarshi Ray <debarshir gnome org>
*/
diff --git a/gnome-initial-setup/pages/language/cc-common-language.c b/gnome-initial-setup/pages/language/cc-common-language.c
index 46c2735..def1f06 100644
--- a/gnome-initial-setup/pages/language/cc-common-language.c
+++ b/gnome-initial-setup/pages/language/cc-common-language.c
@@ -2,10 +2,10 @@
*
* Copyright 2009-2010 Red Hat, Inc,
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,8 @@
*
* 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
*
* Written by: Matthias Clasen <mclasen redhat com>
*/
diff --git a/gnome-initial-setup/pages/language/cc-common-language.h b/gnome-initial-setup/pages/language/cc-common-language.h
index 12adc57..7f32cab 100644
--- a/gnome-initial-setup/pages/language/cc-common-language.h
+++ b/gnome-initial-setup/pages/language/cc-common-language.h
@@ -2,10 +2,10 @@
*
* Copyright 2009-2010 Red Hat, Inc,
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,8 @@
*
* 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
*
* Written by: Matthias Clasen <mclasen redhat com>
*/
diff --git a/gnome-initial-setup/pages/language/gdm-languages.c b/gnome-initial-setup/pages/language/gdm-languages.c
index 64c72e4..907379e 100644
--- a/gnome-initial-setup/pages/language/gdm-languages.c
+++ b/gnome-initial-setup/pages/language/gdm-languages.c
@@ -3,10 +3,10 @@
* Copyright 2008 Red Hat, Inc,
* 2007 William Jon McCann <mccann jhu 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; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 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
@@ -15,7 +15,8 @@
*
* 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
*
* Written by : William Jon McCann <mccann jhu edu>
* Ray Strode <rstrode redhat com>
diff --git a/gnome-initial-setup/pages/language/gdm-languages.h b/gnome-initial-setup/pages/language/gdm-languages.h
index 5ee33b3..1a4eaeb 100644
--- a/gnome-initial-setup/pages/language/gdm-languages.h
+++ b/gnome-initial-setup/pages/language/gdm-languages.h
@@ -3,10 +3,10 @@
* Copyright 2008 Red Hat, Inc.
* Copyright 2007 William Jon McCann <mccann jhu 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; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 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
@@ -15,7 +15,8 @@
*
* 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
*
* Written by: Ray Strode
* William Jon McCann
diff --git a/gnome-initial-setup/pages/language/locarchive.h b/gnome-initial-setup/pages/language/locarchive.h
index f933f4d..bd88f00 100644
--- a/gnome-initial-setup/pages/language/locarchive.h
+++ b/gnome-initial-setup/pages/language/locarchive.h
@@ -14,8 +14,8 @@
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301 USA. */
#ifndef _LOCARCHIVE_H
#define _LOCARCHIVE_H 1
diff --git a/gnome-initial-setup/pages/location/cc-timezone-map.c b/gnome-initial-setup/pages/location/cc-timezone-map.c
index 75948d9..f49b29d 100644
--- a/gnome-initial-setup/pages/location/cc-timezone-map.c
+++ b/gnome-initial-setup/pages/location/cc-timezone-map.c
@@ -4,10 +4,10 @@
* Portions from Ubiquity, Copyright (C) 2009 Canonical Ltd.
* Written by Evan Dandrea <evand ubuntu com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 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
@@ -16,7 +16,8 @@
*
* 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
*
* Author: Thomas Wood <thomas wood intel com>
*
diff --git a/gnome-initial-setup/pages/location/cc-timezone-map.h b/gnome-initial-setup/pages/location/cc-timezone-map.h
index bb15def..629b6eb 100644
--- a/gnome-initial-setup/pages/location/cc-timezone-map.h
+++ b/gnome-initial-setup/pages/location/cc-timezone-map.h
@@ -1,10 +1,10 @@
/*
* Copyright (C) 2010 Intel, Inc
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 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
@@ -13,7 +13,8 @@
*
* 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
*
* Author: Thomas Wood <thomas wood intel com>
*
diff --git a/gnome-initial-setup/pages/location/tz.c b/gnome-initial-setup/pages/location/tz.c
index 776418b..c1ba940 100644
--- a/gnome-initial-setup/pages/location/tz.c
+++ b/gnome-initial-setup/pages/location/tz.c
@@ -4,13 +4,13 @@
* Copyright (C) 2000-2001 Ximian, Inc.
*
* Authors: Hans Petter Jansson <hpj ximian com>
- *
+ *
* Largely based on Michael Fulbright's work on Anaconda.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 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
@@ -19,7 +19,8 @@
*
* 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
*/
diff --git a/gnome-initial-setup/pages/location/tz.h b/gnome-initial-setup/pages/location/tz.h
index 71c1c23..27ecd5a 100644
--- a/gnome-initial-setup/pages/location/tz.h
+++ b/gnome-initial-setup/pages/location/tz.h
@@ -7,10 +7,10 @@
*
* Largely based on Michael Fulbright's work on Anaconda.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 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
@@ -19,7 +19,8 @@
*
* 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
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
