Bug#637900: patch to support xz files

[Sjoerd Simons]

tag 637900 +patch

Hey,

patch attached, seems to work :)
-- 
Sjoerd Simons <sjo...@luon.net>

Index: svn-buildpackage
===================================================================
--- svn-buildpackage	(revision 19212)
+++ svn-buildpackage	(working copy)
@@ -386,9 +386,12 @@
 
 my $orig = $package."_".$upVersion.".orig.tar.gz";
 my $bzorig = $package."_".$upVersion.".orig.tar.bz2";
+my $xzorig = $package."_".$upVersion.".orig.tar.xz";
 
 if ($$c{"origDir"}) {
    my $bzorigExpect = $$c{"origDir"}."/$bzorig";
+   my $xzorigExpect = $$c{"origDir"}."/$xzorig";
+
    # See #560391 for why we can't use dpkg-source --print-format .
    my $check;
    $check = `grep \"3.0\" debian/source/format`
@@ -398,6 +401,11 @@
      $origExpect = $$c{"origDir"}."/$bzorig"; # just for the messages
      $orig = $bzorig;
    }
+   elsif ((-f $xzorigExpect) and (defined $check))
+   {
+     $origExpect = $$c{"origDir"}."/$xzorig"; # just for the messages
+     $orig = $xzorig;
+   }
    else
    {
      $origExpect = $$c{"origDir"}."/$orig"; # just for the messages
@@ -412,8 +420,8 @@
     }
 };
 my $origDir = $$c{"origDir"} || "$startdir/../tarballs";
-my %otherOrigFiles = map { /\.orig-([\w-]+)\.tar\.(gz|bz2|lzma)$/ ? ($1 => $_) : () } grep {
-    /(?:^|\/)\Q${package}_${upVersion}\E\.orig-[\w-]+\.tar\.(gz|bz2|lzma)$/
+my %otherOrigFiles = map { /\.orig-([\w-]+)\.tar\.(gz|bz2|lzma|xz)$/ ? ($1 => $_) : () } grep {
+    /(?:^|\/)\Q${package}_${upVersion}\E\.orig-[\w-]+\.tar\.(gz|bz2|lzma|xz)$/
 } <$origDir/*>;
 
 if(!defined($origfile)) {
@@ -607,6 +615,7 @@
    else {
       my $compress = "--gzip";
       $compress = "--bzip2" if ($orig =~ /\.tar\.bz2/);
+      $compress = "--xz" if ($orig =~ /\.tar\.xz/);
       withecho "tar", "--no-same-owner", "--no-same-permissions", "--extract", $compress, "--file", $origfile, "--directory", "$ba/tmp-$mod";
       my @entries = (<$ba/tmp-$mod/*>);
       if (@entries == 1) {
Index: svn-upgrade
===================================================================
--- svn-upgrade	(revision 19212)
+++ svn-upgrade	(working copy)
@@ -58,7 +58,7 @@
   -e, --auto-epoch                 Increase epoch of package version if the new
                                    upstream version is lower than the current
 
-The new source may be a tarball compressed with gzip or bzip2 or a
+The new source may be a tarball compressed with gzip, bzip2 or xz a
 directory with extraced source.
 "); exit 1;
 }
@@ -302,6 +302,9 @@
 elsif ($filestr =~ /bzip/){
    $cat = "bzcat \"$newsource\"";
 }
+elsif ($filestr =~ /xz/){
+   $cat = "xzcat \"$newsource\"";
+}
 elsif ($filestr =~ /tar archive/){
    $cat = "cat $newsource";
 }