Selaa lähdekoodia

Dpkg::Source::Package::V1: Disable upstream tar signature when building

The current stable dpkg series does not support extracting upstream tar
signatures. So let's disable this for now until either those are
supported in 1.17.x or 1.18.x, and we'll be able to enable them again
in 1.18.x or 1.19.x respectively.
Guillem Jover 10 vuotta sitten
vanhempi
commit
92ca32c34f
2 muutettua tiedostoa jossa 6 lisäystä ja 1 poistoa
  1. 3 0
      debian/changelog
  2. 3 1
      scripts/Dpkg/Source/Package/V1.pm

+ 3 - 0
debian/changelog

@@ -74,6 +74,9 @@ dpkg (1.18.8) UNRELEASED; urgency=medium
       Closes: #823805
       Closes: #823805
     - Check whether dependency restrictions are implied in Dpkg::Deps::Simple.
     - Check whether dependency restrictions are implied in Dpkg::Deps::Simple.
       Thanks to Ben Hutchings <ben@decadent.org.uk>. Closes: #827633
       Thanks to Ben Hutchings <ben@decadent.org.uk>. Closes: #827633
+    - Disable upstream tar signature when building format 1.0 source packages
+      in Dpkg::Source::Package::V1, as the current stable dpkg series do not
+      support extracting them.
   * Test suite:
   * Test suite:
     - Bump perlcritic ValuesAndExpressions::RequireNumberSeparators minimum
     - Bump perlcritic ValuesAndExpressions::RequireNumberSeparators minimum
       to 99999.
       to 99999.

+ 3 - 1
scripts/Dpkg/Source/Package/V1.pm

@@ -405,7 +405,9 @@ sub do_build {
     }
     }
 
 
     $self->add_file($tarname) if $tarname;
     $self->add_file($tarname) if $tarname;
-    $self->add_file($tarsign) if $tarsign and -e $tarsign;
+    # XXX: Reenable once a stable dpkg supports extracting upstream signatures
+    # for source 1.0 format, either in 1.17.x or 1.18.x.
+    #$self->add_file($tarsign) if $tarsign and -e $tarsign;
 
 
     if ($sourcestyle =~ m/[kpKP]/) {
     if ($sourcestyle =~ m/[kpKP]/) {
         if (stat($origdir)) {
         if (stat($origdir)) {