git-debrebase: Make read_tree_debian global (nfc)

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 05e4c0c85178f490ad3de9c33b4d0f60cdf3107a..1cd765df979067bf6b3c2424dfcac0161709e794 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -43,6 +43,7 @@ BEGIN {
                      dep14_version_mangle
                       debiantags debiantag_old debiantag_new
                      debiantag_maintview
+                     upstreamversion
                      stripepoch source_file_leafname is_orig_file_of_p_v
                      server_branch server_ref
                       stat_exists link_ltarget
@@ -231,13 +232,19 @@ sub stripepoch ($) {
     return $vsn;
 }
 
+sub upstreamversion ($) {
+    my ($vsn) = @_;
+    $vsn =~ s/-[^-]+$//;
+    return $vsn;
+}
+
 sub source_file_leafname ($$$) {
     my ($package,$vsn,$sfx) = @_;
     return "${package}_".(stripepoch $vsn).$sfx
 }
 
 sub is_orig_file_of_p_v ($$$) {
-    my ($package, $f, $upstreamvsn) = @_;
+    my ($f, $package, $upstreamvsn) = @_;
     my $base = source_file_leafname $package, $upstreamvsn, '';
     return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
     return 1;