Dpkg::Vars: Deprecate $sourcepackage package variable

Replace direct usage with function accessor.

Addresses Variables::ProhibitPackageVars.

Warned-by: perlcritic

scripts/Dpkg/Vars.pm

@@ -1,4 +1,4 @@
-# Copyright © 2007-2009,2012 Guillem Jover <guillem@debian.org>
+# Copyright © 2007-2009,2012-2013 Guillem Jover <guillem@debian.org>
 # Copyright © 2007 Raphaël Hertzog <hertzog@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -19,16 +19,20 @@ package Dpkg::Vars;
 use strict;
 use warnings;
 
-our $VERSION = '0.02';
+our $VERSION = '0.03';
 
 use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 use Dpkg::Package;
 
 use Exporter qw(import);
-our @EXPORT = qw($sourcepackage set_source_package);
+our @EXPORT = qw(get_source_package set_source_package);
 
-our $sourcepackage;
+my $sourcepackage;
+
+sub get_source_package {
+    return $sourcepackage;
+}
 
 sub set_source_package {
     my $v = shift;

scripts/dpkg-genchanges.pl

@@ -399,12 +399,13 @@ if (!is_binaryonly) {
 	warning(_g('missing Priority for source files'));
     }
 
+    my $spackage = get_source_package();
     (my $sversion = $substvars->get('source:Version')) =~ s/^\d+://;
-    $dsc= "$uploadfilesdir/${sourcepackage}_${sversion}.dsc";
+    $dsc= "$uploadfilesdir/${spackage}_${sversion}.dsc";
 
     my $dsc_fields = Dpkg::Control->new(type => CTRL_PKG_SRC);
     $dsc_fields->load($dsc) || error(_g('%s is empty', $dsc));
-    $checksums->add_from_file($dsc, key => "$sourcepackage\_$sversion.dsc");
+    $checksums->add_from_file($dsc, key => "$spackage\_$sversion.dsc");
     $checksums->add_from_control($dsc_fields, use_files_for_md5 => 1);
 
     for my $f ($checksums->get_files()) {
@@ -491,7 +492,7 @@ $checksums->export_to_control($fields);
 # redundant with the Files field
 delete $fields->{'Checksums-Md5'};
 
-$fields->{'Source'}= $sourcepackage;
+$fields->{'Source'} = get_source_package();
 if ($fields->{'Version'} ne $substvars->get('source:Version')) {
     $fields->{'Source'} .= ' (' . $substvars->get('source:Version') . ')';
 }

scripts/dpkg-gencontrol.pl

@@ -316,6 +316,7 @@ if ($pkg_type eq 'udeb') {
     }
 }
 
+my $sourcepackage = get_source_package();
 my $verdiff = $binaryversion ne $sourceversion;
 if ($oppackage ne $sourcepackage || $verdiff) {
     $fields->{'Source'} = $sourcepackage;

scripts/dpkg-source.pl

@@ -398,7 +398,7 @@ if ($options{opmode} =~ /^(-b|--print-format|--(before|after)-build|--commit)$/)
 
     # Write the .dsc
     my $dscname = $srcpkg->get_basename(1) . '.dsc';
-    info(_g('building %s in %s'), $sourcepackage, $dscname);
+    info(_g('building %s in %s'), get_source_package(), $dscname);
     $srcpkg->write_dsc(filename => $dscname,
 		       remove => \%remove,
 		       override => \%override,