3392e41b22
- Merge fixes from lp:timezonemap - Add cc-timezone-location.h to timezonemapincludes_HEADERS so it gets installed (iain.lane) - Set en_name correctly (iain.lane) - Don't call g_type_init() on glib >= 2.35; it's deprecated (iain.lane)
86 lines
3.3 KiB
Diff
86 lines
3.3 KiB
Diff
From 817161c4596df2fba45e5d801ed26ddc0bb4f4e2 Mon Sep 17 00:00:00 2001
|
|
From: David Shea <dshea@redhat.com>
|
|
Date: Thu, 14 Nov 2013 10:50:49 -0500
|
|
Subject: [PATCH 04/18] Update the GPL comments with the new FSF address.
|
|
|
|
The Free Software Foundation's address is now at 51 Franklin St. The
|
|
rest of the GPL v2 boilerplate comment is unchanged.
|
|
---
|
|
src/cc-timezone-map.c | 6 +++---
|
|
src/cc-timezone-map.h | 6 +++---
|
|
src/tz.c | 6 +++---
|
|
src/tz.h | 6 +++---
|
|
4 files changed, 12 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/src/cc-timezone-map.c b/src/cc-timezone-map.c
|
|
index 4d7fa40..60297e4 100644
|
|
--- a/src/cc-timezone-map.c
|
|
+++ b/src/cc-timezone-map.c
|
|
@@ -15,9 +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.
|
|
*
|
|
* Author: Thomas Wood <thomas.wood@intel.com>
|
|
*
|
|
diff --git a/src/cc-timezone-map.h b/src/cc-timezone-map.h
|
|
index 8a6bf9c..ddb6961 100644
|
|
--- a/src/cc-timezone-map.h
|
|
+++ b/src/cc-timezone-map.h
|
|
@@ -11,9 +11,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.
|
|
*
|
|
* Author: Thomas Wood <thomas.wood@intel.com>
|
|
*
|
|
diff --git a/src/tz.c b/src/tz.c
|
|
index 969119a..c294b44 100644
|
|
--- a/src/tz.c
|
|
+++ b/src/tz.c
|
|
@@ -17,9 +17,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/src/tz.h b/src/tz.h
|
|
index 3ade1f8..005d72f 100644
|
|
--- a/src/tz.h
|
|
+++ b/src/tz.h
|
|
@@ -17,9 +17,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.
|
|
*/
|
|
|
|
|
|
--
|
|
1.8.4.2
|
|
|