Hi Joachim,
On Thu, May 15, 2014 at 02:30:03PM +0200, Joachim Breitner wrote:
> > The result is definitely different.
>
> Can you push your Z-handling patch so that I can reproduce the issue?
Since it is really a hack due to the
if ( $comp =~ /Z/ ) { $comp = 'gzip' ; }
line - we just discussed that this should not be done, I'm to shy to commit
but I'm attaching the patch here.
Kind regards
Andreas.
--
http://fam-tille.de
>From a1c7b5804d8c7b06fc4988328d6cc29d6f93b8ad Mon Sep 17 00:00:00 2001
From: Andreas Tille <[email protected]>
Date: Thu, 15 May 2014 14:38:48 +0200
Subject: [PATCH] Hack to enable Z compression
---
Devscripts/Compression.pm | 1 +
scripts/mk-origtargz.pl | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Devscripts/Compression.pm b/Devscripts/Compression.pm
index 5cb08a2..8baa5ef 100644
--- a/Devscripts/Compression.pm
+++ b/Devscripts/Compression.pm
@@ -46,6 +46,7 @@ my %mime2comp = (
"application/bzip2 " => "bzip2",
"application/x-xz" => "xz",
"application/xz" => "xz",
+ "application/x-compress" => "Z",
);
sub compression_guess_from_file {
diff --git a/scripts/mk-origtargz.pl b/scripts/mk-origtargz.pl
index 112ea93..ed86df6 100755
--- a/scripts/mk-origtargz.pl
+++ b/scripts/mk-origtargz.pl
@@ -303,7 +303,8 @@ my $zip_regex = qr/\.(zip|jar)$/;
my $tar_regex = qr/\.(tar\.gz |tgz
|tar\.bz2 |tbz2?
|tar.lzma |tlz(?:ma?)?
- |tar.xz |txz)$/x;
+ |tar.xz |txz
+ |tar.Z)$/x;
my $is_zipfile = $upstream =~ $zip_regex;
my $is_tarfile = $upstream =~ $tar_regex;
@@ -496,6 +497,7 @@ sub decompress_archive($$) {
die("Cannot determine compression method of $from_file");
}
+ if ( $comp =~ /Z/ ) { $comp = 'gzip' ; }
my $cmd = compression_get_property($comp, 'decomp_prog');
spawn(exec => $cmd,
from_file => $from_file,
--
2.0.0.rc0
_______________________________________________
devscripts-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
