[omniORB] Update to 4.2.0
Sandro Mani
smani at fedoraproject.org
Thu May 8 22:26:49 UTC 2014
commit a4bc3b5665bcf17018bad911995dd14a0a7eb959
Author: Sandro Mani <manisandro at gmail.com>
Date: Fri May 9 00:25:47 2014 +0200
Update to 4.2.0
.gitignore | 1 +
omniORB-4.1.6-fsf-address.patch | 6257 ---------------------------------
omniORB-4.2.0-format-security.patch | 12 +
omniORB-4.2.0-fsf-address.patch | 6623 +++++++++++++++++++++++++++++++++++
omniORB.spec | 27 +-
sources | 2 +-
6 files changed, 6654 insertions(+), 6268 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ed9dcd4..3909b09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/omniORB-4.1.6.tar.bz2
/omniORB-4.1.7.tar.bz2
+/omniORB-4.2.0.tar.bz2
diff --git a/omniORB-4.2.0-format-security.patch b/omniORB-4.2.0-format-security.patch
new file mode 100644
index 0000000..c7b61df
--- /dev/null
+++ b/omniORB-4.2.0-format-security.patch
@@ -0,0 +1,12 @@
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/cccp/cccp.c omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/cccp.c
+--- omniORB-4.2.0/src/tool/omniidl/cxx/cccp/cccp.c 2006-08-02 16:26:34.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/cccp.c 2014-05-08 23:59:25.128579735 +0200
+@@ -8034,7 +8034,7 @@ macroexpand (hp, op)
+ else
+ parse_error = macarg (NULL_PTR, 0);
+ if (parse_error) {
+- error_with_line (line_for_error (start_line), parse_error);
++ error_with_line (line_for_error (start_line), "%s", parse_error);
+ break;
+ }
+ i++;
diff --git a/omniORB-4.2.0-fsf-address.patch b/omniORB-4.2.0-fsf-address.patch
new file mode 100644
index 0000000..e09c7cb
--- /dev/null
+++ b/omniORB-4.2.0-fsf-address.patch
@@ -0,0 +1,6623 @@
+diff -rupN omniORB-4.2.0/aclocal.m4 omniORB-4.2.0-new/aclocal.m4
+--- omniORB-4.2.0/aclocal.m4 2013-12-30 16:08:29.000000000 +0100
++++ omniORB-4.2.0-new/aclocal.m4 2014-05-08 22:38:03.738113681 +0200
+@@ -29,7 +29,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_de
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+diff -rupN omniORB-4.2.0/bin/scripts/config.guess omniORB-4.2.0-new/bin/scripts/config.guess
+--- omniORB-4.2.0/bin/scripts/config.guess 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/bin/scripts/config.guess 2014-05-08 22:38:03.791114861 +0200
+@@ -17,7 +17,7 @@ timestamp='2001-08-21'
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+diff -rupN omniORB-4.2.0/bin/scripts/config.sub omniORB-4.2.0-new/bin/scripts/config.sub
+--- omniORB-4.2.0/bin/scripts/config.sub 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/bin/scripts/config.sub 2014-05-08 22:38:03.794114929 +0200
+@@ -21,8 +21,8 @@ timestamp='2001-08-13'
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+diff -rupN omniORB-4.2.0/COPYING omniORB-4.2.0-new/COPYING
+--- omniORB-4.2.0/COPYING 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/COPYING 2014-05-08 22:38:03.777114550 +0200
+@@ -2,7 +2,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -305,7 +305,7 @@ the "copyright" line and a pointer to wh
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
+ Also add information on how to contact you by electronic and paper mail.
+diff -rupN omniORB-4.2.0/COPYING.LIB omniORB-4.2.0-new/COPYING.LIB
+--- omniORB-4.2.0/COPYING.LIB 2007-11-21 00:32:10.000000000 +0100
++++ omniORB-4.2.0-new/COPYING.LIB 2014-05-08 22:38:03.510108603 +0200
+@@ -2,7 +2,7 @@
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -485,7 +485,7 @@ convey the exclusion of warranty; and ea
+
+ 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 Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Also add information on how to contact you by electronic and paper mail.
+
+diff -rupN omniORB-4.2.0/idl/omniConnectionData.idl omniORB-4.2.0-new/idl/omniConnectionData.idl
+--- omniORB-4.2.0/idl/omniConnectionData.idl 2006-07-18 18:21:26.000000000 +0200
++++ omniORB-4.2.0-new/idl/omniConnectionData.idl 2014-05-08 22:38:03.766114305 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/idl/omniTypedefs.idl omniORB-4.2.0-new/idl/omniTypedefs.idl
+--- omniORB-4.2.0/idl/omniTypedefs.idl 2006-07-18 18:21:26.000000000 +0200
++++ omniORB-4.2.0-new/idl/omniTypedefs.idl 2014-05-08 22:38:03.765114283 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniconfig.h omniORB-4.2.0-new/include/omniconfig.h
+--- omniORB-4.2.0/include/omniconfig.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omniconfig.h 2014-05-08 22:38:03.710113057 +0200
+@@ -19,8 +19,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA
+ *
+ *
+ * Description:
+diff -rupN omniORB-4.2.0/include/omniconfig.h.in omniORB-4.2.0-new/include/omniconfig.h.in
+--- omniORB-4.2.0/include/omniconfig.h.in 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omniconfig.h.in 2014-05-08 22:38:03.710113057 +0200
+@@ -19,8 +19,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA
+ *
+ *
+ * Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/ami.h omniORB-4.2.0-new/include/omniORB4/ami.h
+--- omniORB-4.2.0/include/omniORB4/ami.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/ami.h 2014-05-08 22:38:03.675112278 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/include/omniORB4/anyStream.h omniORB-4.2.0-new/include/omniORB4/anyStream.h
+--- omniORB-4.2.0/include/omniORB4/anyStream.h 2013-04-30 19:22:28.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/anyStream.h 2014-05-08 22:38:03.668112122 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/BiDirPolicy.h omniORB-4.2.0-new/include/omniORB4/BiDirPolicy.h
+--- omniORB-4.2.0/include/omniORB4/BiDirPolicy.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/BiDirPolicy.h 2014-05-08 22:38:03.695112723 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/boa.h omniORB-4.2.0-new/include/omniORB4/boa.h
+--- omniORB-4.2.0/include/omniORB4/boa.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/boa.h 2014-05-08 22:38:03.700112835 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/callDescriptor.h omniORB-4.2.0-new/include/omniORB4/callDescriptor.h
+--- omniORB-4.2.0/include/omniORB4/callDescriptor.h 2013-09-03 23:30:14.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/callDescriptor.h 2014-05-08 22:38:03.706112969 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Object that encapsulates a call to be performed
+diff -rupN omniORB-4.2.0/include/omniORB4/callHandle.h omniORB-4.2.0-new/include/omniORB4/callHandle.h
+--- omniORB-4.2.0/include/omniORB4/callHandle.h 2013-04-12 15:38:30.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/callHandle.h 2014-05-08 22:38:03.667112100 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/cdrStream.h omniORB-4.2.0-new/include/omniORB4/cdrStream.h
+--- omniORB-4.2.0/include/omniORB4/cdrStream.h 2013-09-03 16:25:52.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/cdrStream.h 2014-05-08 22:38:03.619111031 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/codeSets.h omniORB-4.2.0-new/include/omniORB4/codeSets.h
+--- omniORB-4.2.0/include/omniORB4/codeSets.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/codeSets.h 2014-05-08 22:38:03.700112835 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_AbstractBase.h omniORB-4.2.0-new/include/omniORB4/CORBA_AbstractBase.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_AbstractBase.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_AbstractBase.h 2014-05-08 22:38:03.615110942 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Any.h omniORB-4.2.0-new/include/omniORB4/CORBA_Any.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Any.h 2013-08-29 13:55:10.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Any.h 2014-05-08 22:38:03.669112145 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Any_vartypes.h omniORB-4.2.0-new/include/omniORB4/CORBA_Any_vartypes.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Any_vartypes.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Any_vartypes.h 2014-05-08 22:38:03.674112256 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_basetypes.h omniORB-4.2.0-new/include/omniORB4/CORBA_basetypes.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_basetypes.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_basetypes.h 2014-05-08 22:38:03.616110964 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_BOA.h omniORB-4.2.0-new/include/omniORB4/CORBA_BOA.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_BOA.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_BOA.h 2014-05-08 22:38:03.678112345 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Context.h omniORB-4.2.0-new/include/omniORB4/CORBA_Context.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Context.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Context.h 2014-05-08 22:38:03.615110942 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Current.h omniORB-4.2.0-new/include/omniORB4/CORBA_Current.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Current.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Current.h 2014-05-08 22:38:03.667112100 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_DomainManager.h omniORB-4.2.0-new/include/omniORB4/CORBA_DomainManager.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_DomainManager.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_DomainManager.h 2014-05-08 22:38:03.611110853 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Environment.h omniORB-4.2.0-new/include/omniORB4/CORBA_Environment.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Environment.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Environment.h 2014-05-08 22:38:03.693112679 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Exception.h omniORB-4.2.0-new/include/omniORB4/CORBA_Exception.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Exception.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Exception.h 2014-05-08 22:38:03.659111921 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_ExceptionList.h omniORB-4.2.0-new/include/omniORB4/CORBA_ExceptionList.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_ExceptionList.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_ExceptionList.h 2014-05-08 22:38:03.693112679 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Fixed.h omniORB-4.2.0-new/include/omniORB4/CORBA_Fixed.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Fixed.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Fixed.h 2014-05-08 22:38:03.690112612 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA.h omniORB-4.2.0-new/include/omniORB4/CORBA.h
+--- omniORB-4.2.0/include/omniORB4/CORBA.h 2014-03-11 17:06:40.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/CORBA.h 2014-05-08 22:38:03.613110897 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_LocalObject.h omniORB-4.2.0-new/include/omniORB4/CORBA_LocalObject.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_LocalObject.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_LocalObject.h 2014-05-08 22:38:03.677112323 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_LocalObject_vartypes.h omniORB-4.2.0-new/include/omniORB4/CORBA_LocalObject_vartypes.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_LocalObject_vartypes.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_LocalObject_vartypes.h 2014-05-08 22:38:03.672112211 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #ifndef INSIDE_OMNIORB_CORBA_MODULE
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_NamedValue.h omniORB-4.2.0-new/include/omniORB4/CORBA_NamedValue.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_NamedValue.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_NamedValue.h 2014-05-08 22:38:03.660111944 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Object.h omniORB-4.2.0-new/include/omniORB4/CORBA_Object.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Object.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Object.h 2014-05-08 22:38:03.626111187 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Object_vartypes.h omniORB-4.2.0-new/include/omniORB4/CORBA_Object_vartypes.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Object_vartypes.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Object_vartypes.h 2014-05-08 22:38:03.676112301 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/corba_operators.h omniORB-4.2.0-new/include/omniORB4/corba_operators.h
+--- omniORB-4.2.0/include/omniORB4/corba_operators.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/corba_operators.h 2014-05-08 22:38:03.609110808 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_ORB.h omniORB-4.2.0-new/include/omniORB4/CORBA_ORB.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_ORB.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_ORB.h 2014-05-08 22:38:03.673112233 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Policy.h omniORB-4.2.0-new/include/omniORB4/CORBA_Policy.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Policy.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Policy.h 2014-05-08 22:38:03.675112278 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_primitive_types.h omniORB-4.2.0-new/include/omniORB4/CORBA_primitive_types.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_primitive_types.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_primitive_types.h 2014-05-08 22:38:03.626111187 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Principal.h omniORB-4.2.0-new/include/omniORB4/CORBA_Principal.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Principal.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Principal.h 2014-05-08 22:38:03.691112635 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Request.h omniORB-4.2.0-new/include/omniORB4/CORBA_Request.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Request.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Request.h 2014-05-08 22:38:03.673112233 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_ServerRequest.h omniORB-4.2.0-new/include/omniORB4/CORBA_ServerRequest.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_ServerRequest.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_ServerRequest.h 2014-05-08 22:38:03.673112233 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_static_fns.h omniORB-4.2.0-new/include/omniORB4/CORBA_static_fns.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_static_fns.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_static_fns.h 2014-05-08 22:38:03.678112345 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_String.h omniORB-4.2.0-new/include/omniORB4/CORBA_String.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_String.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_String.h 2014-05-08 22:38:03.691112635 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_sysdep_auto.h omniORB-4.2.0-new/include/omniORB4/CORBA_sysdep_auto.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_sysdep_auto.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_sysdep_auto.h 2014-05-08 22:38:03.610110831 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_sysdep.h omniORB-4.2.0-new/include/omniORB4/CORBA_sysdep.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_sysdep.h 2014-01-17 16:27:56.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_sysdep.h 2014-05-08 22:38:03.682112434 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_sysdep_trad.h omniORB-4.2.0-new/include/omniORB4/CORBA_sysdep_trad.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_sysdep_trad.h 2014-01-17 16:27:56.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_sysdep_trad.h 2014-05-08 22:38:03.677112323 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_TypeCode.h omniORB-4.2.0-new/include/omniORB4/CORBA_TypeCode.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_TypeCode.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_TypeCode.h 2014-05-08 22:38:03.703112901 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_TypeCode_member.h omniORB-4.2.0-new/include/omniORB4/CORBA_TypeCode_member.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_TypeCode_member.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_TypeCode_member.h 2014-05-08 22:38:03.697112768 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_UnknownUserException.h omniORB-4.2.0-new/include/omniORB4/CORBA_UnknownUserException.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_UnknownUserException.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_UnknownUserException.h 2014-05-08 22:38:03.694112701 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_ValueBase.h omniORB-4.2.0-new/include/omniORB4/CORBA_ValueBase.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_ValueBase.h 2012-02-24 11:43:54.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_ValueBase.h 2014-05-08 22:38:03.610110831 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_ValueBase_vartypes.h omniORB-4.2.0-new/include/omniORB4/CORBA_ValueBase_vartypes.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_ValueBase_vartypes.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_ValueBase_vartypes.h 2014-05-08 22:38:03.688112567 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_vartypes.h omniORB-4.2.0-new/include/omniORB4/CORBA_vartypes.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_vartypes.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_vartypes.h 2014-05-08 22:38:03.687112545 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/dynAny.h omniORB-4.2.0-new/include/omniORB4/dynAny.h
+--- omniORB-4.2.0/include/omniORB4/dynAny.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/dynAny.h 2014-05-08 22:38:03.665112055 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/finalCleanup.h omniORB-4.2.0-new/include/omniORB4/finalCleanup.h
+--- omniORB-4.2.0/include/omniORB4/finalCleanup.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/finalCleanup.h 2014-05-08 22:38:03.609110808 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/fixed.h omniORB-4.2.0-new/include/omniORB4/fixed.h
+--- omniORB-4.2.0/include/omniORB4/fixed.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/fixed.h 2014-05-08 22:38:03.610110831 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/giopEndpoint.h omniORB-4.2.0-new/include/omniORB4/giopEndpoint.h
+--- omniORB-4.2.0/include/omniORB4/giopEndpoint.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/giopEndpoint.h 2014-05-08 22:38:03.680112389 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/GIOP.h omniORB-4.2.0-new/include/omniORB4/GIOP.h
+--- omniORB-4.2.0/include/omniORB4/GIOP.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/GIOP.h 2014-05-08 22:38:03.668112122 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/IIOP.h omniORB-4.2.0-new/include/omniORB4/IIOP.h
+--- omniORB-4.2.0/include/omniORB4/IIOP.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/IIOP.h 2014-05-08 22:38:03.657111877 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/anonObject.h omniORB-4.2.0-new/include/omniORB4/internal/anonObject.h
+--- omniORB-4.2.0/include/omniORB4/internal/anonObject.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/anonObject.h 2014-05-08 22:38:03.637111431 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/codeSetUtil.h omniORB-4.2.0-new/include/omniORB4/internal/codeSetUtil.h
+--- omniORB-4.2.0/include/omniORB4/internal/codeSetUtil.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/codeSetUtil.h 2014-05-08 22:38:03.631111298 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/context.h omniORB-4.2.0-new/include/omniORB4/internal/context.h
+--- omniORB-4.2.0/include/omniORB4/internal/context.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/context.h 2014-05-08 22:38:03.627111209 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/corbaBoa.h omniORB-4.2.0-new/include/omniORB4/internal/corbaBoa.h
+--- omniORB-4.2.0/include/omniORB4/internal/corbaBoa.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/corbaBoa.h 2014-05-08 22:38:03.643111565 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/corbaOrb.h omniORB-4.2.0-new/include/omniORB4/internal/corbaOrb.h
+--- omniORB-4.2.0/include/omniORB4/internal/corbaOrb.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/corbaOrb.h 2014-05-08 22:38:03.641111521 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/dynamicImplementation.h omniORB-4.2.0-new/include/omniORB4/internal/dynamicImplementation.h
+--- omniORB-4.2.0/include/omniORB4/internal/dynamicImplementation.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/dynamicImplementation.h 2014-05-08 22:38:03.647111655 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/dynamicLib.h omniORB-4.2.0-new/include/omniORB4/internal/dynamicLib.h
+--- omniORB-4.2.0/include/omniORB4/internal/dynamicLib.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/dynamicLib.h 2014-05-08 22:38:03.638111454 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/dynAnyImpl.h omniORB-4.2.0-new/include/omniORB4/internal/dynAnyImpl.h
+--- omniORB-4.2.0/include/omniORB4/internal/dynAnyImpl.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/dynAnyImpl.h 2014-05-08 22:38:03.654111810 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/excepthandler.h omniORB-4.2.0-new/include/omniORB4/internal/excepthandler.h
+--- omniORB-4.2.0/include/omniORB4/internal/excepthandler.h 2014-03-11 17:06:40.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/excepthandler.h 2014-05-08 22:38:03.641111521 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/exceptiondefs.h omniORB-4.2.0-new/include/omniORB4/internal/exceptiondefs.h
+--- omniORB-4.2.0/include/omniORB4/internal/exceptiondefs.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/exceptiondefs.h 2014-05-08 22:38:03.651111743 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopBiDir.h omniORB-4.2.0-new/include/omniORB4/internal/giopBiDir.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopBiDir.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopBiDir.h 2014-05-08 22:38:03.646111632 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/GIOP_C.h omniORB-4.2.0-new/include/omniORB4/internal/GIOP_C.h
+--- omniORB-4.2.0/include/omniORB4/internal/GIOP_C.h 2013-04-12 15:38:30.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/GIOP_C.h 2014-05-08 22:38:03.642111543 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopMonitor.h omniORB-4.2.0-new/include/omniORB4/internal/giopMonitor.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopMonitor.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopMonitor.h 2014-05-08 22:38:03.630111276 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopRendezvouser.h omniORB-4.2.0-new/include/omniORB4/internal/giopRendezvouser.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopRendezvouser.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopRendezvouser.h 2014-05-08 22:38:03.626111187 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopRope.h omniORB-4.2.0-new/include/omniORB4/internal/giopRope.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopRope.h 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopRope.h 2014-05-08 22:38:03.634111365 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopServer.h omniORB-4.2.0-new/include/omniORB4/internal/giopServer.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopServer.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopServer.h 2014-05-08 22:38:03.647111655 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/GIOP_S.h omniORB-4.2.0-new/include/omniORB4/internal/GIOP_S.h
+--- omniORB-4.2.0/include/omniORB4/internal/GIOP_S.h 2013-04-12 15:38:30.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/GIOP_S.h 2014-05-08 22:38:03.629111253 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopStrandFlags.h omniORB-4.2.0-new/include/omniORB4/internal/giopStrandFlags.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopStrandFlags.h 2013-10-29 19:17:16.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopStrandFlags.h 2014-05-08 22:38:03.630111276 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopStrand.h omniORB-4.2.0-new/include/omniORB4/internal/giopStrand.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopStrand.h 2013-06-12 16:12:48.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopStrand.h 2014-05-08 22:38:03.633111343 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopStream.h omniORB-4.2.0-new/include/omniORB4/internal/giopStream.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopStream.h 2013-08-29 13:56:48.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopStream.h 2014-05-08 22:38:03.639111477 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopStreamImpl.h omniORB-4.2.0-new/include/omniORB4/internal/giopStreamImpl.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopStreamImpl.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopStreamImpl.h 2014-05-08 22:38:03.635111387 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopWorker.h omniORB-4.2.0-new/include/omniORB4/internal/giopWorker.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopWorker.h 2013-02-12 23:58:10.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopWorker.h 2014-05-08 22:38:03.629111253 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/initialiser.h omniORB-4.2.0-new/include/omniORB4/internal/initialiser.h
+--- omniORB-4.2.0/include/omniORB4/internal/initialiser.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/initialiser.h 2014-05-08 22:38:03.632111321 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/initRefs.h omniORB-4.2.0-new/include/omniORB4/internal/initRefs.h
+--- omniORB-4.2.0/include/omniORB4/internal/initRefs.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/initRefs.h 2014-05-08 22:38:03.642111543 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/inProcessIdentity.h omniORB-4.2.0-new/include/omniORB4/internal/inProcessIdentity.h
+--- omniORB-4.2.0/include/omniORB4/internal/inProcessIdentity.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/inProcessIdentity.h 2014-05-08 22:38:03.656111855 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/interceptors.h omniORB-4.2.0-new/include/omniORB4/internal/interceptors.h
+--- omniORB-4.2.0/include/omniORB4/internal/interceptors.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/interceptors.h 2014-05-08 22:38:03.642111543 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/invoker.h omniORB-4.2.0-new/include/omniORB4/internal/invoker.h
+--- omniORB-4.2.0/include/omniORB4/internal/invoker.h 2013-02-12 23:58:10.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/invoker.h 2014-05-08 22:38:03.641111521 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/libcWrapper.h omniORB-4.2.0-new/include/omniORB4/internal/libcWrapper.h
+--- omniORB-4.2.0/include/omniORB4/internal/libcWrapper.h 2010-08-10 19:20:21.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/libcWrapper.h 2014-05-08 22:38:03.656111855 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/localIdentity.h omniORB-4.2.0-new/include/omniORB4/internal/localIdentity.h
+--- omniORB-4.2.0/include/omniORB4/internal/localIdentity.h 2010-11-03 12:16:40.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/localIdentity.h 2014-05-08 22:38:03.629111253 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/objectAdapter.h omniORB-4.2.0-new/include/omniORB4/internal/objectAdapter.h
+--- omniORB-4.2.0/include/omniORB4/internal/objectAdapter.h 2013-07-08 14:46:13.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/objectAdapter.h 2014-05-08 22:38:03.636111409 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/objectStub.h omniORB-4.2.0-new/include/omniORB4/internal/objectStub.h
+--- omniORB-4.2.0/include/omniORB4/internal/objectStub.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/objectStub.h 2014-05-08 22:38:03.635111387 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/objectTable.h omniORB-4.2.0-new/include/omniORB4/internal/objectTable.h
+--- omniORB-4.2.0/include/omniORB4/internal/objectTable.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/objectTable.h 2014-05-08 22:38:03.651111743 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/omniCurrent.h omniORB-4.2.0-new/include/omniORB4/internal/omniCurrent.h
+--- omniORB-4.2.0/include/omniORB4/internal/omniCurrent.h 2012-12-21 17:26:15.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/omniCurrent.h 2014-05-08 22:38:03.646111632 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/omniIdentity.h omniORB-4.2.0-new/include/omniORB4/internal/omniIdentity.h
+--- omniORB-4.2.0/include/omniORB4/internal/omniIdentity.h 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/omniIdentity.h 2014-05-08 22:38:03.638111454 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/orbOptions.h omniORB-4.2.0-new/include/omniORB4/internal/orbOptions.h
+--- omniORB-4.2.0/include/omniORB4/internal/orbOptions.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/orbOptions.h 2014-05-08 22:38:03.640111499 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/orbParameters.h omniORB-4.2.0-new/include/omniORB4/internal/orbParameters.h
+--- omniORB-4.2.0/include/omniORB4/internal/orbParameters.h 2014-04-17 18:32:49.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/orbParameters.h 2014-05-08 22:38:03.645111610 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/poacurrentimpl.h omniORB-4.2.0-new/include/omniORB4/internal/poacurrentimpl.h
+--- omniORB-4.2.0/include/omniORB4/internal/poacurrentimpl.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/poacurrentimpl.h 2014-05-08 22:38:03.645111610 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/poaimpl.h omniORB-4.2.0-new/include/omniORB4/internal/poaimpl.h
+--- omniORB-4.2.0/include/omniORB4/internal/poaimpl.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/poaimpl.h 2014-05-08 22:38:03.628111231 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/poamanager.h omniORB-4.2.0-new/include/omniORB4/internal/poamanager.h
+--- omniORB-4.2.0/include/omniORB4/internal/poamanager.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/poamanager.h 2014-05-08 22:38:03.637111431 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/pseudo.h omniORB-4.2.0-new/include/omniORB4/internal/pseudo.h
+--- omniORB-4.2.0/include/omniORB4/internal/pseudo.h 2012-02-24 11:43:54.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/pseudo.h 2014-05-08 22:38:03.633111343 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/remoteIdentity.h omniORB-4.2.0-new/include/omniORB4/internal/remoteIdentity.h
+--- omniORB-4.2.0/include/omniORB4/internal/remoteIdentity.h 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/remoteIdentity.h 2014-05-08 22:38:03.635111387 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/request.h omniORB-4.2.0-new/include/omniORB4/internal/request.h
+--- omniORB-4.2.0/include/omniORB4/internal/request.h 2013-12-31 00:23:27.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/request.h 2014-05-08 22:38:03.643111565 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/rmutex.h omniORB-4.2.0-new/include/omniORB4/internal/rmutex.h
+--- omniORB-4.2.0/include/omniORB4/internal/rmutex.h 2005-01-07 00:11:24.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/rmutex.h 2014-05-08 22:38:03.634111365 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/shutdownIdentity.h omniORB-4.2.0-new/include/omniORB4/internal/shutdownIdentity.h
+--- omniORB-4.2.0/include/omniORB4/internal/shutdownIdentity.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/shutdownIdentity.h 2014-05-08 22:38:03.645111610 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/SocketCollection.h omniORB-4.2.0-new/include/omniORB4/internal/SocketCollection.h
+--- omniORB-4.2.0/include/omniORB4/internal/SocketCollection.h 2013-05-23 18:39:39.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/SocketCollection.h 2014-05-08 22:38:03.631111298 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/tcParser.h omniORB-4.2.0-new/include/omniORB4/internal/tcParser.h
+--- omniORB-4.2.0/include/omniORB4/internal/tcParser.h 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/tcParser.h 2014-05-08 22:38:03.647111655 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/tcpSocket.h omniORB-4.2.0-new/include/omniORB4/internal/tcpSocket.h
+--- omniORB-4.2.0/include/omniORB4/internal/tcpSocket.h 2013-05-23 18:39:39.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/tcpSocket.h 2014-05-08 22:38:03.655111833 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/transportRules.h omniORB-4.2.0-new/include/omniORB4/internal/transportRules.h
+--- omniORB-4.2.0/include/omniORB4/internal/transportRules.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/transportRules.h 2014-05-08 22:38:03.632111321 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/typecode.h omniORB-4.2.0-new/include/omniORB4/internal/typecode.h
+--- omniORB-4.2.0/include/omniORB4/internal/typecode.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/typecode.h 2014-05-08 22:38:03.650111721 +0200
+@@ -22,8 +22,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/unknownValue.h omniORB-4.2.0-new/include/omniORB4/internal/unknownValue.h
+--- omniORB-4.2.0/include/omniORB4/internal/unknownValue.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/unknownValue.h 2014-05-08 22:38:03.637111431 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/valueTrackerImpl.h omniORB-4.2.0-new/include/omniORB4/internal/valueTrackerImpl.h
+--- omniORB-4.2.0/include/omniORB4/internal/valueTrackerImpl.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/valueTrackerImpl.h 2014-05-08 22:38:03.641111521 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/IOP_C.h omniORB-4.2.0-new/include/omniORB4/IOP_C.h
+--- omniORB-4.2.0/include/omniORB4/IOP_C.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/IOP_C.h 2014-05-08 22:38:03.658111899 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/IOP.h omniORB-4.2.0-new/include/omniORB4/IOP.h
+--- omniORB-4.2.0/include/omniORB4/IOP.h 2013-02-22 17:44:47.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/IOP.h 2014-05-08 22:38:03.694112701 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/IOP_S.h omniORB-4.2.0-new/include/omniORB4/IOP_S.h
+--- omniORB-4.2.0/include/omniORB4/IOP_S.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/IOP_S.h 2014-05-08 22:38:03.693112679 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/linkHacks.h omniORB-4.2.0-new/include/omniORB4/linkHacks.h
+--- omniORB-4.2.0/include/omniORB4/linkHacks.h 2009-09-22 18:42:11.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/linkHacks.h 2014-05-08 22:38:03.695112723 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/minorCode.h omniORB-4.2.0-new/include/omniORB4/minorCode.h
+--- omniORB-4.2.0/include/omniORB4/minorCode.h 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/minorCode.h 2014-05-08 22:38:03.666112077 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/objTracker.h omniORB-4.2.0-new/include/omniORB4/objTracker.h
+--- omniORB-4.2.0/include/omniORB4/objTracker.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/objTracker.h 2014-05-08 22:38:03.609110808 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniAsyncInvoker.h omniORB-4.2.0-new/include/omniORB4/omniAsyncInvoker.h
+--- omniORB-4.2.0/include/omniORB4/omniAsyncInvoker.h 2013-02-12 23:58:10.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/omniAsyncInvoker.h 2014-05-08 22:38:03.612110875 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // *** PROPRIETARY INTERFACE ***
+diff -rupN omniORB-4.2.0/include/omniORB4/omniConnectionMgmt.h omniORB-4.2.0-new/include/omniORB4/omniConnectionMgmt.h
+--- omniORB-4.2.0/include/omniORB4/omniConnectionMgmt.h 2006-07-26 19:40:32.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniConnectionMgmt.h 2014-05-08 22:38:03.614110919 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // Proprietary omniORB connection management API
+diff -rupN omniORB-4.2.0/include/omniORB4/omniInterceptors.h omniORB-4.2.0-new/include/omniORB4/omniInterceptors.h
+--- omniORB-4.2.0/include/omniORB4/omniInterceptors.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniInterceptors.h 2014-05-08 22:38:03.662111989 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniInternal.h omniORB-4.2.0-new/include/omniORB4/omniInternal.h
+--- omniORB-4.2.0/include/omniORB4/omniInternal.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniInternal.h 2014-05-08 22:38:03.689112590 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniIOR.h omniORB-4.2.0-new/include/omniORB4/omniIOR.h
+--- omniORB-4.2.0/include/omniORB4/omniIOR.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniIOR.h 2014-05-08 22:38:03.659111921 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniObjKey.h omniORB-4.2.0-new/include/omniORB4/omniObjKey.h
+--- omniORB-4.2.0/include/omniORB4/omniObjKey.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniObjKey.h 2014-05-08 22:38:03.613110897 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniObjRef.h omniORB-4.2.0-new/include/omniORB4/omniObjRef.h
+--- omniORB-4.2.0/include/omniORB4/omniObjRef.h 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniObjRef.h 2014-05-08 22:38:03.679112367 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniORBcompat.h omniORB-4.2.0-new/include/omniORB4/omniORBcompat.h
+--- omniORB-4.2.0/include/omniORB4/omniORBcompat.h 2004-10-13 20:00:33.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniORBcompat.h 2014-05-08 22:38:03.609110808 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniORB.h omniORB-4.2.0-new/include/omniORB4/omniORB.h
+--- omniORB-4.2.0/include/omniORB4/omniORB.h 2014-03-11 17:06:40.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/omniORB.h 2014-05-08 22:38:03.686112523 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniPolicy.h omniORB-4.2.0-new/include/omniORB4/omniPolicy.h
+--- omniORB-4.2.0/include/omniORB4/omniPolicy.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniPolicy.h 2014-05-08 22:38:03.689112590 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniServant.h omniORB-4.2.0-new/include/omniORB4/omniServant.h
+--- omniORB-4.2.0/include/omniORB4/omniServant.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniServant.h 2014-05-08 22:38:03.620111053 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniServer.h omniORB-4.2.0-new/include/omniORB4/omniServer.h
+--- omniORB-4.2.0/include/omniORB4/omniServer.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniServer.h 2014-05-08 22:38:03.696112746 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniTransport.h omniORB-4.2.0-new/include/omniORB4/omniTransport.h
+--- omniORB-4.2.0/include/omniORB4/omniTransport.h 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniTransport.h 2014-05-08 22:38:03.671112189 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniURI.h omniORB-4.2.0-new/include/omniORB4/omniURI.h
+--- omniORB-4.2.0/include/omniORB4/omniURI.h 2010-08-10 19:20:21.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniURI.h 2014-05-08 22:38:03.612110875 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniutilities.h omniORB-4.2.0-new/include/omniORB4/omniutilities.h
+--- omniORB-4.2.0/include/omniORB4/omniutilities.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniutilities.h 2014-05-08 22:38:03.697112768 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniZIOP.h omniORB-4.2.0-new/include/omniORB4/omniZIOP.h
+--- omniORB-4.2.0/include/omniORB4/omniZIOP.h 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/omniZIOP.h 2014-05-08 22:38:03.685112501 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP support
+diff -rupN omniORB-4.2.0/include/omniORB4/optionalFeatures.h omniORB-4.2.0-new/include/omniORB4/optionalFeatures.h
+--- omniORB-4.2.0/include/omniORB4/optionalFeatures.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/optionalFeatures.h 2014-05-08 22:38:03.679112367 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/poa_defs.h omniORB-4.2.0-new/include/omniORB4/poa_defs.h
+--- omniORB-4.2.0/include/omniORB4/poa_defs.h 2012-02-24 11:45:34.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/poa_defs.h 2014-05-08 22:38:03.661111966 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/include/omniORB4/poa.h omniORB-4.2.0-new/include/omniORB4/poa.h
+--- omniORB-4.2.0/include/omniORB4/poa.h 2012-02-24 11:45:34.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/poa.h 2014-05-08 22:38:03.702112879 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/poa_poa.h omniORB-4.2.0-new/include/omniORB4/poa_poa.h
+--- omniORB-4.2.0/include/omniORB4/poa_poa.h 2012-02-24 11:45:34.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/poa_poa.h 2014-05-08 22:38:03.690112612 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/proxyFactory.h omniORB-4.2.0-new/include/omniORB4/proxyFactory.h
+--- omniORB-4.2.0/include/omniORB4/proxyFactory.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/proxyFactory.h 2014-05-08 22:38:03.695112723 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/seqTemplatedecls.h omniORB-4.2.0-new/include/omniORB4/seqTemplatedecls.h
+--- omniORB-4.2.0/include/omniORB4/seqTemplatedecls.h 2009-08-28 13:11:24.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/seqTemplatedecls.h 2014-05-08 22:38:03.625111165 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/seqTemplatedefns.h omniORB-4.2.0-new/include/omniORB4/seqTemplatedefns.h
+--- omniORB-4.2.0/include/omniORB4/seqTemplatedefns.h 2009-08-28 13:11:24.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/seqTemplatedefns.h 2014-05-08 22:38:03.699112813 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/sslContext.h omniORB-4.2.0-new/include/omniORB4/sslContext.h
+--- omniORB-4.2.0/include/omniORB4/sslContext.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/sslContext.h 2014-05-08 22:38:03.672112211 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/streamOperators.h omniORB-4.2.0-new/include/omniORB4/streamOperators.h
+--- omniORB-4.2.0/include/omniORB4/streamOperators.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/streamOperators.h 2014-05-08 22:38:03.614110919 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/stringtypes.h omniORB-4.2.0-new/include/omniORB4/stringtypes.h
+--- omniORB-4.2.0/include/omniORB4/stringtypes.h 2013-01-11 18:47:52.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/stringtypes.h 2014-05-08 22:38:03.670112167 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/templatedecls.h omniORB-4.2.0-new/include/omniORB4/templatedecls.h
+--- omniORB-4.2.0/include/omniORB4/templatedecls.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/templatedecls.h 2014-05-08 22:38:03.684112479 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/templatedefns.h omniORB-4.2.0-new/include/omniORB4/templatedefns.h
+--- omniORB-4.2.0/include/omniORB4/templatedefns.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/templatedefns.h 2014-05-08 22:38:03.663112011 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/tracedthread.h omniORB-4.2.0-new/include/omniORB4/tracedthread.h
+--- omniORB-4.2.0/include/omniORB4/tracedthread.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/tracedthread.h 2014-05-08 22:38:03.611110853 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/userexception.h omniORB-4.2.0-new/include/omniORB4/userexception.h
+--- omniORB-4.2.0/include/omniORB4/userexception.h 2011-01-06 15:39:47.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/userexception.h 2014-05-08 22:38:03.680112389 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/valueFactoryManager.h omniORB-4.2.0-new/include/omniORB4/valueFactoryManager.h
+--- omniORB-4.2.0/include/omniORB4/valueFactoryManager.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/valueFactoryManager.h 2014-05-08 22:38:03.673112233 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/valueTemplatedecls.h omniORB-4.2.0-new/include/omniORB4/valueTemplatedecls.h
+--- omniORB-4.2.0/include/omniORB4/valueTemplatedecls.h 2009-09-22 18:42:11.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/valueTemplatedecls.h 2014-05-08 22:38:03.692112657 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/valueTemplatedefns.h omniORB-4.2.0-new/include/omniORB4/valueTemplatedefns.h
+--- omniORB-4.2.0/include/omniORB4/valueTemplatedefns.h 2009-08-28 13:11:24.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/valueTemplatedefns.h 2014-05-08 22:38:03.620111053 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/valueType.h omniORB-4.2.0-new/include/omniORB4/valueType.h
+--- omniORB-4.2.0/include/omniORB4/valueType.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/valueType.h 2014-05-08 22:38:03.681112411 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/wstringtypes.h omniORB-4.2.0-new/include/omniORB4/wstringtypes.h
+--- omniORB-4.2.0/include/omniORB4/wstringtypes.h 2013-01-11 18:47:52.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/wstringtypes.h 2014-05-08 22:38:03.705112947 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/ziopStubs.h omniORB-4.2.0-new/include/omniORB4/ziopStubs.h
+--- omniORB-4.2.0/include/omniORB4/ziopStubs.h 2013-07-24 15:24:12.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/ziopStubs.h 2014-05-08 22:38:03.667112100 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP stubs
+diff -rupN omniORB-4.2.0/include/omnithread/atomic.h omniORB-4.2.0-new/include/omnithread/atomic.h
+--- omniORB-4.2.0/include/omnithread/atomic.h 2012-08-16 11:49:19.000000000 +0200
++++ omniORB-4.2.0-new/include/omnithread/atomic.h 2014-05-08 22:38:03.707112991 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ //
+diff -rupN omniORB-4.2.0/include/omnithread/nt.h omniORB-4.2.0-new/include/omnithread/nt.h
+--- omniORB-4.2.0/include/omnithread/nt.h 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/include/omnithread/nt.h 2014-05-08 22:38:03.707112991 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // OMNI thread implementation classes for NT threads.
+diff -rupN omniORB-4.2.0/include/omnithread/posix.h omniORB-4.2.0-new/include/omnithread/posix.h
+--- omniORB-4.2.0/include/omnithread/posix.h 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/include/omnithread/posix.h 2014-05-08 22:38:03.707112991 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // OMNI thread implementation classes for posix threads
+diff -rupN omniORB-4.2.0/include/omnithread/pthread_nt.h omniORB-4.2.0-new/include/omnithread/pthread_nt.h
+--- omniORB-4.2.0/include/omnithread/pthread_nt.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omnithread/pthread_nt.h 2014-05-08 22:38:03.708113013 +0200
+@@ -17,8 +17,8 @@
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+- 02111-1307, USA
++ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ 02110-1301, USA
+
+ Posix Threads implementation for Windows NT, version 4.0
+ */
+diff -rupN omniORB-4.2.0/include/omnithread.h omniORB-4.2.0-new/include/omnithread.h
+--- omniORB-4.2.0/include/omnithread.h 2013-02-12 23:52:55.000000000 +0100
++++ omniORB-4.2.0-new/include/omnithread.h 2014-05-08 22:38:03.709113035 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ //
+diff -rupN omniORB-4.2.0/src/appl/omniMapper/omniMapper.cc omniORB-4.2.0-new/src/appl/omniMapper/omniMapper.cc
+--- omniORB-4.2.0/src/appl/omniMapper/omniMapper.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/appl/omniMapper/omniMapper.cc 2014-05-08 22:38:03.497108314 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+
+ #include <omniORB4/CORBA.h>
+ #include <stdlib.h>
+diff -rupN omniORB-4.2.0/src/appl/omniNames/BindingIterator_i.h omniORB-4.2.0-new/src/appl/omniNames/BindingIterator_i.h
+--- omniORB-4.2.0/src/appl/omniNames/BindingIterator_i.h 2013-02-22 17:42:44.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/BindingIterator_i.h 2014-05-08 22:38:03.499108359 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/INSMapper.h omniORB-4.2.0-new/src/appl/omniNames/INSMapper.h
+--- omniORB-4.2.0/src/appl/omniNames/INSMapper.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/appl/omniNames/INSMapper.h 2014-05-08 22:38:03.506108514 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/log.cc omniORB-4.2.0-new/src/appl/omniNames/log.cc
+--- omniORB-4.2.0/src/appl/omniNames/log.cc 2014-03-11 16:59:44.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/log.cc 2014-05-08 22:38:03.503108447 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/log.h omniORB-4.2.0-new/src/appl/omniNames/log.h
+--- omniORB-4.2.0/src/appl/omniNames/log.h 2013-02-22 17:42:44.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/log.h 2014-05-08 22:38:03.499108359 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/NamingContext_i.cc omniORB-4.2.0-new/src/appl/omniNames/NamingContext_i.cc
+--- omniORB-4.2.0/src/appl/omniNames/NamingContext_i.cc 2013-02-22 17:42:44.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/NamingContext_i.cc 2014-05-08 22:38:03.500108380 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/NamingContext_i.h omniORB-4.2.0-new/src/appl/omniNames/NamingContext_i.h
+--- omniORB-4.2.0/src/appl/omniNames/NamingContext_i.h 2013-02-22 17:42:44.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/NamingContext_i.h 2014-05-08 22:38:03.504108469 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/ObjectBinding.h omniORB-4.2.0-new/src/appl/omniNames/ObjectBinding.h
+--- omniORB-4.2.0/src/appl/omniNames/ObjectBinding.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/ObjectBinding.h 2014-05-08 22:38:03.505108492 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/omniNames.cc omniORB-4.2.0-new/src/appl/omniNames/omniNames.cc
+--- omniORB-4.2.0/src/appl/omniNames/omniNames.cc 2013-04-12 17:35:37.000000000 +0200
++++ omniORB-4.2.0-new/src/appl/omniNames/omniNames.cc 2014-05-08 22:38:03.499108359 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/omniNames.h omniORB-4.2.0-new/src/appl/omniNames/omniNames.h
+--- omniORB-4.2.0/src/appl/omniNames/omniNames.h 2013-02-22 17:42:44.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/omniNames.h 2014-05-08 22:38:03.504108469 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/omniNamesWin.cc omniORB-4.2.0-new/src/appl/omniNames/omniNamesWin.cc
+--- omniORB-4.2.0/src/appl/omniNames/omniNamesWin.cc 2013-12-20 12:34:45.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/omniNamesWin.cc 2014-05-08 22:38:03.506108514 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/ReadersWritersLock.h omniORB-4.2.0-new/src/appl/omniNames/ReadersWritersLock.h
+--- omniORB-4.2.0/src/appl/omniNames/ReadersWritersLock.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/ReadersWritersLock.h 2014-05-08 22:38:03.504108469 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/utils/catior/catior.cc omniORB-4.2.0-new/src/appl/utils/catior/catior.cc
+--- omniORB-4.2.0/src/appl/utils/catior/catior.cc 2013-10-29 19:17:16.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/utils/catior/catior.cc 2014-05-08 22:38:03.493108224 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+ //
+diff -rupN omniORB-4.2.0/src/appl/utils/convertior/convertior.cc omniORB-4.2.0-new/src/appl/utils/convertior/convertior.cc
+--- omniORB-4.2.0/src/appl/utils/convertior/convertior.cc 2009-05-28 11:30:13.000000000 +0200
++++ omniORB-4.2.0-new/src/appl/utils/convertior/convertior.cc 2014-05-08 22:38:03.489108136 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+ //
+diff -rupN omniORB-4.2.0/src/appl/utils/genior/genior.cc omniORB-4.2.0-new/src/appl/utils/genior/genior.cc
+--- omniORB-4.2.0/src/appl/utils/genior/genior.cc 2009-05-28 11:30:13.000000000 +0200
++++ omniORB-4.2.0-new/src/appl/utils/genior/genior.cc 2014-05-08 22:38:03.494108246 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+ //
+diff -rupN omniORB-4.2.0/src/appl/utils/nameclt/nameclt.cc omniORB-4.2.0-new/src/appl/utils/nameclt/nameclt.cc
+--- omniORB-4.2.0/src/appl/utils/nameclt/nameclt.cc 2005-06-08 11:35:37.000000000 +0200
++++ omniORB-4.2.0-new/src/appl/utils/nameclt/nameclt.cc 2014-05-08 22:38:03.496108291 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/codesets/cs-037.cc omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-037.cc
+--- omniORB-4.2.0/src/lib/omniORB/codesets/cs-037.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-037.cc 2014-05-08 22:38:03.376105619 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/codesets/cs-500.cc omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-500.cc
+--- omniORB-4.2.0/src/lib/omniORB/codesets/cs-500.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-500.cc 2014-05-08 22:38:03.356105173 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/codesets/cs-EDF-4.cc omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-EDF-4.cc
+--- omniORB-4.2.0/src/lib/omniORB/codesets/cs-EDF-4.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-EDF-4.cc 2014-05-08 22:38:03.392105975 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/codesets/cs-UCS-4.cc omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-UCS-4.cc
+--- omniORB-4.2.0/src/lib/omniORB/codesets/cs-UCS-4.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-UCS-4.cc 2014-05-08 22:38:03.386105841 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/codesets/omniCodeSets.cc omniORB-4.2.0-new/src/lib/omniORB/codesets/omniCodeSets.cc
+--- omniORB-4.2.0/src/lib/omniORB/codesets/omniCodeSets.cc 2008-08-08 20:45:49.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/codesets/omniCodeSets.cc 2014-05-08 22:38:03.385105819 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/connections/dataStub.cc omniORB-4.2.0-new/src/lib/omniORB/connections/dataStub.cc
+--- omniORB-4.2.0/src/lib/omniORB/connections/dataStub.cc 2006-07-18 18:21:26.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/connections/dataStub.cc 2014-05-08 22:38:03.395106042 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // omniidl generated stub file
+diff -rupN omniORB-4.2.0/src/lib/omniORB/connections/omniConnectionMgmt.cc omniORB-4.2.0-new/src/lib/omniORB/connections/omniConnectionMgmt.cc
+--- omniORB-4.2.0/src/lib/omniORB/connections/omniConnectionMgmt.cc 2014-02-24 17:34:36.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/connections/omniConnectionMgmt.cc 2014-05-08 22:38:03.395106042 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // Proprietary omniORB connection management API
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/abstractBase.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/abstractBase.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/abstractBase.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/abstractBase.cc 2014-05-08 22:38:03.430106822 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/ami.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/ami.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/ami.cc 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/ami.cc 2014-05-08 22:38:03.397106086 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/any.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/any.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/any.cc 2013-12-31 00:22:49.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/any.cc 2014-05-08 22:38:03.406106287 +0200
+@@ -22,8 +22,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/anyStream.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/anyStream.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/anyStream.cc 2013-04-30 19:22:28.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/anyStream.cc 2014-05-08 22:38:03.398106109 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/bootstrapdynstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/bootstrapdynstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/bootstrapdynstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/bootstrapdynstub.cc 2014-05-08 22:38:03.436106955 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/boxes.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/boxes.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/boxes.cc 2005-01-17 15:33:25.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/boxes.cc 2014-05-08 22:38:03.433106888 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #include <omniORB4/CORBA.h>
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/constants.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/constants.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/constants.cc 2009-08-28 13:09:39.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/constants.cc 2014-05-08 22:38:03.429106800 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/context.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/context.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/context.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/context.cc 2014-05-08 22:38:03.423106666 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/contextList.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/contextList.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/contextList.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/contextList.cc 2014-05-08 22:38:03.430106822 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/corbaidldynstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/corbaidldynstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/corbaidldynstub.cc 2004-07-23 12:31:47.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/corbaidldynstub.cc 2014-05-08 22:38:03.398106109 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/corbaidlstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/corbaidlstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/corbaidlstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/corbaidlstub.cc 2014-05-08 22:38:03.401106176 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/dynamicImplementation.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynamicImplementation.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/dynamicImplementation.cc 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynamicImplementation.cc 2014-05-08 22:38:03.452107312 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/dynamicLib.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynamicLib.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/dynamicLib.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynamicLib.cc 2014-05-08 22:38:03.437106978 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/dynAny.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynAny.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/dynAny.cc 2013-02-08 23:28:33.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynAny.cc 2014-05-08 22:38:03.449107244 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/dynAnyNil.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynAnyNil.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/dynAnyNil.cc 2005-01-06 17:39:25.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynAnyNil.cc 2014-05-08 22:38:03.435106933 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/dynException.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynException.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/dynException.cc 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynException.cc 2014-05-08 22:38:03.432106865 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/environment.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/environment.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/environment.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/environment.cc 2014-05-08 22:38:03.399106131 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/exceptionList.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/exceptionList.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/exceptionList.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/exceptionList.cc 2014-05-08 22:38:03.450107267 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/ir.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/ir.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/ir.cc 2005-11-09 13:22:18.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/ir.cc 2014-05-08 22:38:03.397106086 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/irdynstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/irdynstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/irdynstub.cc 2004-07-23 12:31:47.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/irdynstub.cc 2014-05-08 22:38:03.421106621 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/irstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/irstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/irstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/irstub.cc 2014-05-08 22:38:03.426106732 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/messagingstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/messagingstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/messagingstub.cc 2012-08-16 11:49:19.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/messagingstub.cc 2014-05-08 22:38:03.399106131 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #include <omniORB4/CORBA.h>
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/namedValue.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/namedValue.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/namedValue.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/namedValue.cc 2014-05-08 22:38:03.431106844 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/Namingdynstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/Namingdynstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/Namingdynstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/Namingdynstub.cc 2014-05-08 22:38:03.398106109 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/nvList.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/nvList.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/nvList.cc 2005-07-21 11:09:22.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/nvList.cc 2014-05-08 22:38:03.433106888 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/omniTypedefs.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/omniTypedefs.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/omniTypedefs.cc 2005-01-17 15:44:47.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/omniTypedefs.cc 2014-05-08 22:38:03.432106865 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #define USE_core_stub_in_nt_dll
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/orbMultiRequest.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/orbMultiRequest.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/orbMultiRequest.cc 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/orbMultiRequest.cc 2014-05-08 22:38:03.437106978 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/poastub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/poastub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/poastub.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/poastub.cc 2014-05-08 22:38:03.450107267 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/policy.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/policy.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/policy.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/policy.cc 2014-05-08 22:38:03.402106198 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/pollablestub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/pollablestub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/pollablestub.cc 2011-02-09 15:36:20.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/pollablestub.cc 2014-05-08 22:38:03.451107289 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #include <omniORB4/CORBA.h>
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/pseudoBase.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/pseudoBase.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/pseudoBase.cc 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/pseudoBase.cc 2014-05-08 22:38:03.426106732 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/request.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/request.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/request.cc 2013-12-31 00:23:27.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/request.cc 2014-05-08 22:38:03.428106777 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/serverRequest.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/serverRequest.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/serverRequest.cc 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/serverRequest.cc 2014-05-08 22:38:03.437106978 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/tcParser.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/tcParser.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/tcParser.cc 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/tcParser.cc 2014-05-08 22:38:03.425106710 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/typecode.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/typecode.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/typecode.cc 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/typecode.cc 2014-05-08 22:38:03.421106621 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/unknownUserExn.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/unknownUserExn.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/unknownUserExn.cc 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/unknownUserExn.cc 2014-05-08 22:38:03.403106219 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/unknownValue.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/unknownValue.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/unknownValue.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/unknownValue.cc 2014-05-08 22:38:03.423106666 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/valueBase.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueBase.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/valueBase.cc 2012-02-24 11:43:54.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueBase.cc 2014-05-08 22:38:03.398106109 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ValueBase implementation
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/valueFactory.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueFactory.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/valueFactory.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueFactory.cc 2014-05-08 22:38:03.401106176 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/valueTracker.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueTracker.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/valueTracker.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueTracker.cc 2014-05-08 22:38:03.429106800 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/valueType.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueType.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/valueType.cc 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueType.cc 2014-05-08 22:38:03.400106154 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/anonObject.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/anonObject.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/anonObject.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/anonObject.cc 2014-05-08 22:38:03.279103458 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/bootstrapstub.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/bootstrapstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/bootstrapstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/bootstrapstub.cc 2014-05-08 22:38:03.252102857 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/callDescriptor.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/callDescriptor.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/callDescriptor.cc 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/callDescriptor.cc 2014-05-08 22:38:03.309104126 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/callHandle.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/callHandle.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/callHandle.cc 2013-05-23 13:54:43.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/callHandle.cc 2014-05-08 22:38:03.323104439 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cdrMemoryStream.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrMemoryStream.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cdrMemoryStream.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrMemoryStream.cc 2014-05-08 22:38:03.297103860 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cdrStreamAdapter.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrStreamAdapter.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cdrStreamAdapter.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrStreamAdapter.cc 2014-05-08 22:38:03.296103837 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cdrStream.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrStream.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cdrStream.cc 2013-08-29 13:57:56.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrStream.cc 2014-05-08 22:38:03.261103057 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cdrValueChunkStream.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrValueChunkStream.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cdrValueChunkStream.cc 2012-08-24 11:49:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrValueChunkStream.cc 2014-05-08 22:38:03.346104951 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/codeSets.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/codeSets.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/codeSets.cc 2013-02-22 18:11:37.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/codeSets.cc 2014-05-08 22:38:03.290103704 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/constants.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/constants.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/constants.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/constants.cc 2014-05-08 22:38:03.310104148 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/corbaBoa.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaBoa.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/corbaBoa.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaBoa.cc 2014-05-08 22:38:03.322104417 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/corbaFixed.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaFixed.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/corbaFixed.cc 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaFixed.cc 2014-05-08 22:38:03.240102590 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/corbaObject.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaObject.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/corbaObject.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaObject.cc 2014-05-08 22:38:03.247102745 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // Implementation of the CORBA::Object interface.
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/corbaOrb.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaOrb.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/corbaOrb.cc 2013-02-12 23:58:10.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaOrb.cc 2014-05-08 22:38:03.336104728 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/corbaString.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaString.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/corbaString.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaString.cc 2014-05-08 22:38:03.336104728 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/corbaWString.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaWString.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/corbaWString.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaWString.cc 2014-05-08 22:38:03.329104572 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cs-16bit.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-16bit.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cs-16bit.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-16bit.cc 2014-05-08 22:38:03.343104883 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cs-8859-1.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-8859-1.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cs-8859-1.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-8859-1.cc 2014-05-08 22:38:03.318104326 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cs-8bit.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-8bit.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cs-8bit.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-8bit.cc 2014-05-08 22:38:03.303103993 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cs-UTF-16.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-UTF-16.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cs-UTF-16.cc 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-UTF-16.cc 2014-05-08 22:38:03.330104595 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cs-UTF-8.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-UTF-8.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cs-UTF-8.cc 2014-01-06 17:39:52.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-UTF-8.cc 2014-05-08 22:38:03.281103503 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/current.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/current.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/current.cc 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/current.cc 2014-05-08 22:38:03.301103948 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/dynamicLib.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/dynamicLib.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/dynamicLib.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/dynamicLib.cc 2014-05-08 22:38:03.332104639 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/exception.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/exception.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/exception.cc 2014-03-11 17:11:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/exception.cc 2014-05-08 22:38:03.308104104 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/exceptn.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/exceptn.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/exceptn.cc 2011-05-20 17:07:01.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/exceptn.cc 2014-05-08 22:38:03.355105151 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopBiDir.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopBiDir.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopBiDir.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopBiDir.cc 2014-05-08 22:38:03.312104194 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/GIOP_C.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/GIOP_C.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/GIOP_C.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/GIOP_C.cc 2014-05-08 22:38:03.238102544 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopEndpoint.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopEndpoint.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopEndpoint.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopEndpoint.cc 2014-05-08 22:38:03.303103993 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopImpl10.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopImpl10.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopImpl10.cc 2013-11-11 23:31:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopImpl10.cc 2014-05-08 22:38:03.265103146 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopImpl11.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopImpl11.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopImpl11.cc 2013-11-11 23:31:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopImpl11.cc 2014-05-08 22:38:03.307104082 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopImpl12.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopImpl12.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopImpl12.cc 2014-03-17 12:07:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopImpl12.cc 2014-05-08 22:38:03.260103036 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopMonitor.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopMonitor.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopMonitor.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopMonitor.cc 2014-05-08 22:38:03.343104883 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopRendezvouser.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopRendezvouser.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopRendezvouser.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopRendezvouser.cc 2014-05-08 22:38:03.296103837 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopRope.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopRope.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopRope.cc 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopRope.cc 2014-05-08 22:38:03.236102501 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/GIOP_S.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/GIOP_S.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/GIOP_S.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/GIOP_S.cc 2014-05-08 22:38:03.354105128 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopServer.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopServer.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopServer.cc 2014-04-17 18:32:49.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopServer.cc 2014-05-08 22:38:03.271103280 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopStrand.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopStrand.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopStrand.cc 2013-11-11 23:31:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopStrand.cc 2014-05-08 22:38:03.348104995 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #include <omniORB4/CORBA.h>
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopStream.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopStream.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopStream.cc 2013-11-11 16:09:09.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopStream.cc 2014-05-08 22:38:03.339104795 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopStreamImpl.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopStreamImpl.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopStreamImpl.cc 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopStreamImpl.cc 2014-05-08 22:38:03.249102790 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopWorker.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopWorker.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopWorker.cc 2013-02-12 23:58:10.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopWorker.cc 2014-05-08 22:38:03.322104417 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/initRefs.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/initRefs.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/initRefs.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/initRefs.cc 2014-05-08 22:38:03.254102901 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/inProcessIdentity.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/inProcessIdentity.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/inProcessIdentity.cc 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/inProcessIdentity.cc 2014-05-08 22:38:03.310104148 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/interceptors.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/interceptors.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/interceptors.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/interceptors.cc 2014-05-08 22:38:03.324104460 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/invoker.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/invoker.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/invoker.cc 2014-03-11 17:00:27.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/invoker.cc 2014-05-08 22:38:03.251102835 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // *** PROPRIETARY INTERFACE ***
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ior.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ior.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ior.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ior.cc 2014-05-08 22:38:03.300103926 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/libcWrapper.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/libcWrapper.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/libcWrapper.cc 2010-11-03 12:22:32.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/libcWrapper.cc 2014-05-08 22:38:03.316104282 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/localIdentity.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/localIdentity.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/localIdentity.cc 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/localIdentity.cc 2014-05-08 22:38:03.323104439 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/localObject.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/localObject.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/localObject.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/localObject.cc 2014-05-08 22:38:03.246102723 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/logIOstream.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/logIOstream.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/logIOstream.cc 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/logIOstream.cc 2014-05-08 22:38:03.319104349 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/minorCode.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/minorCode.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/minorCode.cc 2011-02-09 15:36:20.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/minorCode.cc 2014-05-08 22:38:03.247102745 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/msvcdllstub.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/msvcdllstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/msvcdllstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/msvcdllstub.cc 2014-05-08 22:38:03.346104951 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/Namingstub.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/Namingstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/Namingstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/Namingstub.cc 2014-05-08 22:38:03.319104349 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/objectAdapter.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/objectAdapter.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/objectAdapter.cc 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/objectAdapter.cc 2014-05-08 22:38:03.350105039 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/objectStub.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/objectStub.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/objectStub.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/objectStub.cc 2014-05-08 22:38:03.331104617 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniIdentity.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniIdentity.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniIdentity.cc 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniIdentity.cc 2014-05-08 22:38:03.254102901 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniInternal.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniInternal.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniInternal.cc 2013-07-08 14:46:13.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniInternal.cc 2014-05-08 22:38:03.328104550 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniIOR.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniIOR.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniIOR.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniIOR.cc 2014-05-08 22:38:03.329104572 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniObjRef.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniObjRef.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniObjRef.cc 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniObjRef.cc 2014-05-08 22:38:03.315104260 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #include <omniORB4/CORBA.h>
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniORB.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniORB.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniORB.cc 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniORB.cc 2014-05-08 22:38:03.331104617 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniPolicy.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniPolicy.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniPolicy.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniPolicy.cc 2014-05-08 22:38:03.356105173 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniServant.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniServant.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniServant.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniServant.cc 2014-05-08 22:38:03.332104639 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniTransport.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniTransport.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniTransport.cc 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniTransport.cc 2014-05-08 22:38:03.291103725 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/orbOptions.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/orbOptions.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/orbOptions.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/orbOptions.cc 2014-05-08 22:38:03.317104304 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/orbOptionsFile.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/orbOptionsFile.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/orbOptionsFile.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/orbOptionsFile.cc 2014-05-08 22:38:03.343104883 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/orbOptionsReg.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/orbOptionsReg.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/orbOptionsReg.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/orbOptionsReg.cc 2014-05-08 22:38:03.245102701 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/poa.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/poa.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/poa.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/poa.cc 2014-05-08 22:38:03.279103458 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/poamanager.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/poamanager.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/poamanager.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/poamanager.cc 2014-05-08 22:38:03.255102923 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/poastubs.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/poastubs.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/poastubs.cc 2013-03-07 12:08:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/poastubs.cc 2014-05-08 22:38:03.342104861 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/policy.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/policy.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/policy.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/policy.cc 2014-05-08 22:38:03.289103681 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/portableserver.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/portableserver.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/portableserver.cc 2013-01-11 18:47:52.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/portableserver.cc 2014-05-08 22:38:03.252102857 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/proxyFactory.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/proxyFactory.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/proxyFactory.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/proxyFactory.cc 2014-05-08 22:38:03.344104906 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/remoteIdentity.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/remoteIdentity.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/remoteIdentity.cc 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/remoteIdentity.cc 2014-05-08 22:38:03.237102522 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/rmutex.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/rmutex.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/rmutex.cc 2005-07-08 19:04:59.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/rmutex.cc 2014-05-08 22:38:03.349105017 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/shutdownIdentity.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/shutdownIdentity.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/shutdownIdentity.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/shutdownIdentity.cc 2014-05-08 22:38:03.261103057 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/SocketCollection.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/SocketCollection.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/SocketCollection.cc 2013-02-22 18:13:56.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/SocketCollection.cc 2014-05-08 22:38:03.295103815 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc 2014-05-08 22:38:03.288103659 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslActive.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslActive.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslActive.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslActive.cc 2014-05-08 22:38:03.283103547 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslAddress.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslAddress.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslAddress.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslAddress.cc 2014-05-08 22:38:03.286103614 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslAddress.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslAddress.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslAddress.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslAddress.h 2014-05-08 22:38:03.284103569 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslConnection.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslConnection.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslConnection.cc 2014-04-03 12:58:32.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslConnection.cc 2014-05-08 22:38:03.287103636 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslConnection.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslConnection.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslConnection.h 2013-04-12 17:35:37.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslConnection.h 2014-05-08 22:38:03.285103591 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslContext.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslContext.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslContext.cc 2013-04-12 17:35:37.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslContext.cc 2014-05-08 22:38:03.284103569 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc 2013-04-12 17:35:37.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc 2014-05-08 22:38:03.282103525 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslEndpoint.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslEndpoint.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslEndpoint.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslEndpoint.h 2014-05-08 22:38:03.283103547 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc 2014-05-08 22:38:03.288103659 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h 2014-05-08 22:38:03.285103591 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpActive.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpActive.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpActive.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpActive.cc 2014-05-08 22:38:03.232102412 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpAddress.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpAddress.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpAddress.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpAddress.cc 2014-05-08 22:38:03.231102389 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpAddress.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpAddress.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpAddress.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpAddress.h 2014-05-08 22:38:03.234102457 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpConnection.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpConnection.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpConnection.cc 2013-02-22 18:13:56.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpConnection.cc 2014-05-08 22:38:03.230102366 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpConnection.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpConnection.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpConnection.h 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpConnection.h 2014-05-08 22:38:03.232102412 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc 2013-04-12 17:35:37.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc 2014-05-08 22:38:03.231102389 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h 2010-08-10 19:20:21.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h 2014-05-08 22:38:03.234102457 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc 2014-05-08 22:38:03.233102434 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h 2014-05-08 22:38:03.234102457 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcpSocket.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcpSocket.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcpSocket.cc 2014-04-17 18:32:49.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcpSocket.cc 2014-05-08 22:38:03.352105084 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tracedthread.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tracedthread.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tracedthread.cc 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tracedthread.cc 2014-05-08 22:38:03.355105151 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/transportRules.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/transportRules.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/transportRules.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/transportRules.cc 2014-05-08 22:38:03.334104683 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixActive.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixActive.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixActive.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixActive.cc 2014-05-08 22:38:03.241102612 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixAddress.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixAddress.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixAddress.cc 2013-03-07 12:08:37.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixAddress.cc 2014-05-08 22:38:03.242102635 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixAddress.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixAddress.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixAddress.h 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixAddress.h 2014-05-08 22:38:03.243102657 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixConnection.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixConnection.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixConnection.cc 2013-02-22 18:13:56.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixConnection.cc 2014-05-08 22:38:03.244102679 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixConnection.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixConnection.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixConnection.h 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixConnection.h 2014-05-08 22:38:03.242102635 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixEndpoint.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixEndpoint.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixEndpoint.cc 2013-02-22 18:13:56.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixEndpoint.cc 2014-05-08 22:38:03.243102657 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixEndpoint.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixEndpoint.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixEndpoint.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixEndpoint.h 2014-05-08 22:38:03.244102679 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc 2014-05-08 22:38:03.241102612 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixTransportImpl.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixTransportImpl.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixTransportImpl.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixTransportImpl.h 2014-05-08 22:38:03.241102612 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/uri.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/uri.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/uri.cc 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/uri.cc 2014-05-08 22:38:03.267103191 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/ast.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/ast.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/ast.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/ast.py 2014-05-08 22:38:03.172101075 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/call.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/call.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/call.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/call.py 2014-05-08 22:38:03.176101164 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce local callback functions
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/config.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/config.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/config.py 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/config.py 2014-05-08 22:38:03.150100585 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/cxx.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/cxx.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/cxx.py 2012-02-16 00:31:07.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/cxx.py 2014-05-08 22:38:03.176101164 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/descriptor.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/descriptor.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/descriptor.py 2012-02-16 00:31:07.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/descriptor.py 2014-05-08 22:38:03.166100941 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce internal descriptors
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/__init__.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/__init__.py 2014-05-08 22:38:03.179101231 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/main.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/main.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/main.py 2014-05-08 22:38:03.182101297 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """Produce the main dynamic skeleton definitions"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/template.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/template.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/template.py 2014-05-08 22:38:03.178101209 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """C++ templates for the DynSK.cc file"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/typecode.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/typecode.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/typecode.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/typecode.py 2014-05-08 22:38:03.181101275 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """Produces the instances of CORBA::TypeCode"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/defs.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/defs.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/defs.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/defs.py 2014-05-08 22:38:03.157100742 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/forward.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/forward.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/forward.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/forward.py 2014-05-08 22:38:03.158100764 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/__init__.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/__init__.py 2014-05-08 22:38:03.165100919 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/marshal.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/marshal.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/marshal.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/marshal.py 2014-05-08 22:38:03.165100919 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/obv.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/obv.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/obv.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/obv.py 2014-05-08 22:38:03.163100875 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/opers.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/opers.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/opers.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/opers.py 2014-05-08 22:38:03.164100897 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/poa.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/poa.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/poa.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/poa.py 2014-05-08 22:38:03.158100764 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/template.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/template.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/template.py 2014-05-08 22:38:03.162100852 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """C++ templates for the .hh file"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/tie.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/tie.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/tie.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/tie.py 2014-05-08 22:38:03.163100875 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/id.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/id.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/id.py 2012-02-08 11:23:05.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/id.py 2014-05-08 22:38:03.153100651 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/iface.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/iface.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/iface.py 2013-08-29 13:57:56.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/iface.py 2014-05-08 22:38:03.152100629 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/impl/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/impl/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/impl/__init__.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/impl/__init__.py 2014-05-08 22:38:03.146100496 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/impl/main.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/impl/main.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/impl/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/impl/main.py 2014-05-08 22:38:03.147100518 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """Produce example interface implementations"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/impl/template.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/impl/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/impl/template.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/impl/template.py 2014-05-08 22:38:03.146100496 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/__init__.py 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/__init__.py 2014-05-08 22:38:03.173101097 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/mangler.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/mangler.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/mangler.py 2012-02-08 11:23:05.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/mangler.py 2014-05-08 22:38:03.173101097 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce mangled names for types and operation signatures
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/mapping.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/mapping.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/mapping.py 2003-10-23 13:25:55.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/mapping.py 2014-05-08 22:38:03.153100651 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Abstract base class for C++ type mappings
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/output.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/output.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/output.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/output.py 2014-05-08 22:38:03.172101075 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/__init__.py 2012-02-08 11:23:05.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/__init__.py 2014-05-08 22:38:03.169101008 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/main.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/main.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/main.py 2014-05-08 22:38:03.170101031 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/poa.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/poa.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/poa.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/poa.py 2014-05-08 22:38:03.166100941 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+
+ """Produce the main POA skeleton definitions"""
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/template.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/template.py 2013-08-29 13:57:56.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/template.py 2014-05-08 22:38:03.168100986 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """C++ templates for the SK.cc file"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skutil.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skutil.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skutil.py 2013-08-29 13:57:56.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skutil.py 2014-05-08 22:38:03.154100674 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/support.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/support.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/support.py 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/support.py 2014-05-08 22:38:03.177101187 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/types.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/types.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/types.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/types.py 2014-05-08 22:38:03.149100563 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/util.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/util.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/util.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/util.py 2014-05-08 22:38:03.171101053 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/value.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/value.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/value.py 2013-01-11 18:47:52.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/value.py 2014-05-08 22:38:03.145100473 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Implementation of ValueType / ValueBox mapping
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/ast.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/ast.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/ast.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/ast.py 2014-05-08 22:38:03.216102056 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/call.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/call.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/call.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/call.py 2014-05-08 22:38:03.220102144 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce local callback functions
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/config.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/config.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/config.py 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/config.py 2014-05-08 22:38:03.194101566 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/cxx.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/cxx.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/cxx.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/cxx.py 2014-05-08 22:38:03.221102166 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/descriptor.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/descriptor.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/descriptor.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/descriptor.py 2014-05-08 22:38:03.210101922 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce internal descriptors
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/__init__.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/__init__.py 2014-05-08 22:38:03.223102211 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/main.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/main.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/main.py 2014-05-08 22:38:03.226102278 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """Produce the main dynamic skeleton definitions"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/template.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/template.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/template.py 2014-05-08 22:38:03.223102211 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """C++ templates for the DynSK.cc file"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/typecode.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/typecode.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/typecode.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/typecode.py 2014-05-08 22:38:03.225102256 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """Produces the instances of CORBA::TypeCode"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/defs.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/defs.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/defs.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/defs.py 2014-05-08 22:38:03.202101744 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/forward.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/forward.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/forward.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/forward.py 2014-05-08 22:38:03.203101766 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/__init__.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/__init__.py 2014-05-08 22:38:03.209101900 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/marshal.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/marshal.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/marshal.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/marshal.py 2014-05-08 22:38:03.209101900 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/obv.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/obv.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/obv.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/obv.py 2014-05-08 22:38:03.207101855 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/opers.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/opers.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/opers.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/opers.py 2014-05-08 22:38:03.208101877 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/poa.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/poa.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/poa.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/poa.py 2014-05-08 22:38:03.203101766 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/template.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/template.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/template.py 2014-05-08 22:38:03.206101832 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """C++ templates for the .hh file"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/tie.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/tie.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/tie.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/tie.py 2014-05-08 22:38:03.207101855 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/id.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/id.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/id.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/id.py 2014-05-08 22:38:03.198101654 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/iface.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/iface.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/iface.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/iface.py 2014-05-08 22:38:03.197101631 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/impl/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/impl/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/impl/__init__.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/impl/__init__.py 2014-05-08 22:38:03.190101476 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/impl/main.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/impl/main.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/impl/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/impl/main.py 2014-05-08 22:38:03.191101498 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """Produce example interface implementations"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/impl/template.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/impl/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/impl/template.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/impl/template.py 2014-05-08 22:38:03.190101476 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/__init__.py 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/__init__.py 2014-05-08 22:38:03.217102078 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/mangler.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/mangler.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/mangler.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/mangler.py 2014-05-08 22:38:03.218102100 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce mangled names for types and operation signatures
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/mapping.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/mapping.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/mapping.py 2003-10-23 13:25:55.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/mapping.py 2014-05-08 22:38:03.198101654 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Abstract base class for C++ type mappings
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/output.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/output.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/output.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/output.py 2014-05-08 22:38:03.216102056 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/__init__.py 2012-02-08 11:23:05.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/__init__.py 2014-05-08 22:38:03.213101988 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/main.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/main.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/main.py 2014-05-08 22:38:03.214102010 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/poa.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/poa.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/poa.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/poa.py 2014-05-08 22:38:03.210101922 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+
+ """Produce the main POA skeleton definitions"""
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/template.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/template.py 2013-08-29 13:57:56.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/template.py 2014-05-08 22:38:03.212101966 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """C++ templates for the SK.cc file"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skutil.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skutil.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skutil.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skutil.py 2014-05-08 22:38:03.199101677 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/support.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/support.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/support.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/support.py 2014-05-08 22:38:03.221102166 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/types.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/types.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/types.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/types.py 2014-05-08 22:38:03.194101566 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/util.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/util.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/util.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/util.py 2014-05-08 22:38:03.215102033 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/value.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/value.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/value.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/value.py 2014-05-08 22:38:03.189101453 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Implementation of ValueType / ValueBox mapping
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziop/messagingStubs.cc omniORB-4.2.0-new/src/lib/omniORB/ziop/messagingStubs.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziop/messagingStubs.cc 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/ziop/messagingStubs.cc 2014-05-08 22:38:03.453107334 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // Messaging stubs
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziop/omniZIOP.cc omniORB-4.2.0-new/src/lib/omniORB/ziop/omniZIOP.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziop/omniZIOP.cc 2013-07-24 15:24:12.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/ziop/omniZIOP.cc 2014-05-08 22:38:03.456107400 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP support
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziop/omniZIOPImpl.h omniORB-4.2.0-new/src/lib/omniORB/ziop/omniZIOPImpl.h
+--- omniORB-4.2.0/src/lib/omniORB/ziop/omniZIOPImpl.h 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/ziop/omniZIOPImpl.h 2014-05-08 22:38:03.453107334 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP support
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziop/ziopStubs.cc omniORB-4.2.0-new/src/lib/omniORB/ziop/ziopStubs.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziop/ziopStubs.cc 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/ziop/ziopStubs.cc 2014-05-08 22:38:03.452107312 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP stubs
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziop/zlibCompressor.cc omniORB-4.2.0-new/src/lib/omniORB/ziop/zlibCompressor.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziop/zlibCompressor.cc 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/ziop/zlibCompressor.cc 2014-05-08 22:38:03.457107423 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // zlib compressor
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziop/zlibCompressor.h omniORB-4.2.0-new/src/lib/omniORB/ziop/zlibCompressor.h
+--- omniORB-4.2.0/src/lib/omniORB/ziop/zlibCompressor.h 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/ziop/zlibCompressor.h 2014-05-08 22:38:03.454107356 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // zlib compressor
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziopdynamic/compressionDynStubs.cc omniORB-4.2.0-new/src/lib/omniORB/ziopdynamic/compressionDynStubs.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziopdynamic/compressionDynStubs.cc 2013-07-24 15:24:12.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/ziopdynamic/compressionDynStubs.cc 2014-05-08 22:38:03.229102344 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP dynamic stubs
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziopdynamic/omniZIOPDynamic.cc omniORB-4.2.0-new/src/lib/omniORB/ziopdynamic/omniZIOPDynamic.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziopdynamic/omniZIOPDynamic.cc 2013-07-24 15:24:12.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/ziopdynamic/omniZIOPDynamic.cc 2014-05-08 22:38:03.228102323 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP support that requires Any
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziopdynamic/ziopDynStubs.cc omniORB-4.2.0-new/src/lib/omniORB/ziopdynamic/ziopDynStubs.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziopdynamic/ziopDynStubs.cc 2013-07-24 15:24:12.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/ziopdynamic/ziopDynStubs.cc 2014-05-08 22:38:03.229102344 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP dynamic stubs
+diff -rupN omniORB-4.2.0/src/lib/omnithread/nt.cc omniORB-4.2.0-new/src/lib/omnithread/nt.cc
+--- omniORB-4.2.0/src/lib/omnithread/nt.cc 2010-03-01 16:59:18.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omnithread/nt.cc 2014-05-08 22:38:03.136100273 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ //
+diff -rupN omniORB-4.2.0/src/lib/omnithread/posix.cc omniORB-4.2.0-new/src/lib/omnithread/posix.cc
+--- omniORB-4.2.0/src/lib/omnithread/posix.cc 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omnithread/posix.cc 2014-05-08 22:38:03.133100207 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ //
+diff -rupN omniORB-4.2.0/src/lib/omnithread/threaddata.cc omniORB-4.2.0-new/src/lib/omnithread/threaddata.cc
+--- omniORB-4.2.0/src/lib/omnithread/threaddata.cc 2011-04-20 19:24:30.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omnithread/threaddata.cc 2014-05-08 22:38:03.131100162 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ // Implementation of per-thread data
+diff -rupN omniORB-4.2.0/src/services/mklib/COS_sysdep.h omniORB-4.2.0-new/src/services/mklib/COS_sysdep.h
+--- omniORB-4.2.0/src/services/mklib/COS_sysdep.h 2005-01-07 00:11:24.000000000 +0100
++++ omniORB-4.2.0-new/src/services/mklib/COS_sysdep.h 2014-05-08 22:38:03.128100095 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // This file is included by COS stub headers.
+diff -rupN omniORB-4.2.0/src/services/mklib/mkBOAlib/COS_sysdep.h omniORB-4.2.0-new/src/services/mklib/mkBOAlib/COS_sysdep.h
+--- omniORB-4.2.0/src/services/mklib/mkBOAlib/COS_sysdep.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/services/mklib/mkBOAlib/COS_sysdep.h 2014-05-08 22:38:03.127100073 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // This file is included by COS stub headers.
+diff -rupN omniORB-4.2.0/src/tool/omniidl/COPYING omniORB-4.2.0-new/src/tool/omniidl/COPYING
+--- omniORB-4.2.0/src/tool/omniidl/COPYING 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/COPYING 2014-05-08 22:38:03.114099783 +0200
+@@ -2,7 +2,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -305,7 +305,7 @@ the "copyright" line and a pointer to wh
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
+ Also add information on how to contact you by electronic and paper mail.
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/cccp/cccp.c omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/cccp.c
+--- omniORB-4.2.0/src/tool/omniidl/cxx/cccp/cccp.c 2006-08-02 16:26:34.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/cccp.c 2014-05-08 22:38:03.089099227 +0200
+@@ -15,8 +15,8 @@ GNU General Public License for more deta
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+-Foundation, 59 Temple Place - Suite 330,
+-Boston, MA 02111-1307, USA.
++Foundation, Inc., 51 Franklin St, Fifth Floor,
++Boston, MA 02110-1301, USA.
+
+ In other words, you are welcome to use, share and improve this program.
+ You are forbidden to forbid anyone else to use, share and improve
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/cccp/cexp.y omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/cexp.y
+--- omniORB-4.2.0/src/tool/omniidl/cxx/cccp/cexp.y 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/cexp.y 2014-05-08 22:38:03.099099449 +0200
+@@ -13,8 +13,8 @@ GNU General Public License for more deta
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+-Foundation, 59 Temple Place - Suite 330,
+-Boston, MA 02111-1307, USA.
++Foundation, Inc., 51 Franklin St, Fifth Floor,
++Boston, MA 02110-1301, USA.
+
+ In other words, you are welcome to use, share and improve this program.
+ You are forbidden to forbid anyone else to use, share and improve
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/cccp/pcp.h omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/pcp.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/cccp/pcp.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/pcp.h 2014-05-08 22:38:03.101099494 +0200
+@@ -15,8 +15,8 @@ GNU General Public License for more deta
+
+ You should have received a copy of the GNU General Public License
+ along with GNU CC; see the file COPYING. If not, write to
+-the Free Software Foundation, 59 Temple Place - Suite 330,
+-Boston, MA 02111-1307, USA. */
++the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++Boston, MA 02110-1301, USA. */
+
+
+
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlast.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlast.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlast.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlast.cc 2014-05-08 22:38:03.056098491 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlast.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlast.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlast.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlast.h 2014-05-08 22:38:03.025097801 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlc.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlc.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlc.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlc.cc 2014-05-08 22:38:03.041098157 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlconfig.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlconfig.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlconfig.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlconfig.cc 2014-05-08 22:38:03.101099494 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlconfig.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlconfig.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlconfig.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlconfig.h 2014-05-08 22:38:03.049098335 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idldump.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idldump.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idldump.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idldump.cc 2014-05-08 22:38:03.058098536 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idldump.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idldump.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idldump.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idldump.h 2014-05-08 22:38:03.047098291 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlerr.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlerr.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlerr.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlerr.cc 2014-05-08 22:38:03.043098202 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlerr.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlerr.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlerr.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlerr.h 2014-05-08 22:38:03.037098068 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlexpr.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlexpr.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlexpr.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlexpr.cc 2014-05-08 22:38:03.021097712 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlexpr.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlexpr.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlexpr.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlexpr.h 2014-05-08 22:38:03.112099739 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlfixed.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlfixed.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlfixed.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlfixed.cc 2014-05-08 22:38:03.060098581 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlfixed.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlfixed.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlfixed.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlfixed.h 2014-05-08 22:38:03.012097511 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idl.ll omniORB-4.2.0-new/src/tool/omniidl/cxx/idl.ll
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idl.ll 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idl.ll 2014-05-08 22:38:03.018097645 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlmath.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlmath.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlmath.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlmath.h 2014-05-08 22:38:03.112099739 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlpython.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlpython.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlpython.cc 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlpython.cc 2014-05-08 22:38:03.041098157 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlrepoId.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlrepoId.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlrepoId.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlrepoId.cc 2014-05-08 22:38:03.044098224 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlrepoId.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlrepoId.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlrepoId.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlrepoId.h 2014-05-08 22:38:03.018097645 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlscope.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlscope.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlscope.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlscope.cc 2014-05-08 22:38:03.016097601 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlscope.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlscope.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlscope.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlscope.h 2014-05-08 22:38:03.048098313 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlsysdep.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlsysdep.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlsysdep.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlsysdep.h 2014-05-08 22:38:03.112099739 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idltype.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idltype.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idltype.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idltype.cc 2014-05-08 22:38:03.047098291 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idltype.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idltype.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idltype.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idltype.h 2014-05-08 22:38:03.049098335 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlutil.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlutil.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlutil.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlutil.cc 2014-05-08 22:38:03.025097801 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlutil.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlutil.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlutil.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlutil.h 2014-05-08 22:38:03.111099717 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlvalidate.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlvalidate.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlvalidate.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlvalidate.cc 2014-05-08 22:38:03.043098202 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlvalidate.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlvalidate.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlvalidate.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlvalidate.h 2014-05-08 22:38:03.042098179 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlvisitor.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlvisitor.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlvisitor.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlvisitor.h 2014-05-08 22:38:03.042098179 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idl.yy omniORB-4.2.0-new/src/tool/omniidl/cxx/idl.yy
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idl.yy 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idl.yy 2014-05-08 22:38:03.104099561 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/lex.yy.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/lex.yy.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/lex.yy.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/lex.yy.cc 2014-05-08 22:38:03.110099695 +0200
+@@ -837,8 +837,8 @@ char *yytext;
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/y.tab.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/y.tab.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/y.tab.cc 2003-09-04 16:00:35.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/y.tab.cc 2014-05-08 22:38:03.036098046 +0200
+@@ -991,8 +991,8 @@ static const short yycheck[] =
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA. */
++ Foundation, Inc., 51 Franklin St, Fifth Floor,
++ Boston, MA 02110-1301, USA. */
+
+ /* As a special exception, when this file is copied by Bison into a
+ Bison output file, you may use that output file without restriction.
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl/idlast.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idlast.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl/idlast.py 2012-08-01 12:36:33.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idlast.py 2014-05-08 22:38:02.984096888 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl/idltype.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idltype.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl/idltype.py 2012-08-01 12:36:33.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idltype.py 2014-05-08 22:38:02.979096777 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl/idlutil.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idlutil.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl/idlutil.py 2011-02-09 15:36:20.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idlutil.py 2014-05-08 22:38:02.987096955 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl/idlvisitor.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idlvisitor.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl/idlvisitor.py 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idlvisitor.py 2014-05-08 22:38:02.984096888 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl/main.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/main.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/main.py 2014-05-08 22:38:02.989096999 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl/output.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/output.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl/output.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/output.py 2014-05-08 22:38:02.986096933 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/ami.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/ami.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/ami.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/ami.py 2014-05-08 22:38:02.973096643 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/dump.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/dump.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/dump.py 2011-02-09 15:36:20.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/dump.py 2014-05-08 22:38:02.977096732 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/example.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/example.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/example.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/example.py 2014-05-08 22:38:02.974096665 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/interactive.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/interactive.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/interactive.py 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/interactive.py 2014-05-08 22:38:02.974096665 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/scripts/omniidl.in omniORB-4.2.0-new/src/tool/omniidl/python/scripts/omniidl.in
+--- omniORB-4.2.0/src/tool/omniidl/python/scripts/omniidl.in 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/scripts/omniidl.in 2014-05-08 22:38:02.991097044 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/scripts/omniidlrun.py omniORB-4.2.0-new/src/tool/omniidl/python/scripts/omniidlrun.py
+--- omniORB-4.2.0/src/tool/omniidl/python/scripts/omniidlrun.py 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/scripts/omniidlrun.py 2014-05-08 22:38:02.990097021 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idlast.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idlast.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idlast.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idlast.py 2014-05-08 22:38:03.005097356 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idltype.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idltype.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idltype.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idltype.py 2014-05-08 22:38:03.001097267 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idlutil.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idlutil.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idlutil.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idlutil.py 2014-05-08 22:38:03.007097401 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idlvisitor.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idlvisitor.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idlvisitor.py 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idlvisitor.py 2014-05-08 22:38:03.005097356 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl/main.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/main.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/main.py 2014-05-08 22:38:03.009097445 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl/output.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/output.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl/output.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/output.py 2014-05-08 22:38:03.006097378 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/ami.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/ami.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/ami.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/ami.py 2014-05-08 22:38:02.994097111 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/dump.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/dump.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/dump.py 2011-02-09 15:36:20.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/dump.py 2014-05-08 22:38:02.998097200 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/example.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/example.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/example.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/example.py 2014-05-08 22:38:02.994097111 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/interactive.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/interactive.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/interactive.py 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/interactive.py 2014-05-08 22:38:02.995097133 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/scripts/omniidl.in omniORB-4.2.0-new/src/tool/omniidl/python3/scripts/omniidl.in
+--- omniORB-4.2.0/src/tool/omniidl/python3/scripts/omniidl.in 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/scripts/omniidl.in 2014-05-08 22:38:03.011097489 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/scripts/omniidlrun.py omniORB-4.2.0-new/src/tool/omniidl/python3/scripts/omniidlrun.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/scripts/omniidlrun.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/scripts/omniidlrun.py 2014-05-08 22:38:03.010097466 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
diff --git a/omniORB.spec b/omniORB.spec
index af07c37..89ea42c 100644
--- a/omniORB.spec
+++ b/omniORB.spec
@@ -12,7 +12,7 @@
%bcond_without openssl
Name: omniORB
-Version: 4.1.7
+Version: 4.2.0
Release: 1%{?dist}
Summary: A robust high performance CORBA ORB for C++ and Python
@@ -25,11 +25,16 @@ Source2: omniORB-nameserver.logrotate
Source3: omniORB.cfg
Source4: omniNames.service
# fix incorrect fsf address
-Patch0: %{name}-4.1.6-fsf-address.patch
+Patch0: omniORB-4.2.0-fsf-address.patch
+# fix -Werror=format-security issue
+Patch1: omniORB-4.2.0-format-security.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
+BuildRequires: byacc
%{!?_without_openssl:BuildRequires: openssl-devel}
%if 0%{?with_systemd}
+BuildRequires: systemd
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
@@ -40,8 +45,6 @@ Requires(pre): shadow-utils
# This is for /sbin/service
Requires(postun): initscripts
%endif
-# needed for patch0
-BuildRequires: byacc
# we don't want to provide private python extension libs
%{?filter_setup:
@@ -97,6 +100,7 @@ developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%configure --disable-static %{?with_openssl:--with-openssl=%{_prefix}}
@@ -121,8 +125,8 @@ chmod 0755 %{buildroot}%{python_sitelib}/omniidl_be/cxx/{,skel,impl,dynskel,head
chmod +x %{buildroot}%{python_sitelib}/omniidl/main.py
%if 0%{?with_systemd}
# install systemd unit
-mkdir -p %{buildroot}/lib/systemd/system/
-install -m 0644 %{SOURCE4} %{buildroot}/lib/systemd/system/
+mkdir -p %{buildroot}%{_unitdir}
+install -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}
%else
# install service init script
mkdir -p %{buildroot}%{_initddir}
@@ -188,17 +192,17 @@ fi
%files
%defattr(-,root,root,-)
-%doc COPYING.LIB README.FIRST.txt README.unix
+%doc COPYING.LIB README.FIRST.txt README.unix.txt
%{_libdir}/*.so.*
%files servers
%defattr(-,root,root,-)
-%if 0%{?fedora} < 15
+%if 0%{?with_systemd}
+%{_unitdir}/omniNames.service
+%else
%{_initddir}/%{nameserver}
%dir %attr(0755, %{name}, root) %{_sharedstatedir}/%{name}
%dir %attr(0755, %{name}, root) %{_localstatedir}/run/%{name}
-%else
-/lib/systemd/system/omniNames.service
%endif
%config(noreplace) %{_sysconfdir}/%{name}.cfg
%config(noreplace) %{_sysconfdir}/logrotate.d/%{nameserver}
@@ -243,6 +247,9 @@ fi
%changelog
+* Thu May 08 2014 Sandro Mani <manisandro at gmail.com> - 4.2.0-1
+- upstream 4.2.0
+
* Tue Sep 10 2013 Haïkel Guémar <hguemar at fedoraproject.org> - 4.1.7-1
- upstream 4.1.7 (RHBZ #1005607)
- macroized systemd scriptlets (RHBZ #850239)
diff --git a/sources b/sources
index 1965187..fa74741 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce8cbe25418a76a2aac5395399463362 omniORB-4.1.7.tar.bz2
+f1e104d0a2df92829c1b37a853f4805d omniORB-4.2.0.tar.bz2
More information about the scm-commits
mailing list