diff -Nru rails-6.1.7.3+dfsg/debian/changelog rails-6.1.7.3+dfsg/debian/changelog
--- rails-6.1.7.3+dfsg/debian/changelog	2023-03-25 22:39:22.000000000 +0000
+++ rails-6.1.7.3+dfsg/debian/changelog	2023-07-03 05:55:59.000000000 +0000
@@ -1,3 +1,18 @@
+rails (2:6.1.7.3+dfsg-2build1) mantic; urgency=medium
+
+  * Rebuild against dropped ruby-rack 3.0.8-1.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 03 Jul 2023 07:55:59 +0200
+
+rails (2:6.1.7.3+dfsg-2) unstable; urgency=medium
+
+  * debian/control:
+    - Declare that ruby-activerecord breaks and replaces ruby-arel: it was
+      merged five years ago, is therefore obsolete and to be removed.
+      (Closes: #1038935)
+
+ -- Georg Faerber <georg@debian.org>  Sun, 25 Jun 2023 11:53:59 +0000
+
 rails (2:6.1.7.3+dfsg-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru rails-6.1.7.3+dfsg/debian/control rails-6.1.7.3+dfsg/debian/control
--- rails-6.1.7.3+dfsg/debian/control	2023-03-25 07:18:21.000000000 +0000
+++ rails-6.1.7.3+dfsg/debian/control	2023-06-25 11:53:59.000000000 +0000
@@ -134,6 +134,7 @@
 Breaks: ruby-activerecord-import (<< 1.0.5~),
         ruby-activerecord-nulldb-adapter (<< 0.8.0~),
         ruby-acts-as-taggable-on (<< 6.5~),
+        ruby-arel,
         ruby-delayed-job-active-record (<< 4.1.6-3~),
         ruby-enumerize (<< 2.4.0~),
         ruby-has-secure-token (<< 1.0.0-3~),
@@ -146,6 +147,7 @@
  a persistent domain model by mapping database tables to Ruby classes.
  Strong conventions for associations, validations, aggregations,
  migrations, and testing come baked-in.
+Replaces: ruby-arel,
 XB-Ruby-Versions: ${ruby:Versions}
 X-DhRuby-Root: activerecord/
 
diff -Nru rails-6.1.7.3+dfsg/debian/gbp.conf rails-6.1.7.3+dfsg/debian/gbp.conf
--- rails-6.1.7.3+dfsg/debian/gbp.conf	2023-03-25 07:18:21.000000000 +0000
+++ rails-6.1.7.3+dfsg/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-[DEFAULT]
-pristine-tar = True
-sign-tags = True
-upstream-tag = upstream/%(version)s
-
-upstream-branch = upstream
-debian-branch = master
-
-[pq]
-patch-numbers = False
diff -Nru rails-6.1.7.3+dfsg/debian/salsa-ci.yml rails-6.1.7.3+dfsg/debian/salsa-ci.yml
--- rails-6.1.7.3+dfsg/debian/salsa-ci.yml	2023-03-25 07:18:21.000000000 +0000
+++ rails-6.1.7.3+dfsg/debian/salsa-ci.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
----
-include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml