diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:47:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:54:04 +0300 |
| commit | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch) | |
| tree | 7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /debian | |
| parent | 8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff) | |
| parent | cb248f880619431850e5638009a6098048050edf (diff) | |
| download | mariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz | |
Merge 10.1 into 10.2
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 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/copyright b/debian/copyright index 59c84d0e4ad..2f27c03a8fc 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/'. |