Merge ~lucaskanashiro/ubuntu/+source/ruby-dataobjects-mysql:focal-merge into ubuntu/+source/ruby-dataobjects-mysql:debian/sid

[Lucas Kanashiro]

Merge version 0.10.17-1 from Debian. Since Debian does not totally support MySQL 8 yet, I kept part of the delta:

  * Merge with Debian unstable. Remaining changes:
    - d/start_mysqld_and_auto_install.sh: fix build against MySQL 8.0.
  * Dropped:
    - Added support for MySQL 5.7.

It built fine in this PPA:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/focal-ruby-dataobjects-mysql-merge/+packages

Robie may want to review this since he brought up this merge to discussion.

[Rafael David Tinoco (rafaeldtinoco)]

I made a comment at the bottom...

review: Needs Information

[Robie Basak (racb)]

Sponsored. Thanks!

[Andreas Hasenack (ahasenack)]

This migrated to focal release already.

diff --git a/debian/changelog b/debian/changelog
index bc1b43d..48f61f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-dataobjects-mysql (0.10.17-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/start_mysqld_and_auto_install.sh: fix build against MySQL 8.0.
+  * Dropped:
+    - Added support for MySQL 5.7.
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 02 Mar 2020 16:16:28 -0300
+
 ruby-dataobjects-mysql (0.10.17-1) unstable; urgency=medium
 
   * Team upload.
@@ -16,6 +25,42 @@ ruby-dataobjects-mysql (0.10.17-1) unstable; urgency=medium
 
  -- Lucas Kanashiro <[e-mail]>  Thu, 13 Feb 2020 19:20:02 -0300
 
+ruby-dataobjects-mysql (0.10.16-2ubuntu5) focal; urgency=medium
+
+  [ Rafael David Tinoco ]
+  * Sponsoring ruby2.7 transitions
+
+  [ Lucas Kanashiro ]
+  * No-change rebuild for ruby2.7
+
+ -- Rafael David Tinoco <[e-mail]>  Wed, 26 Feb 2020 17:10:47 +0000
+
+ruby-dataobjects-mysql (0.10.16-2ubuntu4) eoan; urgency=medium
+
+  [ Lars Tangvald ]
+  * d/start_mysqld_and_auto_install.sh: fix build against MySQL 8.0.
+
+ -- Robie Basak <[e-mail]>  Wed, 14 Aug 2019 01:19:13 +0000
+
+ruby-dataobjects-mysql (0.10.16-2ubuntu3) bionic; urgency=high
+
+  * No change rebuild against ruby-defaults without ruby2.3 support.
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 01 Mar 2018 09:35:34 +0000
+
+ruby-dataobjects-mysql (0.10.16-2ubuntu2) bionic; urgency=medium
+
+  * No-change rebuild for ruby2.5 update.
+
+ -- Matthias Klose <[e-mail]>  Thu, 01 Feb 2018 19:02:12 +0000
+
+ruby-dataobjects-mysql (0.10.16-2ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - Added support for MySQL 5.7.
+
+ -- Lars Tangvald <[e-mail]>  Wed, 15 Feb 2017 15:46:13 +0100
+
 ruby-dataobjects-mysql (0.10.16-2) unstable; urgency=medium
 
   * Team upload.
@@ -31,6 +76,43 @@ ruby-dataobjects-mysql (0.10.16-2) unstable; urgency=medium
 
  -- Christian Hofstaedtler <[e-mail]>  Thu, 19 Jan 2017 22:44:26 +0000
 
+ruby-dataobjects-mysql (0.10.16-1ubuntu1) xenial; urgency=medium
+
+  * Added support for MySQL 5.7 (LP: #1566858).
+    The fix was taken from the datamapper/do github project
+
+ -- Lars Tangvald <[e-mail]>  Wed, 06 Apr 2016 15:34:40 +0200
+
+ruby-dataobjects-mysql (0.10.16-1build5) xenial; urgency=medium
+
+  * Rebuild against libmysqlclient20.
+
+ -- Robie Basak <[e-mail]>  Tue, 05 Apr 2016 13:01:20 +0000
+
+ruby-dataobjects-mysql (0.10.16-1build4) xenial; urgency=medium
+
+  * No-change rebuild for ruby2.3-only support.
+
+ -- Matthias Klose <[e-mail]>  Sun, 13 Mar 2016 21:15:55 +0000
+
+ruby-dataobjects-mysql (0.10.16-1build3) xenial; urgency=medium
+
+  * No-change rebuild to add ruby2.3 support.
+
+ -- Matthias Klose <[e-mail]>  Sun, 13 Mar 2016 12:35:21 +0000
+
+ruby-dataobjects-mysql (0.10.16-1build2) xenial; urgency=medium
+
+  * No-change rebuild to drop ruby2.1 support.
+
+ -- Matthias Klose <[e-mail]>  Thu, 21 Jan 2016 11:18:59 +0000
+
+ruby-dataobjects-mysql (0.10.16-1build1) wily; urgency=medium
+
+  * No-change to add ruby2.2 support.
+
+ -- Matthias Klose <[e-mail]>  Tue, 08 Sep 2015 13:33:53 +0000
+
 ruby-dataobjects-mysql (0.10.16-1) unstable; urgency=medium
 
   [ Balasankar C ]
diff --git a/debian/control b/debian/control
index f435d33..9f1d017 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ruby-dataobjects-mysql
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Extras Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Ruby Extras Maintainers <[e-mail]>
 Uploaders: Deepak Tripathi <[e-mail]>,
            Cédric Boutillier <[e-mail]>
 Build-Depends: debhelper (>= 12~),
diff --git a/debian/start_mysqld_and_auto_install.sh b/debian/start_mysqld_and_auto_install.sh
index 9b5f63d..e0a3725 100644
--- a/debian/start_mysqld_and_auto_install.sh
+++ b/debian/start_mysqld_and_auto_install.sh
@@ -17,7 +17,7 @@ DO_MYSQL_PASS=
 DO_MYSQL_DBNAME=do_test
 DO_MYSQL_DATABASE=/${DO_MYSQL_DBNAME}
 
-mysql_install_db --no-defaults --datadir=${MYTEMP_DIR} --force --skip-name-resolve --user=${DO_MYSQL_USER}
+/usr/sbin/mysqld --no-defaults --initialize-insecure --user=${DO_MYSQL_USER} --datadir=${MYTEMP_DIR}
 /usr/sbin/mysqld --no-defaults --user=${DO_MYSQL_USER} --socket=${MYSQL_UNIX_PORT} --datadir=${MYTEMP_DIR} --skip-networking &
 echo -n pinging mysqld.
 attempts=0
@@ -30,7 +30,7 @@ while ! /usr/bin/mysqladmin --socket=${MYSQL_UNIX_PORT} ping ; do
 	fi
 done
 mysql --socket=${MYSQL_UNIX_PORT} --execute "CREATE DATABASE ${DO_MYSQL_DBNAME};"
-mysql --socket=${MYSQL_UNIX_PORT} --execute "GRANT ALL PRIVILEGES ON ${DO_MYSQL_DBNAME}.* TO '${DO_MYSQL_USER}'@'localhost' IDENTIFIED BY '${DO_MYSQL_PASS}';"
+mysql --socket=${MYSQL_UNIX_PORT} --execute "GRANT ALL PRIVILEGES ON ${DO_MYSQL_DBNAME}.* TO '${DO_MYSQL_USER}'@'localhost';"
 
 # Keep running so we can terminate mysqld.
 set +e