diff -pruN 2.3.0.2/Rakefile 2.3.0.2ubuntu1/Rakefile
--- 2.3.0.2/Rakefile	2024-09-25 20:24:52.000000000 +0000
+++ 2.3.0.2ubuntu1/Rakefile	2024-11-27 11:14:36.000000000 +0000
@@ -1,5 +1,6 @@
 require 'rake/testtask'
 
+ENV["MT_COMPAT"] = 'true'
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/*_test.rb']
diff -pruN 2.3.0.2/debian/changelog 2.3.0.2ubuntu1/debian/changelog
--- 2.3.0.2/debian/changelog	2024-09-25 20:24:52.000000000 +0000
+++ 2.3.0.2ubuntu1/debian/changelog	2024-11-27 11:14:36.000000000 +0000
@@ -1,3 +1,11 @@
+ruby-launchy-shim (2.3.0.2ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable (LP: #2089758). Remaining changes:
+    - Rakefile: Add env var MT_COMPAT for compatibility with
+      Minitest 5.20.0
+
+ -- Pushkar Kulkarni <pushkar.kulkarni@canonical.com>  Wed, 27 Nov 2024 16:44:36 +0530
+
 ruby-launchy-shim (2.3.0.2) unstable; urgency=medium
 
   [ Cédric Boutillier ]
@@ -29,6 +37,13 @@ ruby-launchy-shim (2.3.0.2) unstable; ur
 
  -- Cédric Boutillier <boutil@debian.org>  Wed, 25 Sep 2024 22:24:52 +0200
 
+ruby-launchy-shim (2.3.0.1+nmu1ubuntu1) oracular; urgency=medium
+
+  * Rakefile:  Define env var MT_COMPAT for compatibility
+    with Minitest 5.20.0 in Ruby 3.3 (LP: #2077617)
+
+ -- Pushkar Kulkarni <pushkar.kulkarni@canonical.com>  Thu, 22 Aug 2024 14:09:57 +0530
+
 ruby-launchy-shim (2.3.0.1) unstable; urgency=medium
 
   * improve package description
diff -pruN 2.3.0.2/debian/control 2.3.0.2ubuntu1/debian/control
--- 2.3.0.2/debian/control	2024-09-25 20:24:52.000000000 +0000
+++ 2.3.0.2ubuntu1/debian/control	2024-11-27 11:14:36.000000000 +0000
@@ -1,7 +1,8 @@
 Source: ruby-launchy-shim
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Team <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Ruby Team <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
 Uploaders: Cédric Boutillier <boutil@debian.org>
 Build-Depends: debhelper-compat (= 13),
                gem2deb,
diff -pruN 2.3.0.2/debian/ruby-tests.rake 2.3.0.2ubuntu1/debian/ruby-tests.rake
--- 2.3.0.2/debian/ruby-tests.rake	2024-09-25 20:24:52.000000000 +0000
+++ 2.3.0.2ubuntu1/debian/ruby-tests.rake	2024-11-27 11:14:36.000000000 +0000
@@ -1,5 +1,6 @@
 require 'rake/testtask'
 
+ENV["MT_COMPAT"] = 'true'
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/*_test.rb']