[PATCH 5/8] Sbuild::Build: Add OSVersion version

[Roger Leigh]

OSVersion is the original version with a stripped epoch.
This complements SVersion which is the amended version with
a stripped epoch, and is used to set the 'DSC File' attribute.
---
 lib/Sbuild/Build.pm |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm
index fc54295..4469156 100644
--- a/lib/Sbuild/Build.pm
+++ b/lib/Sbuild/Build.pm
@@ -91,10 +91,12 @@ sub new {
     debug("DSC Dir = " . $self->get('DSC Dir') . "\n");
     debug("Package_Version = " . $self->get('Package_Version') . "\n");
     debug("Package_OVersion = " . $self->get('Package_OVersion') . "\n");
+    debug("Package_OSVersion = " . $self->get('Package_OSVersion') . "\n");
     debug("Package_SVersion = " . $self->get('Package_SVersion') . "\n");
     debug("Package = " . $self->get('Package') . "\n");
     debug("Version = " . $self->get('Version') . "\n");
     debug("OVersion = " . $self->get('OVersion') . "\n");
+    debug("OSVersion = " . $self->get('OSVersion') . "\n");
     debug("SVersion = " . $self->get('SVersion') . "\n");
     debug("VersionEpoch = " . $self->get('VersionEpoch') . "\n");
     debug("VersionUpstream = " . $self->get('VersionUpstream') . "\n");
@@ -150,7 +152,10 @@ sub set_version {
     debug("Setting package version: $pkgv\n");
 
     my ($pkg, $version) = split /_/, $pkgv;
-    my $oversion = $version; # Original version (no binNMU addition)
+    # Original version (no binNMU or other addition)
+    my $oversion = $version;
+    # Original version with stripped epoch
+    (my $osversion = $version) =~ s/^\d+://;
 
     # Add binNMU to version if needed.
     if ($self->get_conf('BIN_NMU') || $self->get_conf('APPEND_TO_VERSION')) {
@@ -158,7 +163,8 @@ sub set_version {
 	    $self->get_conf('APPEND_TO_VERSION'));
     }
 
-    (my $sversion = $version) =~ s/^\d+://; # Strip epoch
+    # Version with binNMU or other additions and stripped epoch
+    (my $sversion = $version) =~ s/^\d+://;
 
     my ($epoch, $uversion, $dversion) = split_version($version);
 
@@ -166,13 +172,15 @@ sub set_version {
     $self->set('Version', $version);
     $self->set('Package_Version', "${pkg}_$version");
     $self->set('Package_OVersion', "${pkg}_$oversion");
+    $self->set('Package_OSVersion', "${pkg}_$osversion");
     $self->set('Package_SVersion', "${pkg}_$sversion");
     $self->set('OVersion', $oversion);
+    $self->set('OSVersion', $osversion);
     $self->set('SVersion', $sversion);
     $self->set('VersionEpoch', $epoch);
     $self->set('VersionUpstream', $uversion);
     $self->set('VersionDebian', $dversion);
-    $self->set('DSC File', "${pkg}_${sversion}.dsc");
+    $self->set('DSC File', "${pkg}_${osversion}.dsc");
     $self->set('DSC Dir', "${pkg}-${uversion}");
 }
 
-- 
1.6.3.3


--/NkBOFFp2J2Af1nK
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0006-debian-Close-546647.patch"