Hi,

I've prepared a NMU upload to fix this and uploaded to archive with
delay=2. Attached debdiff, please check if this work for you.

--abhijith
diff -Nru svn2git-2.4.0/debian/changelog svn2git-2.4.0/debian/changelog
--- svn2git-2.4.0/debian/changelog      2019-09-11 20:44:52.000000000 +0530
+++ svn2git-2.4.0/debian/changelog      2025-04-08 16:46:28.000000000 +0530
@@ -1,3 +1,17 @@
+svn2git (2.4.0-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Add patch to ensure compatibility with Ruby > 3.2
+    (Closes: #1100387)
+  * Wrong single quote in fix for 893997 (Closes: #974643)
+    Thanks to Codeklöppler <developm...@consensionis.de>
+    https://bugs.debian.org/974643
+  * Use Testsuite: autopkgtest-pkg-ruby field instead of debian/tests
+  * Use ruby:any in Depends field instead of ruby-interpreter
+    demanded by lintian.
+
+ -- Abhijith PA <abhij...@debian.org>  Tue, 08 Apr 2025 16:46:28 +0530
+
 svn2git (2.4.0-3) unstable; urgency=medium
 
   * Add patch to support different localized git messages (Closes: #893997)
diff -Nru svn2git-2.4.0/debian/control svn2git-2.4.0/debian/control
--- svn2git-2.4.0/debian/control        2019-09-11 20:44:52.000000000 +0530
+++ svn2git-2.4.0/debian/control        2025-04-08 16:46:28.000000000 +0530
@@ -9,14 +9,14 @@
 Homepage: https://github.com/nirvdrum/svn2git
 Vcs-Git: https://salsa.debian.org/sagiru-guest/svn2git.git
 Vcs-Browser: https://salsa.debian.org/sagiru-guest/svn2git
-Testsuite: autopkgtest
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: svn2git
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends},
-  ruby | ruby-interpreter,
+  ruby:any,
   git-svn,
 # minitest (>= 0, development)
 Description: Ruby tool for migrating svn projects to git
diff -Nru 
svn2git-2.4.0/debian/patches/0002-Use-global-stdin-instead-of-local-variable.patch
 
svn2git-2.4.0/debian/patches/0002-Use-global-stdin-instead-of-local-variable.patch
--- 
svn2git-2.4.0/debian/patches/0002-Use-global-stdin-instead-of-local-variable.patch
  2019-09-11 20:44:52.000000000 +0530
+++ 
svn2git-2.4.0/debian/patches/0002-Use-global-stdin-instead-of-local-variable.patch
  2025-04-08 16:46:28.000000000 +0530
@@ -16,10 +16,17 @@
  lib/svn2git/migration.rb | 14 +++++++++-----
  1 file changed, 9 insertions(+), 5 deletions(-)
 
-diff --git a/lib/svn2git/migration.rb b/lib/svn2git/migration.rb
-index 2c9d041..eb38338 100755
 --- a/lib/svn2git/migration.rb
 +++ b/lib/svn2git/migration.rb
+@@ -357,7 +357,7 @@ module Svn2Git
+           # Our --rebase option obviates the need for read-only tracked 
remotes, however.  So, we'll
+           # deprecate the old option, informing those relying on the old 
behavior that they should
+           # use the newer --rebase otion.
+-          if status =~ /fatal:.+'#{branch}'.+/
++          if status =~ /fatal:.+remotes\/svn\/#{branch}'.+/
+             @cannot_setup_tracking_information = true
+             run_command(Svn2Git::Migration.checkout_svn_branch(branch))
+           else
 @@ -430,13 +430,17 @@ module Svn2Git
          # sub-process's stdin pipe.
          Thread.new do
diff -Nru svn2git-2.4.0/debian/patches/0003-fix-File-exists.patch 
svn2git-2.4.0/debian/patches/0003-fix-File-exists.patch
--- svn2git-2.4.0/debian/patches/0003-fix-File-exists.patch     1970-01-01 
05:30:00.000000000 +0530
+++ svn2git-2.4.0/debian/patches/0003-fix-File-exists.patch     2025-04-08 
16:46:28.000000000 +0530
@@ -0,0 +1,18 @@
+Description: Fix 1100387
+
+Author: Abhijith PA <abhij...@debian.org>
+Bug-Debian: https://bugs.debian.org/1100387
+Forwarded: no
+Last-Update: 2025-04-08
+
+--- a/lib/svn2git/migration.rb
++++ b/lib/svn2git/migration.rb
+@@ -55,7 +55,7 @@ module Svn2Git
+       options[:password] = nil
+       options[:rebasebranch] = false
+ 
+-      if File.exists?(File.expand_path(DEFAULT_AUTHORS_FILE))
++      if File.exist?(File.expand_path(DEFAULT_AUTHORS_FILE))
+         options[:authors] = DEFAULT_AUTHORS_FILE
+       end
+ 
diff -Nru svn2git-2.4.0/debian/patches/series 
svn2git-2.4.0/debian/patches/series
--- svn2git-2.4.0/debian/patches/series 2019-09-11 20:44:52.000000000 +0530
+++ svn2git-2.4.0/debian/patches/series 2025-04-08 16:46:28.000000000 +0530
@@ -1,2 +1,3 @@
 0001-Support-different-localized-git-messages.patch
 0002-Use-global-stdin-instead-of-local-variable.patch
+0003-fix-File-exists.patch
diff -Nru svn2git-2.4.0/debian/tests/control.ex 
svn2git-2.4.0/debian/tests/control.ex
--- svn2git-2.4.0/debian/tests/control.ex       2016-09-09 20:59:26.000000000 
+0530
+++ svn2git-2.4.0/debian/tests/control.ex       1970-01-01 05:30:00.000000000 
+0530
@@ -1,13 +0,0 @@
-# AUTOGENERATED FILE
-#
-# As of autopkgtest 3.5, Ruby packages that use gem2deb are automatically
-# detected, and if debian/tests/control does not exist the contents below will
-# be assumed (with the exception of gem2deb being filtered out from
-# @builddeps@):
-
-Test-Command: gem2deb-test-runner --autopkgtest 2>&1
-Depends: @, @builddeps@, gem2deb-test-runner
-
-# if you would need to change something to the above, to that and rename this
-# file to `control`. Otherwise, you should probably delete this file
-# (recommended).

Reply via email to