Merge ~pushkarnk/ubuntu/+source/ruby-attr-encrypted:merge-2089734-plucky into ubuntu/+source/ruby-attr-encrypted:debian/sid

[Pushkar Kulkarni]

[Pushkar Kulkarni (pushkarnk)]

I did a test build in ppa:pushkarnk/plusone and here are the autopkgtest results

* Results:
  - ruby-attr-encrypted: plucky/ruby-attr-encrypted/4.1.0-1ubuntu1 [amd64]
    + ✅ ruby-attr-encrypted on plucky for amd64 @ 28.11.24 05:13:16
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/amd64/r/ruby-attr-encrypted/20241128_051316_e34b1@/log.gz
  - ruby-attr-encrypted: plucky/ruby-attr-encrypted/4.1.0-1ubuntu1 [arm64]
    + ✅ ruby-attr-encrypted on plucky for arm64 @ 28.11.24 05:13:38
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/arm64/r/ruby-attr-encrypted/20241128_051338_31c8d@/log.gz
  - ruby-attr-encrypted: plucky/ruby-attr-encrypted/4.1.0-1ubuntu1 [armhf]
    + ✅ ruby-attr-encrypted on plucky for armhf @ 28.11.24 05:16:20
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/armhf/r/ruby-attr-encrypted/20241128_051620_29d25@/log.gz
  - ruby-attr-encrypted: plucky/ruby-attr-encrypted/4.1.0-1ubuntu1 [i386]
    + ✅ ruby-attr-encrypted on plucky for i386 @ 28.11.24 05:13:25
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/i386/r/ruby-attr-encrypted/20241128_051325_278cf@/log.gz
  - ruby-attr-encrypted: plucky/ruby-attr-encrypted/4.1.0-1ubuntu1 [s390x]
    + ✅ ruby-attr-encrypted on plucky for s390x @ 28.11.24 05:13:39
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/s390x/r/ruby-attr-encrypted/20241128_051339_04164@/log.gz

[Simon Quigley (tsimonq2)]

review: Approve

Unmerged commits

995dd9d... by Pushkar Kulkarni on 2024-11-27

update-maintainer

123b4bb... by Pushkar Kulkarni on 2024-11-27

reconstruct-changelog

862eba0... by Pushkar Kulkarni on 2024-11-27

merge-changelogs

0eb4bb7... by Pushkar Kulkarni on 2024-08-22

Add env var MT_COMPAT

diff --git a/debian/changelog b/debian/changelog
index 3a1e810..d147afd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-attr-encrypted (4.1.0-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable (LP: #2089734). Remaining changes:
+    - d/ruby-tests.rake: Add env var MT_COMPAT for
+      compatibility with Ruby 3.3
+
+ -- Pushkar Kulkarni <[e-mail]>  Wed, 27 Nov 2024 13:20:37 +0530
+
 ruby-attr-encrypted (4.1.0-1) unstable; urgency=medium
 
   * Team upload
@@ -10,6 +18,13 @@ ruby-attr-encrypted (4.1.0-1) unstable; urgency=medium
 
  -- Cédric Boutillier <[e-mail]>  Thu, 29 Aug 2024 10:59:54 +0200
 
+ruby-attr-encrypted (3.1.0-4ubuntu1) oracular; urgency=medium
+
+  * d/ruby-tests.rake: Define env var MT_COMPAT for compatibility
+    with Minitest 5.20.0 in Ruby 3.3 (LP: #2077617)
+
+ -- Pushkar Kulkarni <[e-mail]>  Thu, 22 Aug 2024 12:49:08 +0530
+
 ruby-attr-encrypted (3.1.0-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 94889f2..6b6bb75 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ruby-attr-encrypted
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Ruby Team <[e-mail]>
 Uploaders: Pirate Praveen <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
                gem2deb,
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index eb0dd7a..4523ead 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,5 +1,6 @@
 require 'gem2deb/rake/testtask'
 
+ENV["MT_COMPAT"] = 'true'
 Gem2Deb::Rake::TestTask.new do |t|
   t.libs = ['test']
   t.test_files = FileList['test/**/*_test.rb']