diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:30:11 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:30:11 +0000 |
commit | b4f7d8b1566e3220d0e9004499ef9c257e079c57 (patch) | |
tree | ce0468ca8cf21380bef3d2aaacc9fcb30116e757 /scripts/Dpkg/Source/Package | |
parent | Releasing progress-linux version 1.22.6-0.0~progress7.99u1. (diff) | |
download | dpkg-b4f7d8b1566e3220d0e9004499ef9c257e079c57.tar.xz dpkg-b4f7d8b1566e3220d0e9004499ef9c257e079c57.zip |
Merging upstream version 1.22.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'scripts/Dpkg/Source/Package')
-rw-r--r-- | scripts/Dpkg/Source/Package/V1.pm | 3 | ||||
-rw-r--r-- | scripts/Dpkg/Source/Package/V2.pm | 3 | ||||
-rw-r--r-- | scripts/Dpkg/Source/Package/V3/Bzr.pm | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm index bdf2c87..566fd24 100644 --- a/scripts/Dpkg/Source/Package/V1.pm +++ b/scripts/Dpkg/Source/Package/V1.pm @@ -291,8 +291,7 @@ sub do_build { my $sourcepackage = $self->{fields}{'Source'}; my $basenamerev = $self->get_basename(1); my $basename = $self->get_basename(); - my $basedirname = $basename; - $basedirname =~ s/_/-/; + my $basedirname = $self->get_basedirname(); # Try to find a .orig tarball for the package my $origdir = "$dir.orig"; diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm index 1f09461..a3d6c49 100644 --- a/scripts/Dpkg/Source/Package/V2.pm +++ b/scripts/Dpkg/Source/Package/V2.pm @@ -406,8 +406,7 @@ sub check_patches_applied { sub _generate_patch { my ($self, $dir, %opts) = @_; my ($dirname, $updir) = fileparse($dir); - my $basedirname = $self->get_basename(); - $basedirname =~ s/_/-/; + my $basedirname = $self->get_basedirname(); # Identify original tarballs my ($tarfile, %addonfile); diff --git a/scripts/Dpkg/Source/Package/V3/Bzr.pm b/scripts/Dpkg/Source/Package/V3/Bzr.pm index adc5fda..953f7d9 100644 --- a/scripts/Dpkg/Source/Package/V3/Bzr.pm +++ b/scripts/Dpkg/Source/Package/V3/Bzr.pm @@ -109,9 +109,6 @@ sub do_build { my $sourcepackage = $self->{fields}{'Source'}; my $basenamerev = $self->get_basename(1); - my $basename = $self->get_basename(); - my $basedirname = $basename; - $basedirname =~ s/_/-/; _check_workdir($dir); @@ -179,7 +176,6 @@ sub do_extract { my ($self, $newdirectory) = @_; my $fields = $self->{fields}; - my $basename = $self->get_basename(); my $basenamerev = $self->get_basename(1); my @files = $self->get_files(); |