Merge ~mkukri/ubuntu/+source/thin:merge into ubuntu/+source/thin:debian/sid

[Mate Kukri]

Merge with Debian sid

[Simon Quigley (tsimonq2)]

           . .--. _..._
         .'| |__| .' '.
     .| < | .--.. .-. .
   .' |_ | | | || ' ' |
 .' || | .'''-. | || | | |
'--. .-'| |/.'''. \| || | | |
   | | | / | || || | | |
   | | | | | ||__|| | | |
   | '.'| | | | | | | |
   | / | '. | '. | | | |
   `'-' '---' '---' '--' '--'

review: Approve

diff --git a/debian/changelog b/debian/changelog
index c48a9af..d691486 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+thin (1.8.1-2ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Fix autopkgtest failure on armhf (LP: 1939086).
+      + d/ruby-tests.rake: Unset http_proxy env variable.
+  * Dropped patch now included in Debian:
+    - d/p/increase-wait-time-for-server-stop.patch: Increase timeout
+      when waiting for server to stop.
+
+ -- Mate Kukri <[e-mail]>  Tue, 28 Nov 2023 10:44:51 +0000
+
 thin (1.8.1-2) unstable; urgency=medium
 
   * Team upload.
@@ -29,6 +40,39 @@ thin (1.8.0-2) unstable; urgency=medium
 
  -- Lucas Kanashiro <[e-mail]>  Thu, 01 Sep 2022 15:45:50 -0300
 
+thin (1.8.0-1ubuntu5) lunar; urgency=medium
+
+  * No-change upload to remove support for ruby3.0.
+
+ -- Lucas Kanashiro <[e-mail]>  Fri, 03 Feb 2023 13:59:07 -0300
+
+thin (1.8.0-1ubuntu4) lunar; urgency=medium
+
+  * No-change upload to add support for ruby3.1.
+
+ -- Lucas Kanashiro <[e-mail]>  Tue, 24 Jan 2023 13:22:53 -0300
+
+thin (1.8.0-1ubuntu3) jammy; urgency=medium
+
+  * No-change upload due to ruby3.0 transition, remove ruby2.7 support.
+
+ -- Lucas Kanashiro <[e-mail]>  Fri, 03 Dec 2021 19:10:48 -0300
+
+thin (1.8.0-1ubuntu2) jammy; urgency=medium
+
+  * No-change upload due to ruby3.0 transition.
+
+ -- Lucas Kanashiro <[e-mail]>  Thu, 18 Nov 2021 11:54:45 -0300
+
+thin (1.8.0-1ubuntu1) impish; urgency=medium
+
+  * Fix autopkgtest failure on armhf (LP: #1939086).
+    - d/ruby-tests.rake: Unset http_proxy env variable.
+    - d/p/increase-wait-time-for-server-stop.patch: Increase timeout
+      when waiting for server to stop.
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 31 Aug 2021 15:40:13 -0400
+
 thin (1.8.0-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/control b/debian/control
index 14e1016..cfb8d85 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: thin
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Ruby Team <[e-mail]>
 Uploaders: Laurent Arnoud <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
                gem2deb (>= 1),
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index eed366c..9189fdb 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,5 +1,7 @@
 require 'gem2deb/rake/spectask'
 
+ENV["http_proxy"] = ""
+
 ipv4 = `ip -4 address | grep inet | wc -l`.strip.to_i
 if ipv4 <= 1
   puts "W: just loopback interface or none has IPv4 address, this might be a IPv6 builder. Skipping some tests..."