From 2f9cd06da4f3a4695a63efb0d4a8af7ef99bd5b3 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 17 Apr 2019 13:20:48 +0200 Subject: MDEV-18362 EPOCH=1 needs to be set for Ubuntu 18.10 cosmic builds Apply dbart's patch to set epoch for all ubuntu releases starting from bionic. Not only for bionic. This works for Debian too (VERNUM=unstable, etc). --- debian/autobake-deb.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 648c95cb416..98071ba6d03 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -30,6 +30,7 @@ LOGSTRING="MariaDB build" # Look up distro-version specific stuff. CODENAME="$(lsb_release -sc)" +VERNUM="$(lsb_release -sr)" # add libcrack2 (>= 2.9.0) as a build dependency # but only where the distribution can possibly satisfy it @@ -57,7 +58,7 @@ sed -i -e "s/\\\${LIBSSL}/${LIBSSL}/g" debian/control # echo "Incrementing changelog and starting build scripts" -if [[ "$CODENAME" == bionic ]]; then +if [[ "${VERNUM%.*}" -ge 18 ]]; then EPOCH="1:" fi dch -b -D ${CODENAME} -v "${EPOCH}${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME}" "Automatic build with ${LOGSTRING}." -- cgit v1.2.1 From 3db6de33b2b47a3c31bc8f8deb721abe0c5b0e1c Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 17 Apr 2019 14:53:30 +0200 Subject: MDEV-17640 UMASK_DIR configuration for mysql_install_db is not applied to mysql database create mysql and test databases with SQL, not mkdir. --- .../41_scripts__mysql_install_db.sh__no_test.dpatch | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch b/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch index 5ab8ab3d3d7..9593cd7c3e0 100755 --- a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch +++ b/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch @@ -7,14 +7,13 @@ @DPATCH@ ---- mysql-dfsg-5.1-5.1.23rc.orig/scripts/mysql_install_db.sh 2008-01-29 22:41:20.000000000 +0100 -+++ mysql-dfsg-5.1-5.1.23rc/scripts/mysql_install_db.sh 2008-02-28 10:08:11.000000000 +0100 -@@ -372,7 +372,7 @@ then - fi - - # Create database directories --for dir in "$ldata" "$ldata/mysql" "$ldata/test" -+for dir in "$ldata" "$ldata/mysql" - do - if test ! -d "$dir" - then +--- a/scripts/mysql_install_db.sh ++++ b/scripts/mysql_install_db.sh +@@ -36,7 +36,6 @@ in_rpm=0 + ip_only=0 + cross_bootstrap=0 + install_params="create database if not exists mysql; +-create database if not exists test; + use mysql;" + auth_root_authentication_method=normal + auth_root_socket_user='root' -- cgit v1.2.1 From 17b4f99928eb222dcc7c7b0404ccbcd1063af026 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Fri, 10 May 2019 20:49:46 +0300 Subject: Update FSF address This commit is based on the work of Michal Schorm, rebased on the earliest MariaDB version. Th command line used to generate this diff was: find ./ -type f \ -exec sed -i -e 's/Foundation, Inc., 59 Temple Place, Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/Foundation, Inc. 59 Temple Place.* Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/MA.*.....-1307.*USA/MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/Foundation, Inc., 59 Temple/Foundation, Inc., 51 Franklin/g' {} \; \ -exec sed -i -e 's/Place, Suite 330, Boston, MA.*02111-1307.*USA/Street, Fifth Floor, Boston, MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/MA.*.....-1307/MA 02110-1335/g' {} \; --- debian/additions/innotop/innotop | 12 ++++++------ debian/additions/innotop/innotop.1 | 4 ++-- debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch | 2 +- debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop index 646f0d7f0fb..92b8072afea 100644 --- a/debian/additions/innotop/innotop +++ b/debian/additions/innotop/innotop @@ -15,8 +15,8 @@ # systems, you can issue `man perlgpl' or `man perlartistic' to read these # 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 +# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +# Place, Suite 330, Boston, MA 02110-1335 USA use strict; use warnings FATAL => 'all'; @@ -1361,8 +1361,8 @@ systems, you can issue `man perlgpl' or `man perlartistic' to read these 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., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA. +this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +Place, Suite 330, Boston, MA 02110-1335 USA. LICENSE # Configuration information and global setup {{{1 @@ -10925,8 +10925,8 @@ systems, you can issue `man perlgpl' or `man perlartistic' to read these 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., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA. +this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +Place, Suite 330, 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 b2e7fce084e..338471594d6 100644 --- a/debian/additions/innotop/innotop.1 +++ b/debian/additions/innotop/innotop.1 @@ -2067,8 +2067,8 @@ systems, you can issue `man perlgpl' or `man perlartistic' to read these 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., 59 Temple -Place, Suite 330, Boston, \s-1MA\s0 02111\-1307 \s-1USA\s0. +this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +Place, Suite 330, 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 ca138afa746..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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 6440697bc02..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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA + +# Process this file with automake to create Makefile.in + -- cgit v1.2.1 From 15f1e03d46dfa704beeed4880ed72c0163869dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Sat, 11 May 2019 18:08:32 +0300 Subject: Follow-up to changing FSF address Some places didn't match the previous rules, making the Floor address wrong. Additional sed rules: sed -i -e 's/Place.*Suite .*, Boston/Street, Fifth Floor, Boston/g' sed -i -e 's/Suite .*, Boston/Fifth Floor, Boston/g' --- debian/additions/innotop/innotop | 6 +++--- debian/additions/innotop/innotop.1 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop index 92b8072afea..88b130c39cb 100644 --- a/debian/additions/innotop/innotop +++ b/debian/additions/innotop/innotop @@ -16,7 +16,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 -# Place, Suite 330, Boston, MA 02110-1335 USA +# Street, Fifth Floor, Boston, MA 02110-1335 USA use strict; use warnings FATAL => 'all'; @@ -1362,7 +1362,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 -Place, Suite 330, Boston, MA 02110-1335 USA. +Street, Fifth Floor, Boston, MA 02110-1335 USA. LICENSE # Configuration information and global setup {{{1 @@ -10926,7 +10926,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 -Place, Suite 330, Boston, MA 02110-1335 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 338471594d6..6b36a272684 100644 --- a/debian/additions/innotop/innotop.1 +++ b/debian/additions/innotop/innotop.1 @@ -2068,7 +2068,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 -Place, Suite 330, Boston, \s-1MA 02110-1335 USA\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" -- cgit v1.2.1 From 5543b75550962f07b4adcd47a6e52accec0a7d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Sat, 11 May 2019 21:29:06 +0300 Subject: Update FSF Address * Update wrong zip-code --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 9c98778b4f8..d37d04fd642 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/'. -- cgit v1.2.1