Bug#408870: dh-make: Again problems with the bzip2 and gzip path

[Stefano Sabatini]

Package: dh-make
Version: 0.42
Severity: normal
Tags: patch


Hi,

I see you changed in the script dh_make the base path of bzip2 and gzip
from /usr/bin to /bin (see bug #37723). Indeed in recent versions of
both bzip2 and gzip they're placed in /bin.

The patch attached make dh_make working for both cases (bzip2 and gzip
in /usr/bin or in /bin), so it will prevent errors even in the case
the script is executed in a not upgraded system.

Another idea could be to set between the dependencies of dh-make recent
versions of bzip2 and gzip.

Cheers

-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.19.1.070117.lupin
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)

Versions of packages dh-make depends on:
ii  debhelper                     5.0.42     helper programs for debian/rules
ii  dpkg-dev                      1.13.25    package building tools for Debian
ii  make                          3.81-2     The GNU version of the "make" util
ii  perl                          5.8.8-6.1  Larry Wall's Practical Extraction 

dh-make recommends no packages.

-- no debconf information

*** dh_make.orig        2007-01-28 21:00:49.000000000 +0100
--- dh_make     2007-01-28 21:06:58.000000000 +0100
***************
*** 413,428 ****
    } else {
      if ($source_file)
      {
!       if (-f $source_file)
        {
          if ($source_file =~ /gz$/ ) 
        {
            system('cp', '-a', "$source_file", 
"../$package_name\_$version.orig.tar.gz");
        } elsif ($source_file =~ /bz2$/ )
        {
!         if ( -x '/bin/bzip2' && -x '/bin/gzip' )
!         {
!           system("/bin/bzip2 -cd $source_file | /bin/gzip > 
../$package_name\_$version.orig.tar.gz");
          } else {
            die('Source file is a bz2 but bzip2 or gzip not available');
          }
--- 413,429 ----
    } else {
      if ($source_file)
      {
!       if (-f $source_file)
        {
          if ($source_file =~ /gz$/ ) 
        {
            system('cp', '-a', "$source_file", 
"../$package_name\_$version.orig.tar.gz");
        } elsif ($source_file =~ /bz2$/ )
        {
!         if ( (-x '/bin/bzip2' or -x '/usr/bin/bzip2') && 
!              (-x '/bin/gzip' or -x '/usr/bin/gzip'))
!           {
!           system("bzip2 -cd $source_file | gzip > 
../$package_name\_$version.orig.tar.gz");
          } else {
            die('Source file is a bz2 but bzip2 or gzip not available');
          }