Bug#617964: svn-buildpackage: svn-upgrade shouldn't repack bz2 tarball into *.orig.tar.gz

[Robert Luberda]

Package: svn-buildpackage
Version: 0.8.3
Severity: normal
Tags: patch


The 3.0 source package format allows upstream tarballs to be compressed
with bzip2, but svn-upgrade  repacks it into a gzip-compressed one. 
svn-buildpackage already handles orig.tar.bz2 files, and svn-upgrade also
should. The attached patch fixes the issue.

Regards,
robert



-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (200, 'testing')
Architecture: i386 (i686)

Kernel: Linux 2.6.37-1-686 (SMP w/1 CPU core)
Locale: LANG=pl_PL, LC_CTYPE=pl_PL (charmap=ISO-8859-2)
Shell: /bin/sh linked to /bin/dash

Versions of packages svn-buildpackage depends on:
ii  devscripts                  2.10.71      scripts to make the life of a Debi
ii  file                        5.04-5       Determines file type using "magic"
ii  libcapture-tiny-perl        0.10-1       module to capture STDOUT and STDER
ii  libfile-libmagic-perl       0.96-1       Perl interface to libmagic for det
ii  liblocale-gettext-perl      1.05-6       Using libc functions for internati
ii  libsvn-perl                 1.6.16dfsg-1 Perl bindings for Subversion
ii  liburi-perl                 1.58-1       module to manipulate and access UR
ii  perl                        5.10.1-17    Larry Wall's Practical Extraction 
ii  subversion                  1.6.16dfsg-1 Advanced version control system
ii  unp                         2.0~pre6     unpack (almost) everything with on
ii  wget                        1.12-2.1     retrieves files from the web

Versions of packages svn-buildpackage recommends:
ii  debhelper                     8.1.2      helper programs for debian/rules

svn-buildpackage suggests no packages.

-- no debconf information

-- debsums errors found:
debsums: changed file /usr/bin/svn-buildpackage (from svn-buildpackage package)
debsums: changed file /usr/bin/svn-upgrade (from svn-buildpackage package)

--- svn-upgrade.old	2010-05-23 00:00:00.000000000 +0200
+++ svn-upgrade	2011-03-12 22:47:03.000000000 +0100
@@ -293,6 +293,7 @@
 
 my $cat;
 my $justcopy;
+my $ext='gz';
 
 my $filestr = File::LibMagic::MagicFile($newsource);
 if ($filestr =~ /gzip/){
@@ -301,6 +302,13 @@
 }
 elsif ($filestr =~ /bzip/){
    $cat = "bzcat \"$newsource\"";
+   # See #560391 for why we can't use dpkg-source --print-format .
+   my $check = (-f "debian/source/format") ? `grep \"3.0\" debian/source/format` : undef;
+   if (defined $check)
+   {
+     $justcopy=1;# Always copy. Maintainer should recompress manually, if needed. if ($filestr =~ /max compression/);
+     $ext = 'bz2';
+   }
 }
 elsif ($filestr =~ /tar archive/){
    $cat = "cat $newsource";
@@ -312,7 +320,7 @@
    error _g("Unknown compression method!\n");
 }
 
-my $neworig="$origdir/".$package."_".$upsVersion.".orig.tar.gz";
+my $neworig="$origdir/".$package."_".$upsVersion.".orig.tar.".$ext;
 
 error sprintf(_g("%s exists, aborting...\n"), $neworig)
   if (-e $neworig && realpath($neworig) ne realpath($newsource));
@@ -365,6 +373,9 @@
 if($filestr =~ /directory/) {
    withecho("cp","-a", $newsource, "$tmpdir/");
 }
+elsif ($ext eq "bz2") {
+   withecho("tar", "jxf", $neworig, "-C", "$tmpdir");
+}
 else {
    withecho("tar", "zxf", $neworig, "-C", "$tmpdir");
 }
@@ -393,7 +404,7 @@
 }
 
 chdir $tmpdir;
-system "rm -f *.gz";
+system "rm -f *." . $ext;
 
 # if needed, remove uninteressting files from the upstream directory,
 # or move the directory to some with the proper name

signature.asc
Description: Digital signature