Dgit.pm: Move upstreamversion from dgit

NFC.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 787e50655487ec1e672a0c06aeb642f28e17a3b9..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
                      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
                      stripepoch source_file_leafname is_orig_file_of_p_v
                      server_branch server_ref
                       stat_exists link_ltarget


@@ -231,6 +232,12 @@ sub stripepoch ($) {
     return $vsn;
 }
 
     return $vsn;
 }
 

+sub upstreamversion ($) {
+    my ($vsn) = @_;
+    $vsn =~ s/-[^-]+$//;
+    return $vsn;
+}
+

 sub source_file_leafname ($$$) {
     my ($package,$vsn,$sfx) = @_;
     return "${package}_".(stripepoch $vsn).$sfx
 sub source_file_leafname ($$$) {
     my ($package,$vsn,$sfx) = @_;
     return "${package}_".(stripepoch $vsn).$sfx

diff --git a/dgit b/dgit
index 283db224f2753023463decb63e43d2cb21b2c9e0..dbb23f39deeb6397b595b09f2b40fda814d123a5 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -217,12 +217,6 @@ sub changespat ($;$) {
     return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
 }
 
     return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
 }
 

-sub upstreamversion ($) {
-    my ($vsn) = @_;
-    $vsn =~ s/-[^-]+$//;
-    return $vsn;
-}
-

 our $us = 'dgit';
 initdebug('');
 
 our $us = 'dgit';
 initdebug('');