Przeglądaj źródła

Dpkg::Source::Package::V3::quilt: set QUILT_PATCH_OPTS to mimick D::S::Patch

When building "3.0 (quilt)" source packages, use QUILT_PATCH_OPTS="-t -F 0
-N -u -V never -g0" so that quilt is as strict as dpkg-source's internal
implementation of quilt that relies on Dpkg::Source::Patch::apply().
Raphaël Hertzog 16 lat temu
rodzic
commit
6dbf501ff1
2 zmienionych plików z 7 dodań i 2 usunięć
  1. 3 0
      debian/changelog
  2. 4 2
      scripts/Dpkg/Source/Package/V3/quilt.pm

+ 3 - 0
debian/changelog

@@ -10,6 +10,9 @@ dpkg (1.15.5.3) UNRELEASED; urgency=low
     to use.
   * Add missing "use Dpkg::Gettext" in Dpkg::Changelog::Entry::Debian.
     Closes: #557668
+  * When building "3.0 (quilt)" source packages, use QUILT_PATCH_OPTS="-t -F 0
+    -N -u -V never -g0" so that quilt is as strict as dpkg-source's internal
+    implementation of quilt. Closes: #557664
 
   [ Guillem Jover ]
   * Verify that the alternative used in update-alternatives --set has been

+ 4 - 2
scripts/Dpkg/Source/Package/V3/quilt.pm

@@ -114,7 +114,10 @@ sub run_quilt {
     }
     my %opts = (
         env => { QUILT_PATCHES => "$absdir/debian/patches",
-                 QUILT_SERIES => $series },
+                 QUILT_SERIES => $series,
+                 # Kept as close as possible to default patch options in
+                 # Dpkg::Source::Patch (used in without_quilt mode)
+                 QUILT_PATCH_OPTS => "-t -F 0 -N -u -V never -g0" },
         'chdir' => $dir,
         'exec' => [ 'quilt', '--quiltrc', '/dev/null', @$params ],
         %more_opts
@@ -169,7 +172,6 @@ sub apply_patches {
         $opts{"to_file"} = "/dev/null" if $skip_auto;
         info(_g("applying all patches with %s"), "quilt push -q " . $patches[-1]) unless $skip_auto;
         $self->run_quilt($dir, ['push', '-q', $patches[-1]],
-                         delete_env => ['QUILT_PATCH_OPTS'],
                          wait_child => 1, %opts);
         foreach my $patch (@patches) {
             foreach my $fn (keys %{$panalysis->{$patch}->{'filepatched'}}) {