diff -pruN 3.7.0-2.1/debian/changelog 3.7.0-2.1ubuntu1/debian/changelog
--- 3.7.0-2.1/debian/changelog	2021-11-26 23:24:35.000000000 +0000
+++ 3.7.0-2.1ubuntu1/debian/changelog	2021-12-14 22:10:20.000000000 +0000
@@ -1,3 +1,12 @@
+r10k (3.7.0-2.1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/p/20_disable_test_changing_proxy_settings: skip tests trying to change
+      the proxy settings, they are failing in the Ubuntu autopkgtest
+      infrastructure (LP #1940104).
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Tue, 14 Dec 2021 19:10:20 -0300
+
 r10k (3.7.0-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -7,6 +16,14 @@ r10k (3.7.0-2.1) unstable; urgency=mediu
 
  -- Daniel Leidert <dleidert@debian.org>  Sat, 27 Nov 2021 00:24:35 +0100
 
+r10k (3.7.0-2ubuntu1) impish; urgency=medium
+
+  * d/p/20_disable_test_changing_proxy_settings: skip tests trying to change
+    the proxy settings, they are failing in the Ubuntu autopkgtest
+    infrastructure (LP: #1940104).
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Mon, 16 Aug 2021 11:49:31 -0300
+
 r10k (3.7.0-2) unstable; urgency=medium
 
   * d/upstream: Fix package name
diff -pruN 3.7.0-2.1/debian/control 3.7.0-2.1ubuntu1/debian/control
--- 3.7.0-2.1/debian/control	2021-11-26 23:24:35.000000000 +0000
+++ 3.7.0-2.1ubuntu1/debian/control	2021-12-14 22:10:20.000000000 +0000
@@ -1,7 +1,8 @@
 Source: r10k
 Section: admin
 Priority: optional
-Maintainer: Puppet Package Maintainers <pkg-puppet-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Puppet Package Maintainers <pkg-puppet-devel@lists.alioth.debian.org>
 Uploaders: Sebastien Badia <sbadia@debian.org>,
            Markus Frosch <lazyfrosch@debian.org>,
            Georg Faerber <georg@debian.org>,
diff -pruN 3.7.0-2.1/debian/patches/20_disable_test_changing_proxy_settings 3.7.0-2.1ubuntu1/debian/patches/20_disable_test_changing_proxy_settings
--- 3.7.0-2.1/debian/patches/20_disable_test_changing_proxy_settings	1970-01-01 00:00:00.000000000 +0000
+++ 3.7.0-2.1ubuntu1/debian/patches/20_disable_test_changing_proxy_settings	2021-12-14 22:10:20.000000000 +0000
@@ -0,0 +1,29 @@
+Description: Skip tests changing the proxy settings in autopkgtest environment
+  This test is failing in the Ubuntu autopkgtest infrastructure because it tries
+  to set the proxy variable which is already used by the infrastructure which
+  makes it fail. This is a Ubuntu specific change.
+  .
+  Even with this patch the tests will be executed during build time to make
+  sure the feature is still working.
+Author: Lucas Kanashiro <kanashiro@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/r10k/+bug/1940104
+Forwarded: not-needed
+Last-Updated: 2021-08-16
+
+--- a/spec/unit/settings_spec.rb
++++ b/spec/unit/settings_spec.rb
+@@ -232,9 +232,11 @@
+       describe "setting a default value" do
+         %w[HTTPS_PROXY https_proxy HTTP_PROXY http_proxy].each do |env_var|
+           it "respects the #{env_var} environment variable" do
+-            R10K::Util::ExecEnv.withenv(env_var => "http://proxy.value/#{env_var}") do
+-              output = subject.evaluate({})
+-              expect(output[:proxy]).to eq("http://proxy.value/#{env_var}")
++            if not ENV["AUTOPKGTEST_TMP"]
++              R10K::Util::ExecEnv.withenv(env_var => "http://proxy.value/#{env_var}") do
++                output = subject.evaluate({})
++                expect(output[:proxy]).to eq("http://proxy.value/#{env_var}")
++              end
+             end
+           end
+         end
diff -pruN 3.7.0-2.1/debian/patches/series 3.7.0-2.1ubuntu1/debian/patches/series
--- 3.7.0-2.1/debian/patches/series	2021-11-26 23:24:35.000000000 +0000
+++ 3.7.0-2.1ubuntu1/debian/patches/series	2021-12-14 22:10:20.000000000 +0000
@@ -2,3 +2,4 @@
 11_locales_path
 12_disable_test_with_network_access
 13_fix_ruby_30_kwargs.patch
+20_disable_test_changing_proxy_settings