diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-19 20:55:37 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-19 20:55:37 +0200 |
| commit | c07325f932abef2032b2e56532f6cb615e2a1161 (patch) | |
| tree | 754ca158e45ebc014e5cbeaf4c3e7581f9575d76 /debian | |
| parent | 7f8187bc432f79afe4c0549d68845a68e6c159ab (diff) | |
| parent | 2ae83affef5a4d89f38272db31a400f968279a7a (diff) | |
| download | mariadb-git-c07325f932abef2032b2e56532f6cb615e2a1161.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/additions/innotop/innotop | 6 | ||||
| -rw-r--r-- | debian/additions/innotop/innotop.1 | 2 | ||||
| -rw-r--r-- | debian/copyright | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop index b0134e0bc91..eb4b3590cf6 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 7079ff2c4a4..4c705422286 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/copyright b/debian/copyright index 5cc78039b04..836fe89f4c3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -55,7 +55,7 @@ License: > > You should have received a copy of the GNU General Public License > along with this package; if not, write to the Free Software -> Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +> Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA On Debian systems, the complete text of the GNU General Public License and the Artistic License can be found in `/usr/share/common-licenses/'. |