Merge branch '5.5' into 10.1

4 files changed, 6 insertions, 6 deletions

diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop
index f65c55cf0cf..ee0488580f6 100644
--- a/debian/additions/innotop/innotop
+++ b/debian/additions/innotop/innotop
@@ -17,7 +17,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., 51 Franklin
-# Street, Fifth Floor, Boston, MA 02111-1301 USA
+# Street, Fifth Floor, Boston, MA 02110-1335 USA
 
 use strict;
 use warnings FATAL => 'all';
@@ -1439,7 +1439,7 @@ licenses.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-Street, Fifth Floor, Boston, MA 02111-1301 USA.
+Street, Fifth Floor, Boston, MA 02110-1335 USA.
 LICENSE
 
 # Configuration information and global setup {{{1
@@ -12234,7 +12234,7 @@ licenses.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-Street, Fifth Floor, Boston, MA 02111-1301 USA.
+Street, Fifth Floor, Boston, MA 02110-1335 USA.
 
 Execute innotop and press '!' to see this information at any time.
 
diff --git a/debian/additions/innotop/innotop.1 b/debian/additions/innotop/innotop.1
index 86652945109..1b56faebcfd 100644
--- a/debian/additions/innotop/innotop.1
+++ b/debian/additions/innotop/innotop.1
@@ -2184,7 +2184,7 @@ licenses.
 .PP
 You should have received a copy of the \s-1GNU\s0 General Public License along with
 this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-Street, Fifth Floor, Boston, \s-1MA\s0  02111\-1301  \s-1USA\s0.
+Street, Fifth Floor, Boston, \s-1MA 02110-1335 USA\s0.
 .PP
 Execute innotop and press '!' to see this information at any time.
 .SH "AUTHOR"
diff --git a/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch b/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch
index 93ec7391dc0..6305b528576 100755
--- a/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch
+++ b/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch
@@ -39,7 +39,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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
 +
 +# Process this file with automake to create Makefile.in
 +
diff --git a/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch b/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch
index c560a0eea06..6de69d0e1a7 100755
--- a/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch
+++ b/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch
@@ -39,7 +39,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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
 +
 +# Process this file with automake to create Makefile.in
 +