summaryrefslogtreecommitdiff
path: root/Debian
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-03 14:10:37 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-03 14:53:45 +0100
commit21e1afc5f7963a0223207d8284f2f2d0d382cc6f (patch)
tree40c7662033780abb6a5edc3d4011a79583416d5d /Debian
parentdcdaf7a166dbf5599eefb8174a2445ed90560e23 (diff)
Dgit.pm: Move upstreamversion from dgit
NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'Debian')
-rw-r--r--Debian/Dgit.pm7
1 files changed, 7 insertions, 0 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 787e506..1cd765d 100644
--- 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,6 +232,12 @@ 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