The following commit has been merged in the lenny branch:
commit 9e780c86920150be8bdd63526a7b19a8c1bbcee2
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Sat Jun 21 18:57:17 2008 +0200
dpkg-source/3.0 (quilt): let quilt use non-standard series file
* scripts/Dpkg/Source/Package/V3/quilt.pm: Define QUILT_SERIES
when running quilt in order to be able to use quilt series with
non-standard names (like debian.series or ubuntu.series).
diff --git a/ChangeLog b/ChangeLog
index 718f826..29bf8f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-21 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * scripts/Dpkg/Source/Package/V3/quilt.pm: Define QUILT_SERIES
+ when running quilt in order to be able to use quilt series with
+ non-standard names (like debian.series or ubuntu.series).
+
2008-06-18 Raphael Hertzog <[EMAIL PROTECTED]>
* configure.ac: Bump version to 1.14.21~.
diff --git a/debian/changelog b/debian/changelog
index e9b73e7..f158736 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
dpkg (1.14.21) UNRELEASED; urgency=low
- *
+ [ Raphael Hertzog ]
+ * Small fix in "3.0 (quilt)" source format when using non-standard name
+ of the quilt series.
-- Raphael Hertzog <[EMAIL PROTECTED]> Wed, 18 Jun 2008 10:19:51 +0200
diff --git a/scripts/Dpkg/Source/Package/V3/quilt.pm
b/scripts/Dpkg/Source/Package/V3/quilt.pm
index f97794a..8f6a19f 100644
--- a/scripts/Dpkg/Source/Package/V3/quilt.pm
+++ b/scripts/Dpkg/Source/Package/V3/quilt.pm
@@ -105,8 +105,13 @@ sub run_quilt {
unless (File::Spec->file_name_is_absolute($absdir)) {
$absdir = File::Spec->rel2abs($dir);
}
+ my $series = $self->get_series_file($dir);
+ unless (File::Spec->file_name_is_absolute($series)) {
+ $series = File::Spec->rel2abs($series);
+ }
my %opts = (
- env => { QUILT_PATCHES => "$absdir/debian/patches" },
+ env => { QUILT_PATCHES => "$absdir/debian/patches",
+ QUILT_SERIES => $series },
'chdir' => $dir,
'exec' => [ 'quilt', '--quiltrc', '/dev/null', @$params ],
%more_opts
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
