The following commit has been merged in the master branch: commit 82304f1f29964a56cb498ed937c4fd5a97d23a7a Author: Guillem Jover <guil...@debian.org> Date: Fri Nov 21 11:38:04 2008 +0200
dpkg-source: Use default compressor values from Dpkg::Source::Compressor diff --git a/debian/changelog b/debian/changelog index 790aa4f..6526f56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ dpkg (1.15.3) UNRELEASED; urgency=low [ Guillem Jover ] * Unset TAR_OPTIONS when extracting .deb archives. Closes: #530860 + * Use default compressor values in dpkg-source from Dpkg::Source::Compressor. [ Raphael Hertzog ] * Unset TAR_OPTIONS when creating/extracting tar archives for source diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 232caa7..b461a3a 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -33,9 +33,9 @@ my $changelogformat; my @build_formats = ("1.0", "3.0 (native)"); my %options = ( # Compression related - compression => 'gzip', - comp_level => 9, - comp_ext => $comp_ext{'gzip'}, + compression => $Dpkg::Source::Compressor::default_compression, + comp_level => $Dpkg::Source::Compressor::default_compression_level, + comp_ext => $comp_ext{$Dpkg::Source::Compressor::default_compression}, # Ignore files tar_ignore => [], diff_ignore_regexp => '', @@ -380,9 +380,9 @@ Build options: (defaults to: '%s'). -I[<pattern>] filter out files when building tarballs (defaults to: %s). - -Z<compression> select compression to use (defaults to 'gzip', + -Z<compression> select compression to use (defaults to '%s', supported are: %s). - -z<level> compression level to use (defaults to '9', + -z<level> compression level to use (defaults to '%d', supported are: '1'-'9', 'best', 'fast') Extract options: @@ -399,6 +399,7 @@ See dpkg-source(1) for more info. "), $progname, $Dpkg::Source::Package::diff_ignore_default_regexp, join(' ', map { "-I$_" } @Dpkg::Source::Package::tar_ignore_default_pattern), - "@comp_supported"; + $Dpkg::Source::Compressor::default_compression, "@comp_supported", + $Dpkg::Source::Compressor::default_compression_level; } -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org