diff -Nru pacemaker-1.0.11/debian/changelog pacemaker-1.0.11/debian/changelog --- pacemaker-1.0.11/debian/changelog 2011-05-22 04:53:09.000000000 -0400 +++ pacemaker-1.0.11/debian/changelog 2011-05-25 13:41:25.000000000 -0400 @@ -1,3 +1,20 @@ +pacemaker (1.0.11-1ubuntu1) oneiric; urgency=low + + * Merge from debian unstable (LP: #784855). Remaining changes: + - debian/patches: + + lib_license_headers_update.patch: Update the License Headers to + correctly reflect the use of LGPL-2.1+. + + other_license_headers_update.patch: Update the License Headers of + files that show GPL version 2.1, to correctly show version 2+. + + raexecupstart.patch: Utilize new upstart LRM plugin. + + fix_ftbfs_linker_as_needed.patch: Prevent FTBFS due to linker changes. + + fix_return_o2cb_ra.patch: Fix a return variale error in the o2cb RA. + - debian/pacemaker.postinst: Fix permissions on /var/lib/pengine. + - debian/control: Bump cluster-glue dependencies to Ubuntu specific. + * debian/patches: Refresh all patches. + + -- Andres Rodriguez Wed, 25 May 2011 13:41:12 -0400 + pacemaker (1.0.11-1) unstable; urgency=low [ Martin G. Loschwitz ] @@ -34,6 +51,40 @@ -- Simon Horman Mon, 17 Jan 2011 08:10:29 +0900 +pacemaker (1.0.10-4ubuntu3) natty; urgency=low + + * debian/rules: clean the dependency_libs out of .la files at build + time, per Policy 10.2 + + -- Steve Langasek Thu, 24 Mar 2011 15:51:12 -0700 + +pacemaker (1.0.10-4ubuntu2) natty; urgency=low + + * debian/patches/fix_return_o2cb_ra.patch: Updated and add fix to change + to killall instead of killproc as it doesn't exist in Ubuntu (LP: #727422) + + -- Andres Rodriguez Tue, 01 Mar 2011 17:14:39 -0500 + +pacemaker (1.0.10-4ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #701233). Remaining changes: + - debian/patches: + + lib_license_headers_update.patch: Update the License Headers to + correctly reflect the use of LGPL-2.1+. + + other_license_headers_update.patch: Update the License Headers of + files that show GPL version 2.1, to correctly show version 2+. + + raexecupstart.patch: Utilize new upstart LRM plugin. + + fix_ftbfs_linker_as_needed.patch: Prevent FTBFS due to linker changes. + + fix_return_o2cb_ra.patch: Fix a return variale error in the o2cb RA. + - debian/pacemaker.postinst: Fix permissions on /var/lib/pengine. + * debian/control: + - Bump cluster-glue dependencies to Ubuntu specific. + - pacemaker-dev binary: Update dependencies to correct ones: + (libpe-status2-dev,libpe-rules2-dev) + - libcrmcommon2-dev: Drop Depends on cluster-glue-dev. + + -- Andres Rodriguez Wed, 12 Jan 2011 10:12:46 -0600 + pacemaker (1.0.10-4) unstable; urgency=low * Add dependency on cluster-glue-dev to libcrmcommon2-dev @@ -73,6 +124,46 @@ -- Simon Horman Thu, 16 Dec 2010 21:50:06 +0900 +pacemaker (1.0.9.1+hg15626-2ubuntu3) natty; urgency=low + + * debian/patches: + - lib_license_headers_update.patch: Update the License Headers to + correctly reflect the use of LGPL-2.1+. + - other_license_headers_update.patch: Update the License Headers of files + that show GPL version 2.1, to correctly show version 2+. + + -- Andres Rodriguez Mon, 13 Dec 2010 13:00:46 -0500 + +pacemaker (1.0.9.1+hg15626-2ubuntu2) natty; urgency=low + + * Rebuild with python 2.7 as the python default. + + -- Matthias Klose Wed, 08 Dec 2010 15:08:00 +0000 + +pacemaker (1.0.9.1+hg15626-2ubuntu1) natty; urgency=low + + * Resync from Debian experimental. + * debian/patches: + - raexecupstart.patch: Utilize new upstart LRM plugin. + - fix_ftbfs_linker_as_needed.patch: Prevent FTBFS due to linker changes. + - fix_return_o2cb_ra.patch: Fix a return variale error in the o2cb RA. + * debian/pacemaker.postinst: Fix permissions on /var/lib/pengine. + * debian/control: + - Build Dependencies: Bump cluster-glue-dev; remove python-dev + - library -dev packages: Drop ${python:Depends}, ${shlibs:Dends}. Add + dependency to its corresponding binary packages. + - library packages: Drop depends on ${python:Depends}; Add missing + Sections. + - Tighten Conflicts/Replaces to Ubuntu related ones. + - pacemaker-dev: Change from ${source:Version} to ${binary:Version}. + - Rename libpe-{status,rules}-2 to libpe-{status,rules}2 respectively. + * debian/libpe-{status,rules}-2{-dev}.install: + - Rename to libpe-{status,rules}2{-dev}. + * debian/rules: dh_pycentral only for pacemaker and pacemaker-dev. + * debian/pacemaker.lintian-override: Removed. + + -- Andres Rodriguez Wed, 17 Nov 2010 16:40:23 -0500 + pacemaker (1.0.9.1+hg15626-2) experimental; urgency=low * Package split to better comply with Debian Policy (c. 8.1.) diff -Nru pacemaker-1.0.11/debian/control pacemaker-1.0.11/debian/control --- pacemaker-1.0.11/debian/control 2011-04-20 09:14:23.000000000 -0400 +++ pacemaker-1.0.11/debian/control 2011-05-25 13:32:38.000000000 -0400 @@ -1,9 +1,10 @@ Source: pacemaker Section: admin Priority: optional -Maintainer: Debian HA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian HA Maintainers Uploaders: Martin Loschwitz , Anibal Monsalve Salazar , Simon Horman , Frederik Schüler -Build-Depends: debhelper (>= 7), automake, autoconf, chrpath, libsnmp-dev, libglib2.0-dev, perl, net-tools, python, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, libbz2-dev, zlib1g-dev, libltdl3-dev, openssh-client, libgnutls-dev, python-central (>= 0.5), libpam0g-dev, libncurses5-dev, libcorosync-dev (>= 1.1.2), libheartbeat2-dev (>= 3.0), libxslt1-dev, libesmtp-dev, cluster-glue-dev, liblrm2-dev, libpils2-dev, libplumb2-dev, libplumbgpl2-dev, libstonith1-dev, help2man, libxml2-utils +Build-Depends: debhelper (>= 7), automake, autoconf, chrpath, libsnmp-dev, libglib2.0-dev, perl, net-tools, python, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, libbz2-dev, zlib1g-dev, libltdl3-dev, openssh-client, libgnutls-dev, python-central (>= 0.5), libpam0g-dev, libncurses5-dev, libcorosync-dev (>= 1.1.2), libheartbeat2-dev (>= 3.0), libxslt1-dev, libesmtp-dev, cluster-glue-dev (>= 1.0.7-3ubuntu1), liblrm2-dev, libpils2-dev, libplumb2-dev, libplumbgpl2-dev, libstonith1-dev, help2man, libxml2-utils Standards-Version: 3.9.1 Homepage: http://clusterlabs.org/ Vcs-Hg: http://hg.debian.org/hg/debian-ha/pacemaker @@ -31,7 +32,7 @@ Architecture: any Replaces: pacemaker-heartbeat-dev, pacemaker-openais-dev Conflicts: pacemaker-heartbeat-dev, pacemaker-openais-dev -Depends: ${shlibs:Depends}, ${misc:Depends}, pacemaker (>= ${binary:Version}), python, libcorosync-dev (>= 1.1.2+svn20091102), libheartbeat2-dev (>= 3.0) , libglib2.0-dev, libxml2-dev, libcluster-glue-dev, libcib1-dev (>= ${binary:Version}), libcrmcluster1-dev (>= ${binary:Version}), libcrmcommon2-dev (>= ${binary:Version}), libpe-rules2-dev (>= ${binary:Version}), libpe-status2-dev (>= ${binary:Version}), libpengine3-dev (>= ${binary:Version}), libstonithd0-dev (>= ${binary:Version}), libtransitioner1-dev (>= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, pacemaker (>= ${binary:Version}), python, libcorosync-dev (>= 1.1.2+svn20091102), libheartbeat2-dev (>= 3.0) , libglib2.0-dev, libxml2-dev, libcluster-glue-dev (>= 1.0.7-3ubuntu1), libcib1-dev (>= ${binary:Version}), libcrmcluster1-dev (>= ${binary:Version}), libcrmcommon2-dev (>= ${binary:Version}), libpe-rules2-dev (>= ${binary:Version}), libpe-status2-dev (>= ${binary:Version}), libpengine3-dev (>= ${binary:Version}), libstonithd0-dev (>= ${binary:Version}), libtransitioner1-dev (>= ${binary:Version}) XB-Python-Version: ${python:Versions} Description: HA cluster resource manager (development files) High-Availability cluster resource manager for Heartbeat. diff -Nru pacemaker-1.0.11/debian/pacemaker.postinst pacemaker-1.0.11/debian/pacemaker.postinst --- pacemaker-1.0.11/debian/pacemaker.postinst 2010-12-16 08:25:21.000000000 -0500 +++ pacemaker-1.0.11/debian/pacemaker.postinst 2011-05-25 13:32:38.000000000 -0400 @@ -32,6 +32,7 @@ chown hacluster $i chgrp haclient $i done + chmod 750 /var/lib/pengine ;; purge) diff -Nru pacemaker-1.0.11/debian/patches/fix_ftbfs_linker_as_needed.patch pacemaker-1.0.11/debian/patches/fix_ftbfs_linker_as_needed.patch --- pacemaker-1.0.11/debian/patches/fix_ftbfs_linker_as_needed.patch 1969-12-31 19:00:00.000000000 -0500 +++ pacemaker-1.0.11/debian/patches/fix_ftbfs_linker_as_needed.patch 2011-05-25 13:39:18.000000000 -0400 @@ -0,0 +1,13 @@ +Index: pacemaker-1.0.11/lib/pengine/Makefile.am +=================================================================== +--- pacemaker-1.0.11.orig/lib/pengine/Makefile.am 2011-05-25 13:38:39.134559229 -0400 ++++ pacemaker-1.0.11/lib/pengine/Makefile.am 2011-05-25 13:39:16.304613740 -0400 +@@ -32,7 +32,7 @@ + libpe_rules_la_LDFLAGS = -version-info 2:0:0 + libpe_rules_la_SOURCES = $(rule_files) + +-libpe_status_la_LDFLAGS = -version-info 2:0:0 ++libpe_status_la_LDFLAGS = -version-info 2:0:0 $(CURSESLIBS) + libpe_status_la_SOURCES = $(rule_files) $(status_files) + libpe_status_la_LIBADD = -llrm + diff -Nru pacemaker-1.0.11/debian/patches/fix_return_o2cb_ra.patch pacemaker-1.0.11/debian/patches/fix_return_o2cb_ra.patch --- pacemaker-1.0.11/debian/patches/fix_return_o2cb_ra.patch 1969-12-31 19:00:00.000000000 -0500 +++ pacemaker-1.0.11/debian/patches/fix_return_o2cb_ra.patch 2011-05-25 13:39:08.000000000 -0400 @@ -0,0 +1,24 @@ +Description: Fix return variable and change non-existent killproc command + Fixes to correctly return the variable value. Additionally, uses killall command + instead of the non-existent killproc, which is Suse specific. +Author: Andres Rodriguez +Last-Update: 2010-03-01 + +Index: pacemaker-1.0.11/extra/resources/o2cb +=================================================================== +--- pacemaker-1.0.11.orig/extra/resources/o2cb 2011-05-25 13:38:39.164559266 -0400 ++++ pacemaker-1.0.11/extra/resources/o2cb 2011-05-25 13:39:05.474597861 -0400 +@@ -162,11 +162,11 @@ + { + status_daemon; rc=$? + if [ $rc != $OCF_SUCCESS ]; then +- return rc ++ return $rc + fi + + ocf_log info "Stopping `basename "$DAEMON"`" +- killproc "$DAEMON" ++ killall "$DAEMON" + + while [ $rc = $OCF_NOT_RUNNING ]; do + sleep 1 diff -Nru pacemaker-1.0.11/debian/patches/lib_license_headers_update.patch pacemaker-1.0.11/debian/patches/lib_license_headers_update.patch --- pacemaker-1.0.11/debian/patches/lib_license_headers_update.patch 1969-12-31 19:00:00.000000000 -0500 +++ pacemaker-1.0.11/debian/patches/lib_license_headers_update.patch 2011-05-25 13:39:39.000000000 -0400 @@ -0,0 +1,1162 @@ +Description: Update license headers + Update headers to correctly show the use of the LGPL-2.1+ license + instead of incorrectly using GPL 2.1+ +Forwarded: http://hg.clusterlabs.org/pacemaker/1.1/rev/0bc69fcea1d7 +Author: Andres Rodriguez + +Index: pacemaker-1.0.11/lib/ais/ipc_bridge.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/ais/ipc_bridge.c 2011-05-25 13:38:37.884557390 -0400 ++++ pacemaker-1.0.11/lib/ais/ipc_bridge.c 2011-05-25 13:39:36.794643793 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include + #include +Index: pacemaker-1.0.11/lib/ais/plugin.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/ais/plugin.c 2011-05-25 13:38:37.924557448 -0400 ++++ pacemaker-1.0.11/lib/ais/plugin.c 2011-05-25 13:39:36.794643793 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USAA + */ + + #include +Index: pacemaker-1.0.11/lib/ais/plugin.h +=================================================================== +--- pacemaker-1.0.11.orig/lib/ais/plugin.h 2011-05-25 13:38:37.904557424 -0400 ++++ pacemaker-1.0.11/lib/ais/plugin.h 2011-05-25 13:39:36.794643793 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #ifndef AIS_CRM_PLUGIN__H +Index: pacemaker-1.0.11/lib/ais/utils.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/ais/utils.c 2011-05-25 13:38:37.914557434 -0400 ++++ pacemaker-1.0.11/lib/ais/utils.c 2011-05-25 13:39:36.794643793 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/ais/utils.h +=================================================================== +--- pacemaker-1.0.11.orig/lib/ais/utils.h 2011-05-25 13:38:37.894557404 -0400 ++++ pacemaker-1.0.11/lib/ais/utils.h 2011-05-25 13:39:36.794643793 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #ifndef AIS_CRM_UTILS__H +Index: pacemaker-1.0.11/lib/cib/cib_attrs.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/cib/cib_attrs.c 2011-05-25 13:38:37.724557160 -0400 ++++ pacemaker-1.0.11/lib/cib/cib_attrs.c 2011-05-25 13:39:36.794643793 -0400 +@@ -2,19 +2,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/cib/cib_client.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/cib/cib_client.c 2011-05-25 13:38:37.754557204 -0400 ++++ pacemaker-1.0.11/lib/cib/cib_client.c 2011-05-25 13:39:36.794643793 -0400 +@@ -13,7 +13,7 @@ + * + * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + #include +Index: pacemaker-1.0.11/lib/cib/cib_file.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/cib/cib_file.c 2011-05-25 13:38:37.744557184 -0400 ++++ pacemaker-1.0.11/lib/cib/cib_file.c 2011-05-25 13:39:36.794643793 -0400 +@@ -13,7 +13,7 @@ + * + * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + #include +Index: pacemaker-1.0.11/lib/cib/cib_native.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/cib/cib_native.c 2011-05-25 13:38:37.744557184 -0400 ++++ pacemaker-1.0.11/lib/cib/cib_native.c 2011-05-25 13:39:36.794643793 -0400 +@@ -13,7 +13,7 @@ + * + * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + #include +Index: pacemaker-1.0.11/lib/cib/cib_ops.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/cib/cib_ops.c 2011-05-25 13:38:37.714557140 -0400 ++++ pacemaker-1.0.11/lib/cib/cib_ops.c 2011-05-25 13:39:36.794643793 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/cib/cib_private.h +=================================================================== +--- pacemaker-1.0.11.orig/lib/cib/cib_private.h 2011-05-25 13:38:37.774557228 -0400 ++++ pacemaker-1.0.11/lib/cib/cib_private.h 2011-05-25 13:39:36.794643793 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CIB_PRIVATE__H + #define CIB_PRIVATE__H +Index: pacemaker-1.0.11/lib/cib/cib_remote.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/cib/cib_remote.c 2011-05-25 13:38:37.704557126 -0400 ++++ pacemaker-1.0.11/lib/cib/cib_remote.c 2011-05-25 13:39:36.794643793 -0400 +@@ -13,7 +13,7 @@ + * + * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + #include +Index: pacemaker-1.0.11/lib/cib/cib_utils.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/cib/cib_utils.c 2011-05-25 13:38:37.764557214 -0400 ++++ pacemaker-1.0.11/lib/cib/cib_utils.c 2011-05-25 13:39:36.794643793 -0400 +@@ -13,7 +13,7 @@ + * + * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + #include +Index: pacemaker-1.0.11/lib/cib/cib_version.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/cib/cib_version.c 2011-05-25 13:38:37.734557170 -0400 ++++ pacemaker-1.0.11/lib/cib/cib_version.c 2011-05-25 13:39:36.794643793 -0400 +@@ -2,19 +2,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/common/ais.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/common/ais.c 2011-05-25 13:38:37.854557346 -0400 ++++ pacemaker-1.0.11/lib/common/ais.c 2011-05-25 13:39:36.794643793 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/common/cluster.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/common/cluster.c 2011-05-25 13:38:37.864557360 -0400 ++++ pacemaker-1.0.11/lib/common/cluster.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/common/heartbeat.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/common/heartbeat.c 2011-05-25 13:38:37.824557302 -0400 ++++ pacemaker-1.0.11/lib/common/heartbeat.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/common/ipc.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/common/ipc.c 2011-05-25 13:38:37.804557272 -0400 ++++ pacemaker-1.0.11/lib/common/ipc.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/common/iso8601.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/common/iso8601.c 2011-05-25 13:38:37.784557248 -0400 ++++ pacemaker-1.0.11/lib/common/iso8601.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2005 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + /* +Index: pacemaker-1.0.11/lib/common/iso8601_fields.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/common/iso8601_fields.c 2011-05-25 13:38:37.784557248 -0400 ++++ pacemaker-1.0.11/lib/common/iso8601_fields.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2005 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + /* +Index: pacemaker-1.0.11/lib/common/mainloop.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/common/mainloop.c 2011-05-25 13:38:37.874557380 -0400 ++++ pacemaker-1.0.11/lib/common/mainloop.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/common/membership.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/common/membership.c 2011-05-25 13:38:37.794557258 -0400 ++++ pacemaker-1.0.11/lib/common/membership.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include + +Index: pacemaker-1.0.11/lib/common/remote.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/common/remote.c 2011-05-25 13:38:37.874557380 -0400 ++++ pacemaker-1.0.11/lib/common/remote.c 2011-05-25 13:39:36.804643807 -0400 +@@ -13,7 +13,7 @@ + * + * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + #include +Index: pacemaker-1.0.11/lib/common/stack.h +=================================================================== +--- pacemaker-1.0.11.orig/lib/common/stack.h 2011-05-25 13:38:37.814557292 -0400 ++++ pacemaker-1.0.11/lib/common/stack.h 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #ifndef CRM_STACK__H +Index: pacemaker-1.0.11/lib/common/utils.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/common/utils.c 2011-05-25 13:38:37.844557336 -0400 ++++ pacemaker-1.0.11/lib/common/utils.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/common/xml.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/common/xml.c 2011-05-25 13:38:37.814557292 -0400 ++++ pacemaker-1.0.11/lib/common/xml.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/pengine/clone.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/pengine/clone.c 2011-05-25 13:38:38.024557600 -0400 ++++ pacemaker-1.0.11/lib/pengine/clone.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/pengine/common.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/pengine/common.c 2011-05-25 13:38:38.004557566 -0400 ++++ pacemaker-1.0.11/lib/pengine/common.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include + #include +Index: pacemaker-1.0.11/lib/pengine/complex.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/pengine/complex.c 2011-05-25 13:38:37.954557492 -0400 ++++ pacemaker-1.0.11/lib/pengine/complex.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/pengine/group.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/pengine/group.c 2011-05-25 13:38:38.014557580 -0400 ++++ pacemaker-1.0.11/lib/pengine/group.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/pengine/native.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/pengine/native.c 2011-05-25 13:38:37.964557512 -0400 ++++ pacemaker-1.0.11/lib/pengine/native.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/pengine/rules.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/pengine/rules.c 2011-05-25 13:38:37.944557478 -0400 ++++ pacemaker-1.0.11/lib/pengine/rules.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/pengine/status.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/pengine/status.c 2011-05-25 13:38:37.944557478 -0400 ++++ pacemaker-1.0.11/lib/pengine/status.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/pengine/unpack.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/pengine/unpack.c 2011-05-25 13:38:38.034557610 -0400 ++++ pacemaker-1.0.11/lib/pengine/unpack.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include + +Index: pacemaker-1.0.11/lib/pengine/unpack.h +=================================================================== +--- pacemaker-1.0.11.orig/lib/pengine/unpack.h 2011-05-25 13:38:37.994557556 -0400 ++++ pacemaker-1.0.11/lib/pengine/unpack.h 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef PENGINE_UNPACK__H + #define PENGINE_UNPACK__H +Index: pacemaker-1.0.11/lib/pengine/utils.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/pengine/utils.c 2011-05-25 13:38:37.984557536 -0400 ++++ pacemaker-1.0.11/lib/pengine/utils.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include + #include +Index: pacemaker-1.0.11/lib/pengine/utils.h +=================================================================== +--- pacemaker-1.0.11.orig/lib/pengine/utils.h 2011-05-25 13:38:37.974557522 -0400 ++++ pacemaker-1.0.11/lib/pengine/utils.h 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef PE_UTILS__H + #define PE_UTILS__H +Index: pacemaker-1.0.11/lib/pengine/variant.h +=================================================================== +--- pacemaker-1.0.11.orig/lib/pengine/variant.h 2011-05-25 13:38:37.974557522 -0400 ++++ pacemaker-1.0.11/lib/pengine/variant.h 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef PE_VARIANT__H + #define PE_VARIANT__H +Index: pacemaker-1.0.11/lib/transition/graph.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/transition/graph.c 2011-05-25 13:38:38.034557610 -0400 ++++ pacemaker-1.0.11/lib/transition/graph.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/transition/unpack.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/transition/unpack.c 2011-05-25 13:38:38.054557644 -0400 ++++ pacemaker-1.0.11/lib/transition/unpack.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/transition/utils.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/transition/utils.c 2011-05-25 13:38:38.044557624 -0400 ++++ pacemaker-1.0.11/lib/transition/utils.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/lib/plugins/lrm/raexecstonith.c +=================================================================== +--- pacemaker-1.0.11.orig/lib/plugins/lrm/raexecstonith.c 2011-05-25 13:38:37.934557468 -0400 ++++ pacemaker-1.0.11/lib/plugins/lrm/raexecstonith.c 2011-05-25 13:39:36.804643807 -0400 +@@ -1,17 +1,17 @@ + /* +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * 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.1 of the License, or (at your option) any later version. + * +- * This software 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. ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public ++ * 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USAA + * + * File: raexecocf.c + * Author: Sun Jiang Dong diff -Nru pacemaker-1.0.11/debian/patches/other_license_headers_update.patch pacemaker-1.0.11/debian/patches/other_license_headers_update.patch --- pacemaker-1.0.11/debian/patches/other_license_headers_update.patch 1969-12-31 19:00:00.000000000 -0500 +++ pacemaker-1.0.11/debian/patches/other_license_headers_update.patch 2011-05-25 13:39:29.000000000 -0400 @@ -0,0 +1,2731 @@ +Description: Update license headers + Update headers to correctly show the version intended for GPL 2+, + as well as the correct address. +Forwarded: http://hg.clusterlabs.org/pacemaker/1.1/rev/0bc69fcea1d7 +Author: Andres Rodriguez + +Index: pacemaker-1.0.11/cib/callbacks.c +=================================================================== +--- pacemaker-1.0.11.orig/cib/callbacks.c 2011-05-25 13:38:38.124557742 -0400 ++++ pacemaker-1.0.11/cib/callbacks.c 2011-05-25 13:39:25.074626608 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/cib/callbacks.h +=================================================================== +--- pacemaker-1.0.11.orig/cib/callbacks.h 2011-05-25 13:38:38.154557786 -0400 ++++ pacemaker-1.0.11/cib/callbacks.h 2011-05-25 13:39:25.074626608 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/cib/cibio.h +=================================================================== +--- pacemaker-1.0.11.orig/cib/cibio.h 2011-05-25 13:38:38.184557829 -0400 ++++ pacemaker-1.0.11/cib/cibio.h 2011-05-25 13:39:25.074626608 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #ifndef CIB_IO__H +Index: pacemaker-1.0.11/cib/cibmessages.h +=================================================================== +--- pacemaker-1.0.11.orig/cib/cibmessages.h 2011-05-25 13:38:38.184557829 -0400 ++++ pacemaker-1.0.11/cib/cibmessages.h 2011-05-25 13:39:25.074626608 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CIB_MESSAGES__H + #define CIB_MESSAGES__H +Index: pacemaker-1.0.11/cib/cibmon.c +=================================================================== +--- pacemaker-1.0.11.orig/cib/cibmon.c 2011-05-25 13:38:38.094557698 -0400 ++++ pacemaker-1.0.11/cib/cibmon.c 2011-05-25 13:39:25.074626608 -0400 +@@ -5,7 +5,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/cib/cibpipe.c +=================================================================== +--- pacemaker-1.0.11.orig/cib/cibpipe.c 2011-05-25 13:38:38.204557864 -0400 ++++ pacemaker-1.0.11/cib/cibpipe.c 2011-05-25 13:39:25.074626608 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/cib/common.c +=================================================================== +--- pacemaker-1.0.11.orig/cib/common.c 2011-05-25 13:38:38.144557772 -0400 ++++ pacemaker-1.0.11/cib/common.c 2011-05-25 13:39:25.074626608 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/cib/common.h +=================================================================== +--- pacemaker-1.0.11.orig/cib/common.h 2011-05-25 13:38:38.164557803 -0400 ++++ pacemaker-1.0.11/cib/common.h 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include "../lib/cib/cib_private.h" +Index: pacemaker-1.0.11/cib/io.c +=================================================================== +--- pacemaker-1.0.11.orig/cib/io.c 2011-05-25 13:38:38.154557786 -0400 ++++ pacemaker-1.0.11/cib/io.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/cib/main.c +=================================================================== +--- pacemaker-1.0.11.orig/cib/main.c 2011-05-25 13:38:38.134557762 -0400 ++++ pacemaker-1.0.11/cib/main.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/cib/messages.c +=================================================================== +--- pacemaker-1.0.11.orig/cib/messages.c 2011-05-25 13:38:38.104557712 -0400 ++++ pacemaker-1.0.11/cib/messages.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/cib/notify.c +=================================================================== +--- pacemaker-1.0.11.orig/cib/notify.c 2011-05-25 13:38:38.104557712 -0400 ++++ pacemaker-1.0.11/cib/notify.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/cib/notify.h +=================================================================== +--- pacemaker-1.0.11.orig/cib/notify.h 2011-05-25 13:38:38.114557732 -0400 ++++ pacemaker-1.0.11/cib/notify.h 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/cib/remote.c +=================================================================== +--- pacemaker-1.0.11.orig/cib/remote.c 2011-05-25 13:38:38.174557821 -0400 ++++ pacemaker-1.0.11/cib/remote.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/atest.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/atest.c 2011-05-25 13:38:38.724558620 -0400 ++++ pacemaker-1.0.11/crmd/atest.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/callbacks.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/callbacks.c 2011-05-25 13:38:38.654558522 -0400 ++++ pacemaker-1.0.11/crmd/callbacks.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/ccm.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/ccm.c 2011-05-25 13:38:38.754558666 -0400 ++++ pacemaker-1.0.11/crmd/ccm.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + /* put these first so that uuid_t is defined without conflicts */ +Index: pacemaker-1.0.11/crmd/cib.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/cib.c 2011-05-25 13:38:38.624558481 -0400 ++++ pacemaker-1.0.11/crmd/cib.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/control.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/control.c 2011-05-25 13:38:38.584558413 -0400 ++++ pacemaker-1.0.11/crmd/control.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/crmd.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/crmd.c 2011-05-25 13:38:38.744558657 -0400 ++++ pacemaker-1.0.11/crmd/crmd.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,5 +13,5 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +Index: pacemaker-1.0.11/crmd/crmd.h +=================================================================== +--- pacemaker-1.0.11.orig/crmd/crmd.h 2011-05-25 13:38:38.554558374 -0400 ++++ pacemaker-1.0.11/crmd/crmd.h 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CRMD__H + #define CRMD__H +Index: pacemaker-1.0.11/crmd/crmd_callbacks.h +=================================================================== +--- pacemaker-1.0.11.orig/crmd/crmd_callbacks.h 2011-05-25 13:38:38.774558694 -0400 ++++ pacemaker-1.0.11/crmd/crmd_callbacks.h 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/crmd_fsa.h +=================================================================== +--- pacemaker-1.0.11.orig/crmd/crmd_fsa.h 2011-05-25 13:38:38.794558722 -0400 ++++ pacemaker-1.0.11/crmd/crmd_fsa.h 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CRMD_FSA__H + #define CRMD_FSA__H +Index: pacemaker-1.0.11/crmd/crmd_lrm.h +=================================================================== +--- pacemaker-1.0.11.orig/crmd/crmd_lrm.h 2011-05-25 13:38:38.644558505 -0400 ++++ pacemaker-1.0.11/crmd/crmd_lrm.h 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + extern void free_lrm_op(lrm_op_t *op); +Index: pacemaker-1.0.11/crmd/crmd_messages.h +=================================================================== +--- pacemaker-1.0.11.orig/crmd/crmd_messages.h 2011-05-25 13:38:38.564558384 -0400 ++++ pacemaker-1.0.11/crmd/crmd_messages.h 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef XML_CRM_MESSAGES__H + #define XML_CRM_MESSAGES__H +Index: pacemaker-1.0.11/crmd/crmd_utils.h +=================================================================== +--- pacemaker-1.0.11.orig/crmd/crmd_utils.h 2011-05-25 13:38:38.564558384 -0400 ++++ pacemaker-1.0.11/crmd/crmd_utils.h 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CRMD_UTILS__H + #define CRMD_UTILS__H +Index: pacemaker-1.0.11/crmd/election.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/election.c 2011-05-25 13:38:38.574558403 -0400 ++++ pacemaker-1.0.11/crmd/election.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include + +Index: pacemaker-1.0.11/crmd/fsa.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/fsa.c 2011-05-25 13:38:38.714558612 -0400 ++++ pacemaker-1.0.11/crmd/fsa.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/fsa_defines.h +=================================================================== +--- pacemaker-1.0.11.orig/crmd/fsa_defines.h 2011-05-25 13:38:38.644558505 -0400 ++++ pacemaker-1.0.11/crmd/fsa_defines.h 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef FSA_DEFINES__H + #define FSA_DEFINES__H +Index: pacemaker-1.0.11/crmd/fsa_matrix.h +=================================================================== +--- pacemaker-1.0.11.orig/crmd/fsa_matrix.h 2011-05-25 13:38:38.534558345 -0400 ++++ pacemaker-1.0.11/crmd/fsa_matrix.h 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #ifndef XML_FSA_MATRIX__H +Index: pacemaker-1.0.11/crmd/fsa_proto.h +=================================================================== +--- pacemaker-1.0.11.orig/crmd/fsa_proto.h 2011-05-25 13:38:38.784558713 -0400 ++++ pacemaker-1.0.11/crmd/fsa_proto.h 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #ifndef XML_FSA_PROTO__H +Index: pacemaker-1.0.11/crmd/join_client.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/join_client.c 2011-05-25 13:38:38.684558569 -0400 ++++ pacemaker-1.0.11/crmd/join_client.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include + +Index: pacemaker-1.0.11/crmd/join_dc.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/join_dc.c 2011-05-25 13:38:38.544558355 -0400 ++++ pacemaker-1.0.11/crmd/join_dc.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include + +Index: pacemaker-1.0.11/crmd/lrm.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/lrm.c 2011-05-25 13:38:38.764558685 -0400 ++++ pacemaker-1.0.11/crmd/lrm.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/main.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/main.c 2011-05-25 13:38:38.664558534 -0400 ++++ pacemaker-1.0.11/crmd/main.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/make_dot.pl +=================================================================== +--- pacemaker-1.0.11.orig/crmd/make_dot.pl 2011-05-25 13:38:38.774558694 -0400 ++++ pacemaker-1.0.11/crmd/make_dot.pl 2011-05-25 13:39:25.084626618 -0400 +@@ -5,7 +5,7 @@ + # 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.1 of the License, or (at your option) any later version. ++ # version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + # + # You should have received a copy of the GNU 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 ++ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + # generates a transition graph based on the crmd_fsa_state array in +Index: pacemaker-1.0.11/crmd/messages.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/messages.c 2011-05-25 13:38:38.614558461 -0400 ++++ pacemaker-1.0.11/crmd/messages.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/misc.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/misc.c 2011-05-25 13:38:38.694558577 -0400 ++++ pacemaker-1.0.11/crmd/misc.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include + +Index: pacemaker-1.0.11/crmd/pengine.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/pengine.c 2011-05-25 13:38:38.704558594 -0400 ++++ pacemaker-1.0.11/crmd/pengine.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/subsystems.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/subsystems.c 2011-05-25 13:38:38.604558442 -0400 ++++ pacemaker-1.0.11/crmd/subsystems.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/te_actions.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/te_actions.c 2011-05-25 13:38:38.594558432 -0400 ++++ pacemaker-1.0.11/crmd/te_actions.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/te_callbacks.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/te_callbacks.c 2011-05-25 13:38:38.634558491 -0400 ++++ pacemaker-1.0.11/crmd/te_callbacks.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/te_callbacks.h +=================================================================== +--- pacemaker-1.0.11.orig/crmd/te_callbacks.h 2011-05-25 13:38:38.604558442 -0400 ++++ pacemaker-1.0.11/crmd/te_callbacks.h 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef TE_CALLBACKS__H + #define TE_CALLBACKS__H +Index: pacemaker-1.0.11/crmd/te_events.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/te_events.c 2011-05-25 13:38:38.804558740 -0400 ++++ pacemaker-1.0.11/crmd/te_events.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/te_utils.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/te_utils.c 2011-05-25 13:38:38.674558551 -0400 ++++ pacemaker-1.0.11/crmd/te_utils.c 2011-05-25 13:39:25.084626618 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/tengine.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/tengine.c 2011-05-25 13:38:38.724558620 -0400 ++++ pacemaker-1.0.11/crmd/tengine.c 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/crmd/tengine.h +=================================================================== +--- pacemaker-1.0.11.orig/crmd/tengine.h 2011-05-25 13:38:38.734558638 -0400 ++++ pacemaker-1.0.11/crmd/tengine.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef TENGINE__H + #define TENGINE__H +Index: pacemaker-1.0.11/crmd/utils.c +=================================================================== +--- pacemaker-1.0.11.orig/crmd/utils.c 2011-05-25 13:38:38.684558569 -0400 ++++ pacemaker-1.0.11/crmd/utils.c 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/fencing/stonithd/stonithd.c +=================================================================== +--- pacemaker-1.0.11.orig/fencing/stonithd/stonithd.c 2011-05-25 13:38:38.244557918 -0400 ++++ pacemaker-1.0.11/fencing/stonithd/stonithd.c 2011-05-25 13:39:25.094626632 -0400 +@@ -8,7 +8,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -17,7 +17,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + /* Todo: + * 1. Change to a obvious DFA? +Index: pacemaker-1.0.11/fencing/test/apitest.c +=================================================================== +--- pacemaker-1.0.11.orig/fencing/test/apitest.c 2011-05-25 13:38:38.224557890 -0400 ++++ pacemaker-1.0.11/fencing/test/apitest.c 2011-05-25 13:39:25.094626632 -0400 +@@ -7,14 +7,14 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * This software 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 library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/fencing/test/stonithd_test.sh +=================================================================== +--- pacemaker-1.0.11.orig/fencing/test/stonithd_test.sh 2011-05-25 13:38:38.234557909 -0400 ++++ pacemaker-1.0.11/fencing/test/stonithd_test.sh 2011-05-25 13:39:25.094626632 -0400 +@@ -9,7 +9,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -18,7 +18,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + # The requirement for the running environment is + # a) NODE1 and NODE2 can access each other via ssh without password authentication. +Index: pacemaker-1.0.11/include/crm/ais.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/ais.h 2011-05-25 13:38:38.474558258 -0400 ++++ pacemaker-1.0.11/include/crm/ais.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #ifndef CRM_AIS__H +Index: pacemaker-1.0.11/include/crm/cib.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/cib.h 2011-05-25 13:38:38.514558316 -0400 ++++ pacemaker-1.0.11/include/crm/cib.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CIB__H + #define CIB__H +Index: pacemaker-1.0.11/include/crm/cib_ops.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/cib_ops.h 2011-05-25 13:38:38.464558239 -0400 ++++ pacemaker-1.0.11/include/crm/cib_ops.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CIB_OPS__H + #define CIB_OPS__H +Index: pacemaker-1.0.11/include/crm/cib_util.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/cib_util.h 2011-05-25 13:38:38.394558142 -0400 ++++ pacemaker-1.0.11/include/crm/cib_util.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CIB_UTIL__H + #define CIB_UTIL__H +Index: pacemaker-1.0.11/include/crm/common/cluster.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/common/cluster.h 2011-05-25 13:38:38.414558171 -0400 ++++ pacemaker-1.0.11/include/crm/common/cluster.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CRM_COMMON_CLUSTER__H + #define CRM_COMMON_CLUSTER__H +Index: pacemaker-1.0.11/include/crm/common/ipc.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/common/ipc.h 2011-05-25 13:38:38.444558210 -0400 ++++ pacemaker-1.0.11/include/crm/common/ipc.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CRM_COMMON_IPC__H + #define CRM_COMMON_IPC__H +Index: pacemaker-1.0.11/include/crm/common/iso8601.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/common/iso8601.h 2011-05-25 13:38:38.424558181 -0400 ++++ pacemaker-1.0.11/include/crm/common/iso8601.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + /* +Index: pacemaker-1.0.11/include/crm/common/mainloop.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/common/mainloop.h 2011-05-25 13:38:38.434558200 -0400 ++++ pacemaker-1.0.11/include/crm/common/mainloop.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CRM_COMMON_MAINLOOP__H + #define CRM_COMMON_MAINLOOP__H +Index: pacemaker-1.0.11/include/crm/common/msg.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/common/msg.h 2011-05-25 13:38:38.434558200 -0400 ++++ pacemaker-1.0.11/include/crm/common/msg.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CRM_COMMON_MSG__H + #define CRM_COMMON_MSG__H +Index: pacemaker-1.0.11/include/crm/common/util.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/common/util.h 2011-05-25 13:38:38.454558229 -0400 ++++ pacemaker-1.0.11/include/crm/common/util.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CRM_COMMON_UTIL__H + #define CRM_COMMON_UTIL__H +Index: pacemaker-1.0.11/include/crm/common/xml.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/common/xml.h 2011-05-25 13:38:38.404558152 -0400 ++++ pacemaker-1.0.11/include/crm/common/xml.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CRM_COMMON_XML__H + #define CRM_COMMON_XML__H +Index: pacemaker-1.0.11/include/crm/crm.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/crm.h 2011-05-25 13:38:38.394558142 -0400 ++++ pacemaker-1.0.11/include/crm/crm.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CRM__H + #define CRM__H +Index: pacemaker-1.0.11/include/crm/msg_xml.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/msg_xml.h 2011-05-25 13:38:38.524558326 -0400 ++++ pacemaker-1.0.11/include/crm/msg_xml.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef XML_TAGS__H + #define XML_TAGS__H +Index: pacemaker-1.0.11/include/crm/pengine/common.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/pengine/common.h 2011-05-25 13:38:38.504558297 -0400 ++++ pacemaker-1.0.11/include/crm/pengine/common.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef PE_COMMON__H + #define PE_COMMON__H +Index: pacemaker-1.0.11/include/crm/pengine/complex.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/pengine/complex.h 2011-05-25 13:38:38.494558287 -0400 ++++ pacemaker-1.0.11/include/crm/pengine/complex.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef PENGINE_COMPLEX__H + #define PENGINE_COMPLEX__H +Index: pacemaker-1.0.11/include/crm/pengine/rules.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/pengine/rules.h 2011-05-25 13:38:38.484558268 -0400 ++++ pacemaker-1.0.11/include/crm/pengine/rules.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef PENGINE_RULES__H + #define PENGINE_RULES__H +Index: pacemaker-1.0.11/include/crm/pengine/status.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/pengine/status.h 2011-05-25 13:38:38.514558316 -0400 ++++ pacemaker-1.0.11/include/crm/pengine/status.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef PENGINE_STATUS__H + #define PENGINE_STATUS__H +Index: pacemaker-1.0.11/include/crm/transition.h +=================================================================== +--- pacemaker-1.0.11.orig/include/crm/transition.h 2011-05-25 13:38:38.474558258 -0400 ++++ pacemaker-1.0.11/include/crm/transition.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/pengine/allocate.c +=================================================================== +--- pacemaker-1.0.11.orig/pengine/allocate.c 2011-05-25 13:38:38.834558787 -0400 ++++ pacemaker-1.0.11/pengine/allocate.c 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/pengine/allocate.h +=================================================================== +--- pacemaker-1.0.11.orig/pengine/allocate.h 2011-05-25 13:38:38.924558919 -0400 ++++ pacemaker-1.0.11/pengine/allocate.h 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef CRM_PENGINE_COMPLEX_ALLOC__H + #define CRM_PENGINE_COMPLEX_ALLOC__H +Index: pacemaker-1.0.11/pengine/clone.c +=================================================================== +--- pacemaker-1.0.11.orig/pengine/clone.c 2011-05-25 13:38:38.944558948 -0400 ++++ pacemaker-1.0.11/pengine/clone.c 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/pengine/constraints.c +=================================================================== +--- pacemaker-1.0.11.orig/pengine/constraints.c 2011-05-25 13:38:38.874558842 -0400 ++++ pacemaker-1.0.11/pengine/constraints.c 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/pengine/fix_xml.pl +=================================================================== +--- pacemaker-1.0.11.orig/pengine/fix_xml.pl 2011-05-25 13:38:38.834558787 -0400 ++++ pacemaker-1.0.11/pengine/fix_xml.pl 2011-05-25 13:39:25.094626632 -0400 +@@ -5,7 +5,7 @@ + # 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.1 of the License, or (at your option) any later version. ++ # version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + # + # You should have received a copy of the GNU 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 ++ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + my $filename=@ARGV[0]; +Index: pacemaker-1.0.11/pengine/graph.c +=================================================================== +--- pacemaker-1.0.11.orig/pengine/graph.c 2011-05-25 13:38:38.844558796 -0400 ++++ pacemaker-1.0.11/pengine/graph.c 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/pengine/group.c +=================================================================== +--- pacemaker-1.0.11.orig/pengine/group.c 2011-05-25 13:38:38.934558929 -0400 ++++ pacemaker-1.0.11/pengine/group.c 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/pengine/main.c +=================================================================== +--- pacemaker-1.0.11.orig/pengine/main.c 2011-05-25 13:38:38.884558861 -0400 ++++ pacemaker-1.0.11/pengine/main.c 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/pengine/master.c +=================================================================== +--- pacemaker-1.0.11.orig/pengine/master.c 2011-05-25 13:38:38.824558768 -0400 ++++ pacemaker-1.0.11/pengine/master.c 2011-05-25 13:39:25.094626632 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/pengine/native.c +=================================================================== +--- pacemaker-1.0.11.orig/pengine/native.c 2011-05-25 13:38:38.864558824 -0400 ++++ pacemaker-1.0.11/pengine/native.c 2011-05-25 13:39:25.104626652 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/pengine/pengine.c +=================================================================== +--- pacemaker-1.0.11.orig/pengine/pengine.c 2011-05-25 13:38:38.914558900 -0400 ++++ pacemaker-1.0.11/pengine/pengine.c 2011-05-25 13:39:25.104626652 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/pengine/pengine.h +=================================================================== +--- pacemaker-1.0.11.orig/pengine/pengine.h 2011-05-25 13:38:38.954558958 -0400 ++++ pacemaker-1.0.11/pengine/pengine.h 2011-05-25 13:39:25.104626652 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef PENGINE__H + #define PENGINE__H +Index: pacemaker-1.0.11/pengine/ptest.c +=================================================================== +--- pacemaker-1.0.11.orig/pengine/ptest.c 2011-05-25 13:38:38.904558890 -0400 ++++ pacemaker-1.0.11/pengine/ptest.c 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/pengine/regression.core.sh +=================================================================== +--- pacemaker-1.0.11.orig/pengine/regression.core.sh 2011-05-25 13:38:38.894558871 -0400 ++++ pacemaker-1.0.11/pengine/regression.core.sh 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++ # version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + verbose=0 +Index: pacemaker-1.0.11/pengine/regression.sh +=================================================================== +--- pacemaker-1.0.11.orig/pengine/regression.sh 2011-05-25 13:38:38.814558759 -0400 ++++ pacemaker-1.0.11/pengine/regression.sh 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + # 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.1 of the License, or (at your option) any later version. ++ # version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + # + # You should have received a copy of the GNU 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 ++ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + core=`dirname $0` +Index: pacemaker-1.0.11/pengine/regression06.sh +=================================================================== +--- pacemaker-1.0.11.orig/pengine/regression06.sh 2011-05-25 13:38:38.854558815 -0400 ++++ pacemaker-1.0.11/pengine/regression06.sh 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + # 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.1 of the License, or (at your option) any later version. ++ # version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + # + # You should have received a copy of the GNU 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 ++ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + if [ -x /usr/bin/valgrind ]; then + export G_SLICE=always-malloc +Index: pacemaker-1.0.11/pengine/stonith.sh +=================================================================== +--- pacemaker-1.0.11.orig/pengine/stonith.sh 2011-05-25 13:38:38.944558948 -0400 ++++ pacemaker-1.0.11/pengine/stonith.sh 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + # 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.1 of the License, or (at your option) any later version. ++ # version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + # + # You should have received a copy of the GNU 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 ++ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + . regression.core.sh +Index: pacemaker-1.0.11/pengine/utils.c +=================================================================== +--- pacemaker-1.0.11.orig/pengine/utils.c 2011-05-25 13:38:38.904558890 -0400 ++++ pacemaker-1.0.11/pengine/utils.c 2011-05-25 13:39:25.104626652 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/pengine/utils.h +=================================================================== +--- pacemaker-1.0.11.orig/pengine/utils.h 2011-05-25 13:38:38.874558842 -0400 ++++ pacemaker-1.0.11/pengine/utils.h 2011-05-25 13:39:25.104626652 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef PENGINE_AUTILS__H + #define PENGINE_AUTILS__H +Index: pacemaker-1.0.11/shell/modules/cache.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/cache.py 2011-05-25 13:38:39.044559094 -0400 ++++ pacemaker-1.0.11/shell/modules/cache.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + import time +Index: pacemaker-1.0.11/shell/modules/cibconfig.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/cibconfig.py 2011-05-25 13:38:39.044559094 -0400 ++++ pacemaker-1.0.11/shell/modules/cibconfig.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + import sys +Index: pacemaker-1.0.11/shell/modules/cibstatus.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/cibstatus.py 2011-05-25 13:38:39.024559063 -0400 ++++ pacemaker-1.0.11/shell/modules/cibstatus.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + import sys +Index: pacemaker-1.0.11/shell/modules/clidisplay.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/clidisplay.py 2011-05-25 13:38:39.034559077 -0400 ++++ pacemaker-1.0.11/shell/modules/clidisplay.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + from singletonmixin import Singleton +Index: pacemaker-1.0.11/shell/modules/cliformat.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/cliformat.py 2011-05-25 13:38:38.994559014 -0400 ++++ pacemaker-1.0.11/shell/modules/cliformat.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + from vars import Vars +Index: pacemaker-1.0.11/shell/modules/idmgmt.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/idmgmt.py 2011-05-25 13:38:39.004559033 -0400 ++++ pacemaker-1.0.11/shell/modules/idmgmt.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + from vars import Vars +Index: pacemaker-1.0.11/shell/modules/levels.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/levels.py 2011-05-25 13:38:39.084559149 -0400 ++++ pacemaker-1.0.11/shell/modules/levels.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + import sys +Index: pacemaker-1.0.11/shell/modules/main.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/main.py 2011-05-25 13:38:39.064559123 -0400 ++++ pacemaker-1.0.11/shell/modules/main.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + import sys +Index: pacemaker-1.0.11/shell/modules/msg.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/msg.py 2011-05-25 13:38:39.014559053 -0400 ++++ pacemaker-1.0.11/shell/modules/msg.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + import sys +Index: pacemaker-1.0.11/shell/modules/parse.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/parse.py 2011-05-25 13:38:39.054559106 -0400 ++++ pacemaker-1.0.11/shell/modules/parse.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + import shlex +Index: pacemaker-1.0.11/shell/modules/template.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/template.py 2011-05-25 13:38:39.004559033 -0400 ++++ pacemaker-1.0.11/shell/modules/template.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + import re +Index: pacemaker-1.0.11/shell/modules/term.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/term.py 2011-05-25 13:38:38.974558986 -0400 ++++ pacemaker-1.0.11/shell/modules/term.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + import sys +Index: pacemaker-1.0.11/shell/modules/userprefs.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/userprefs.py 2011-05-25 13:38:39.074559141 -0400 ++++ pacemaker-1.0.11/shell/modules/userprefs.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + from os import getenv +Index: pacemaker-1.0.11/shell/modules/utils.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/utils.py 2011-05-25 13:38:39.074559141 -0400 ++++ pacemaker-1.0.11/shell/modules/utils.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + import os +Index: pacemaker-1.0.11/shell/modules/xmlutil.py +=================================================================== +--- pacemaker-1.0.11.orig/shell/modules/xmlutil.py 2011-05-25 13:38:38.964558977 -0400 ++++ pacemaker-1.0.11/shell/modules/xmlutil.py 2011-05-25 13:39:25.104626652 -0400 +@@ -3,7 +3,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + import os +Index: pacemaker-1.0.11/shell/regression/crm_regression.sh +=================================================================== +--- pacemaker-1.0.11.orig/shell/regression/crm_regression.sh 2011-05-25 13:38:39.094559166 -0400 ++++ pacemaker-1.0.11/shell/regression/crm_regression.sh 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + # 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.1 of the License, or (at your option) any later version. ++# version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + # + # You should have received a copy of the GNU 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 ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + BASE=${1:-`pwd`} +Index: pacemaker-1.0.11/shell/regression/evaltest.sh +=================================================================== +--- pacemaker-1.0.11.orig/shell/regression/evaltest.sh 2011-05-25 13:38:39.104559184 -0400 ++++ pacemaker-1.0.11/shell/regression/evaltest.sh 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + # 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.1 of the License, or (at your option) any later version. ++ # version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + # + # You should have received a copy of the GNU 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 ++ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + : ${TESTDIR:=testcases} +Index: pacemaker-1.0.11/tools/attrd.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/attrd.c 2011-05-25 13:38:38.334558048 -0400 ++++ pacemaker-1.0.11/tools/attrd.c 2011-05-25 13:39:25.104626652 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/tools/attrd.h +=================================================================== +--- pacemaker-1.0.11.orig/tools/attrd.h 2011-05-25 13:38:38.374558113 -0400 ++++ pacemaker-1.0.11/tools/attrd.h 2011-05-25 13:39:25.104626652 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #define attrd_channel T_ATTRD +Index: pacemaker-1.0.11/tools/attrd_updater.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/attrd_updater.c 2011-05-25 13:38:38.254557937 -0400 ++++ pacemaker-1.0.11/tools/attrd_updater.c 2011-05-25 13:39:25.104626652 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/tools/ccm_epoche.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/ccm_epoche.c 2011-05-25 13:38:38.284557974 -0400 ++++ pacemaker-1.0.11/tools/ccm_epoche.c 2011-05-25 13:39:25.104626652 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/tools/cib_shadow.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/cib_shadow.c 2011-05-25 13:38:38.354558076 -0400 ++++ pacemaker-1.0.11/tools/cib_shadow.c 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/tools/cibadmin.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/cibadmin.c 2011-05-25 13:38:38.294557992 -0400 ++++ pacemaker-1.0.11/tools/cibadmin.c 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/tools/crm_attribute.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/crm_attribute.c 2011-05-25 13:38:38.384558123 -0400 ++++ pacemaker-1.0.11/tools/crm_attribute.c 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/tools/crm_mon.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/crm_mon.c 2011-05-25 13:38:38.274557965 -0400 ++++ pacemaker-1.0.11/tools/crm_mon.c 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/tools/crm_resource.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/crm_resource.c 2011-05-25 13:38:38.264557946 -0400 ++++ pacemaker-1.0.11/tools/crm_resource.c 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/tools/crm_uuid.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/crm_uuid.c 2011-05-25 13:38:38.304558011 -0400 ++++ pacemaker-1.0.11/tools/crm_uuid.c 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/tools/crm_verify.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/crm_verify.c 2011-05-25 13:38:38.314558020 -0400 ++++ pacemaker-1.0.11/tools/crm_verify.c 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/tools/crmadmin.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/crmadmin.c 2011-05-25 13:38:38.314558020 -0400 ++++ pacemaker-1.0.11/tools/crmadmin.c 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/tools/hb2openais-helper.py +=================================================================== +--- pacemaker-1.0.11.orig/tools/hb2openais-helper.py 2011-05-25 13:38:38.324558039 -0400 ++++ pacemaker-1.0.11/tools/hb2openais-helper.py 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + # 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.1 of the License, or (at your option) any later version. ++ # version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + # + # You should have received a copy of the GNU 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 ++ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + import os,sys +Index: pacemaker-1.0.11/tools/notifyServicelogEvent.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/notifyServicelogEvent.c 2011-05-25 13:38:38.274557965 -0400 ++++ pacemaker-1.0.11/tools/notifyServicelogEvent.c 2011-05-25 13:39:25.104626652 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + /* gcc -o notifyServicelogEvent `pkg-config --cflags servicelog-1` `pkg-config --libs servicelog-1` notifyServicelogEvent.c +Index: pacemaker-1.0.11/tools/pingd.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/pingd.c 2011-05-25 13:38:38.344558067 -0400 ++++ pacemaker-1.0.11/tools/pingd.c 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/tools/test.iso8601.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/test.iso8601.c 2011-05-25 13:38:38.364558094 -0400 ++++ pacemaker-1.0.11/tools/test.iso8601.c 2011-05-25 13:39:25.104626652 -0400 +@@ -4,7 +4,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/tools/xml_diff.c +=================================================================== +--- pacemaker-1.0.11.orig/tools/xml_diff.c 2011-05-25 13:38:38.354558076 -0400 ++++ pacemaker-1.0.11/tools/xml_diff.c 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + * 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.1 of the License, or (at your option) any later version. ++ * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU 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 ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +Index: pacemaker-1.0.11/xml/regression.core.sh +=================================================================== +--- pacemaker-1.0.11.orig/xml/regression.core.sh 2011-05-25 13:38:38.214557872 -0400 ++++ pacemaker-1.0.11/xml/regression.core.sh 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + # 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.1 of the License, or (at your option) any later version. ++ # version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + # + # You should have received a copy of the GNU 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 ++ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + verbose=$1 +Index: pacemaker-1.0.11/xml/regression.sh +=================================================================== +--- pacemaker-1.0.11.orig/xml/regression.sh 2011-05-25 13:38:38.214557872 -0400 ++++ pacemaker-1.0.11/xml/regression.sh 2011-05-25 13:39:25.104626652 -0400 +@@ -5,7 +5,7 @@ + # 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.1 of the License, or (at your option) any later version. ++ # version 2 of the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -14,7 +14,7 @@ + # + # You should have received a copy of the GNU 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 ++ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + + . regression.core.sh diff -Nru pacemaker-1.0.11/debian/patches/raexecupstart.patch pacemaker-1.0.11/debian/patches/raexecupstart.patch --- pacemaker-1.0.11/debian/patches/raexecupstart.patch 1969-12-31 19:00:00.000000000 -0500 +++ pacemaker-1.0.11/debian/patches/raexecupstart.patch 2011-05-25 13:39:47.000000000 -0400 @@ -0,0 +1,44 @@ +Index: pacemaker-1.0.11/xml/crm-1.0.dtd +=================================================================== +--- pacemaker-1.0.11.orig/xml/crm-1.0.dtd 2011-05-25 13:38:37.664557072 -0400 ++++ pacemaker-1.0.11/xml/crm-1.0.dtd 2011-05-25 13:39:45.484656540 -0400 +@@ -215,7 +215,7 @@ + + +