Merge ~lucaskanashiro/ubuntu/+source/ruby-em-synchrony:merge into ubuntu/+source/ruby-em-synchrony:debian/sid

[Lucas Kanashiro]

Merge version 1.0.5-3 from Debian. The delta was kept since the current test script does not support MySQL 8. The delta was forwarded to Debian here:

https://salsa.debian.org/ruby-team/ruby-em-synchrony/-/commit/4d54ac764de5bbb33eb502c6eeca0bddc1244312

PPA with the proposed package:

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

[Andreas Hasenack (ahasenack)]

- delta ok
- changelog ok
- debian changes don't warrant an FFe

review: Approve

[Andreas Hasenack (ahasenack)]

Tagging and sponsoring 5c80a2ceca363bded9b022a7b49c3b5239f07381

$ git push pkg upload/1.0.5-3ubuntu1
Enumerating objects: 21, done.
Counting objects: 100% (21/21), done.
Delta compression using up to 4 threads
Compressing objects: 100% (17/17), done.
Writing objects: 100% (17/17), 2.07 KiB | 424.00 KiB/s, done.
Total 17 (delta 12), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/ruby-em-synchrony
 * [new tag] upload/1.0.5-3ubuntu1 -> upload/1.0.5-3ubuntu1

$ dput ubuntu ../ruby-em-synchrony_1.0.5-3ubuntu1_source.changes
Checking signature on .changes
gpg: ../ruby-em-synchrony_1.0.5-3ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../ruby-em-synchrony_1.0.5-3ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ruby-em-synchrony_1.0.5-3ubuntu1.dsc: done.
  Uploading ruby-em-synchrony_1.0.5-3ubuntu1.debian.tar.xz: done.
  Uploading ruby-em-synchrony_1.0.5-3ubuntu1_source.buildinfo: done.
  Uploading ruby-em-synchrony_1.0.5-3ubuntu1_source.changes: done.
Successfully uploaded packages.

[Lucas Kanashiro (lucaskanashiro)]

It already migrated to focal.

diff --git a/debian/changelog b/debian/changelog
index b137444..5971f0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruby-em-synchrony (1.0.5-3ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Build-depend on mariadb-server, not on default-mysql-server; this is only
+      used for build-time testing so it shouldn't matter which of the two is
+      deployed, and the invocation of mysql_install_db is using maria-specific
+      options.
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 30 Mar 2020 10:57:31 -0300
+
 ruby-em-synchrony (1.0.5-3) unstable; urgency=medium
 
   * Team upload.
@@ -18,6 +28,15 @@ ruby-em-synchrony (1.0.5-3) unstable; urgency=medium
 
  -- Lucas Kanashiro <[e-mail]>  Fri, 27 Mar 2020 10:56:07 -0300
 
+ruby-em-synchrony (1.0.5-2ubuntu1) artful; urgency=medium
+
+  * Build-depend on mariadb-server, not on default-mysql-server; this is only
+    used for build-time testing so it shouldn't matter which of the two is
+    deployed, and the invocation of mysql_install_db is using maria-specific
+    options.
+
+ -- Steve Langasek <[e-mail]>  Thu, 10 Aug 2017 23:43:22 +0000
+
 ruby-em-synchrony (1.0.5-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index d477576..47497cc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
 Source: ruby-em-synchrony
 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: Jonas Genannt <[e-mail]>,
            Pirate Praveen <[e-mail]>
 Build-Depends: debhelper (>= 12),
                gem2deb,
                memcached,
-               default-mysql-server | virtual-mysql-server,
+               mariadb-server,
                procps,
                redis-server,
                ruby-activerecord,