tags 628357 + patch
thanks

Dear maintainer,

The problems seems to be parsing the ouptut of perl -v when a binary
for perl 5 is found. Changing the invocation to awk as in attached
patch would fix.

Note I have attached patch as nmu-diff, but I have not taken yet any
further actions. I too converted for my test the package to '3.0
(quilt)'.

The relevant part is only:

+--- a/reconfig                                                            
++++ b/reconfig                                                    
+@@ -59,7 +59,7 @@                                         
+       while (<$dir/perl5* $dir/perl*>) {
+               if (-x $_) {
+                       $perl_version=`($_ -v 2> /dev/null) |             
+-                              awk '/This is perl, v.*5/ { print $NF }'`;
++                              awk '/This is perl 5, version/ { print $NF }'`;
+                       if ($perl_version) {
+                               $PERL=$_;                               
+                               $pflag="1";        

Furthermore I refreshed the 01-conglomeration.patch patch. 

Regards.
Salvatore
diff -Nru tct-1.19/debian/changelog tct-1.19/debian/changelog
--- tct-1.19/debian/changelog	2011-06-15 21:31:04.000000000 +0200
+++ tct-1.19/debian/changelog	2011-06-15 21:30:01.000000000 +0200
@@ -1,3 +1,14 @@
+tct (1.19-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Refresh offsets for 01-conglomeration.patch. 
+  * Add 03-check-for-perl5-fix.patch to adapt check for perl 5
+    (Closes: #628357). 
+  * Covert to '3.0 (quilt)' source package format and drop quilt framework
+    from debian/control and debian/rules. 
+
+ -- Salvatore Bonaccorso <car...@debian.org>  Wed, 15 Jun 2011 21:29:36 +0200
+
 tct (1.19-1) unstable; urgency=low
 
   * Merging upstream version 1.19
diff -Nru tct-1.19/debian/control tct-1.19/debian/control
--- tct-1.19/debian/control	2011-06-15 21:31:04.000000000 +0200
+++ tct-1.19/debian/control	2011-06-15 21:29:06.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Forensics <forensics-de...@lists.alioth.debian.org>
 Uploaders: Christophe Monniez <christophe.monn...@fccu.be>
-Build-Depends: debhelper (>= 7.0.50~), quilt, e2fslibs-dev
+Build-Depends: debhelper (>= 7.0.50~), e2fslibs-dev
 Standards-Version: 3.8.3
 Homepage: http://www.porcupine.org/forensics/tct.html
 Vcs-Browser: http://git.debian.org/?p=forensics/tct.git
diff -Nru tct-1.19/debian/patches/01-conglomeration.patch tct-1.19/debian/patches/01-conglomeration.patch
--- tct-1.19/debian/patches/01-conglomeration.patch	2011-06-15 21:31:04.000000000 +0200
+++ tct-1.19/debian/patches/01-conglomeration.patch	2011-06-15 21:23:22.000000000 +0200
@@ -1,16 +1,15 @@
 Author: n/a
 Description: Needs to be broken out (FIXME).
 
-diff -Naurp tct.orig/bin/grave-robber tct/bin/grave-robber
---- tct.orig/bin/grave-robber	2007-01-21 22:18:00.000000000 +0000
-+++ tct/bin/grave-robber	2008-11-28 07:58:27.000000000 +0000
+--- a/bin/grave-robber
++++ b/bin/grave-robber
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl5
 +#!/usr/bin/perl
  
  #
  #  Usage: $0 [-filmnpstvDEFIMOPVS] [-b body_file] [-c corpse_dir] 
-@@ -118,7 +118,7 @@ else {
+@@ -118,7 +118,7 @@
  $TCT_HOME = "";
  	}
  
@@ -19,7 +18,7 @@
  
  #
  # get user input on what the program should do...
-@@ -415,10 +415,10 @@ print "going into grave_robber_init()\n"
+@@ -415,10 +415,10 @@
  #
  &log_init_path($logfile);
  
@@ -34,9 +33,8 @@
  
  if (!$TCT_HOME) {
  	die "Can't find TCT_HOME - did you run reconfig?\n";
-diff -Naurp tct.orig/bin/mactime tct/bin/mactime
---- tct.orig/bin/mactime	2007-01-21 22:18:00.000000000 +0000
-+++ tct/bin/mactime	2008-11-28 07:58:27.000000000 +0000
+--- a/bin/mactime
++++ b/bin/mactime
 @@ -1,5 +1,5 @@
 -#!/usr/bin/perl5
 -#
@@ -54,18 +52,16 @@
  }
  
  require "body_init.pl";
-diff -Naurp tct.orig/bin/strip_tct_home tct/bin/strip_tct_home
---- tct.orig/bin/strip_tct_home	2007-01-21 22:18:00.000000000 +0000
-+++ tct/bin/strip_tct_home	2008-11-28 07:58:27.000000000 +0000
+--- a/bin/strip_tct_home
++++ b/bin/strip_tct_home
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl5
 +#!/usr/bin/perl
  #
  #  NOTE!!!
  #
-diff -Naurp tct.orig/conf/coroner.cf tct/conf/coroner.cf
---- tct.orig/conf/coroner.cf	2007-01-21 22:18:00.000000000 +0000
-+++ tct/conf/coroner.cf	2008-11-28 07:58:27.000000000 +0000
+--- a/conf/coroner.cf
++++ b/conf/coroner.cf
 @@ -4,9 +4,9 @@
  
  $TCT_HOME = "";
@@ -78,10 +74,9 @@
  
  #
  #  Where all the full pathnames to the various shell binaries used live
-diff -Naurp tct.orig/conf/grave-robber.cf tct/conf/grave-robber.cf
---- tct.orig/conf/grave-robber.cf	2007-01-21 22:18:00.000000000 +0000
-+++ tct/conf/grave-robber.cf	2008-11-28 07:58:27.000000000 +0000
-@@ -9,7 +9,7 @@ $BIN    = "$TCT_HOME/bin"  unless $BIN;
+--- a/conf/grave-robber.cf
++++ b/conf/grave-robber.cf
+@@ -9,7 +9,7 @@
  $ETC    = "$TCT_HOME/etc"  unless $ETC;
  $CONFIG = "$TCT_HOME/conf" unless $CONFIG;
  
@@ -90,7 +85,7 @@
  
  #
  #  Where all the full pathnames to the various shell binaries used live
-@@ -140,7 +140,7 @@ $strings_log = "strings_log";
+@@ -140,7 +140,7 @@
  #
  # What tools/files do we want to investigate immediately?
  #
@@ -99,9 +94,8 @@
  
  #
  #  I think BSD ps returns >= 12 fields (after header) when you do a ps -auxwwge
-diff -Naurp tct.orig/conf/look@first tct/conf/look@first
---- tct.orig/conf/look@first	2000-07-30 23:39:20.000000000 +0000
-+++ tct/conf/look@first	2008-11-28 07:58:27.000000000 +0000
+--- a/conf/look@first
++++ b/conf/look@first
 @@ -1,6 +1,6 @@
  #
  #  These are dirs containing tools & files we want to investigate first,
@@ -110,10 +104,9 @@
  # worrying about destroying forensic evidence.
  #
  #  We automatically go through the $PATH variable of the user running
-diff -Naurp tct.orig/conf/paths.pl tct/conf/paths.pl
---- tct.orig/conf/paths.pl	2007-01-21 22:18:00.000000000 +0000
-+++ tct/conf/paths.pl	2008-11-28 07:58:27.000000000 +0000
-@@ -13,7 +13,7 @@ $CP="/bin/cp";
+--- a/conf/paths.pl
++++ b/conf/paths.pl
+@@ -13,7 +13,7 @@
  
  $CRONTAB="/usr/bin/crontab";
  $DATE="/bin/date";
@@ -122,7 +115,7 @@
  $DOMAINNAME="/bin/domainname";
  $ECHO="/bin/echo";
  
-@@ -23,34 +23,34 @@ $IFCONFIG="/sbin/ifconfig";
+@@ -23,34 +23,34 @@
  $IPCS="/usr/bin/ipcs";
  $LAST="/usr/bin/last";
  
@@ -165,7 +158,7 @@
  
  # solaris
  $SWAP="/etc/swap";
-@@ -61,7 +61,8 @@ $DEVINFO="/usr/sbin/devinfo";
+@@ -61,7 +61,8 @@
  $PSTAT="/usr/sbin/pstat";
  
  # linux
@@ -175,7 +168,7 @@
  $KSYMS="/sbin/ksyms";
  $LSMOD="/sbin/lsmod";
  
-@@ -77,12 +78,12 @@ $DF="/bin/df";
+@@ -77,12 +78,12 @@
  #
  # our stuff
  #
@@ -196,25 +189,23 @@
 +$MAJ_MIN  = "/bin/major_minor";
 +$TIMEOUT  = "/bin/timeout";
  
-diff -Naurp tct.orig/extras/bdf tct/extras/bdf
---- tct.orig/extras/bdf	2007-01-21 22:18:00.000000000 +0000
-+++ tct/extras/bdf	2008-11-28 07:58:27.000000000 +0000
+--- a/extras/bdf
++++ b/extras/bdf
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl5
 +#!/usr/bin/perl
  
  #
  #  Goes through text & binaries files, looking for executables
-diff -Naurp tct.orig/extras/ils2mac tct/extras/ils2mac
---- tct.orig/extras/ils2mac	2007-01-21 22:18:00.000000000 +0000
-+++ tct/extras/ils2mac	2008-11-28 07:58:27.000000000 +0000
+--- a/extras/ils2mac
++++ b/extras/ils2mac
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl5
 +#!/usr/bin/perl
  
  #
  # Take a stream of time machine formatted data from ils and re-arrange
-@@ -17,7 +17,7 @@ $debug = 0;
+@@ -17,7 +17,7 @@
  $running_under_grave_robber = 1;
  
  $TCT_HOME = "";
@@ -223,18 +214,16 @@
  require "tm_misc.pl";
  require "hostname.pl";
  require "crunch.pl";
-diff -Naurp tct.orig/extras/realpath tct/extras/realpath
---- tct.orig/extras/realpath	2007-01-21 22:18:00.000000000 +0000
-+++ tct/extras/realpath	2008-11-28 07:58:27.000000000 +0000
+--- a/extras/realpath
++++ b/extras/realpath
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl5
 +#!/usr/bin/perl
  
  #
  #  Prints out the real pathname of file(s); usage:
-diff -Naurp tct.orig/lazarus/lazarus tct/lazarus/lazarus
---- tct.orig/lazarus/lazarus	2007-01-21 22:18:00.000000000 +0000
-+++ tct/lazarus/lazarus	2008-11-28 07:58:27.000000000 +0000
+--- a/lazarus/lazarus
++++ b/lazarus/lazarus
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl5
 +#!/usr/bin/perl
@@ -249,7 +238,7 @@
  $TCT_HOME = "";
  
  $| = 1;
-@@ -77,7 +78,7 @@ if (!$TCT_HOME) {
+@@ -77,7 +78,7 @@
  	die "Can't find TCT_HOME - did you run reconfig?\n";
  	}
  else { 
@@ -258,10 +247,9 @@
  	}
  
  require "lazarus.cf";
-diff -Naurp tct.orig/lib/linux.pl tct/lib/linux.pl
---- tct.orig/lib/linux.pl	2001-03-16 19:25:04.000000000 +0000
-+++ tct/lib/linux.pl	2008-11-28 07:58:27.000000000 +0000
-@@ -35,6 +35,7 @@ print "Running all sorts of commands on 
+--- a/lib/linux.pl
++++ b/lib/linux.pl
+@@ -35,6 +35,7 @@
  &df();
  
  &ipcs();
@@ -269,10 +257,11 @@
  &rpm();
  &lsmod();
  
-@@ -260,6 +261,22 @@ if (-x $IPCS) {
+@@ -259,6 +260,22 @@
+ 		}
  	}
  }
- 
++
 +sub dpkg {
 +
 +if (-x $DPKG ) {
@@ -288,30 +277,26 @@
 +		}
 +	}
 +}
-+
+ 
  sub rpm {
  
- if (-x $RPM ) {
-diff -Naurp tct.orig/lib/ostype.pl tct/lib/ostype.pl
---- tct.orig/lib/ostype.pl	2003-08-30 23:17:11.000000000 +0000
-+++ tct/lib/ostype.pl	2008-11-28 07:58:27.000000000 +0000
+--- a/lib/ostype.pl
++++ b/lib/ostype.pl
 @@ -1,4 +1,3 @@
 -#!/bin/perl
  #
  #  Simple test that uses uname to determine what we're running on...
  #
-diff -Naurp tct.orig/lib/process_dirs.pl tct/lib/process_dirs.pl
---- tct.orig/lib/process_dirs.pl	2000-07-30 23:39:20.000000000 +0000
-+++ tct/lib/process_dirs.pl	2008-11-28 07:58:27.000000000 +0000
+--- a/lib/process_dirs.pl
++++ b/lib/process_dirs.pl
 @@ -1,4 +1,3 @@
 -#!/usr/local/bin/perl
  
  #
  # given a dir, suck in all the executable files in there
-diff -Naurp tct.orig/lib/save_the_files.pl tct/lib/save_the_files.pl
---- tct.orig/lib/save_the_files.pl	2000-07-30 23:39:20.000000000 +0000
-+++ tct/lib/save_the_files.pl	2008-11-28 07:58:27.000000000 +0000
-@@ -30,6 +30,7 @@ while (<STF>) {
+--- a/lib/save_the_files.pl
++++ b/lib/save_the_files.pl
+@@ -30,6 +30,7 @@
  	print "next file: $files\n" if $debug;
  
  	while (<${files}>) {
@@ -319,19 +304,17 @@
  		print "Going into while...\n" if $debug;
  
  
-diff -Naurp tct.orig/lib/system_stubs.pl tct/lib/system_stubs.pl
---- tct.orig/lib/system_stubs.pl	2000-07-30 23:39:20.000000000 +0000
-+++ tct/lib/system_stubs.pl	2008-11-28 07:58:35.000000000 +0000
+--- a/lib/system_stubs.pl
++++ b/lib/system_stubs.pl
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  #
  # a simple set of stub routines to call the real functions that do
-diff -Naurp tct.orig/lib/tree.pl tct/lib/tree.pl
---- tct.orig/lib/tree.pl	2001-02-22 16:19:40.000000000 +0000
-+++ tct/lib/tree.pl	2008-11-28 07:58:27.000000000 +0000
-@@ -150,9 +150,9 @@ sub do_first_looks {
+--- a/lib/tree.pl
++++ b/lib/tree.pl
+@@ -152,9 +152,9 @@
  
  print "\nStarting preprocessing paths and filenames on $hostname...\n";
  
@@ -343,10 +326,9 @@
  
  while (<PATHS>) {
  	next if (/^\s*#/ || /^\s*$/);
-diff -Naurp tct.orig/man/man1/timeout.1 tct/man/man1/timeout.1
---- tct.orig/man/man1/timeout.1	2004-10-18 14:59:46.000000000 +0000
-+++ tct/man/man1/timeout.1	2008-11-28 07:58:27.000000000 +0000
-@@ -20,16 +20,16 @@ Arguments:
+--- a/man/man1/timeout.1
++++ b/man/man1/timeout.1
+@@ -20,16 +20,16 @@
  .IP \fI-signal\fR
  Specify an optional signal to send to the controlled process.
  By default, \fBtimeout\fR sends SIGKILL, which cannot be caught
@@ -367,10 +349,9 @@
  .SH LICENSE
  .na
  .nf
-diff -Naurp tct.orig/reconfig tct/reconfig
---- tct.orig/reconfig	2001-09-15 20:48:51.000000000 +0000
-+++ tct/reconfig	2008-11-28 07:58:27.000000000 +0000
-@@ -39,7 +39,7 @@ $other_dirs="bin:/etc:/usr/ccs/bin:/bin:
+--- a/reconfig
++++ b/reconfig
+@@ -39,7 +39,7 @@
  	"find", "ftp", "format", "ifconfig", "ipcs", "last", "ls", "lsof",
  	"lsmod", "modinfo", "modstat",
  	"mkdir", "mv", "netstat", "nfsstat", "nslookup", "pkginfo", "ping",
@@ -379,7 +360,7 @@
  	"showmount", "showrev", "sort", "strings", "su", "swap", "sync",
  	"test", "top", "touch", "uname", "uniq", "uudecode", "uptime",
  	"w", "who", "whoami", "xhost", "xauth", "ypcat", "ypwhich");
-@@ -81,7 +81,7 @@ print "\nPerl5 is in $PERL\n";
+@@ -81,7 +81,7 @@
  
  for (@perl5_src) { $perl5_src .= "$_ "; }
  print "\nchanging the source in: $perl5_src\n";
@@ -388,7 +369,7 @@
  
  # make sure things are executable...
  system("chmod +x $perl5_src");
-@@ -94,7 +94,7 @@ for $command (@all_commands) {
+@@ -94,7 +94,7 @@
  		# special case rsh/remsh; if we can find remsh, ignore rsh
  		if ($command eq "rsh") {
  			# print "looking for rsh/remsh ($dir/$command)\n";
@@ -397,7 +378,7 @@
  				# this converts to upper case
  				($upper = $command) =~ y/[a-z]/[A-Z]/;
  				$found="true";
-@@ -167,7 +167,7 @@ for $file (@files2reconfig) {
+@@ -167,7 +167,7 @@
  	die "Can't open $file for reading\n" unless open(FILE, $file);
  	while (<FILE>) {
  		if (/^\s*\$TCT_HOME\s*=/ && !$done) {
@@ -406,9 +387,8 @@
  			$done = 1;
  			next;
  			}
-diff -Naurp tct.orig/src/file/compress.c tct/src/file/compress.c
---- tct.orig/src/file/compress.c	2000-07-30 23:39:20.000000000 +0000
-+++ tct/src/file/compress.c	2008-11-28 07:58:27.000000000 +0000
+--- a/src/file/compress.c
++++ b/src/file/compress.c
 @@ -11,6 +11,7 @@
  #include <unistd.h>
  #include <string.h>
@@ -417,10 +397,9 @@
  
  #include "file.h"
  
-diff -Naurp tct.orig/src/file/file.c tct/src/file/file.c
---- tct.orig/src/file/file.c	2000-07-30 23:39:20.000000000 +0000
-+++ tct/src/file/file.c	2008-11-28 07:58:27.000000000 +0000
-@@ -36,6 +36,7 @@ static char *moduleid =
+--- a/src/file/file.c
++++ b/src/file/file.c
+@@ -36,6 +36,7 @@
  #include <sys/param.h>	/* for MAXPATHLEN */
  #include <sys/stat.h>
  #include <fcntl.h>	/* for open() */
@@ -428,9 +407,8 @@
  #if (__COHERENT__ >= 0x420)
  #include <sys/utime.h>
  #else
-diff -Naurp tct.orig/src/file/fsmagic.c tct/src/file/fsmagic.c
---- tct.orig/src/file/fsmagic.c	2000-07-30 23:39:20.000000000 +0000
-+++ tct/src/file/fsmagic.c	2008-11-28 07:58:27.000000000 +0000
+--- a/src/file/fsmagic.c
++++ b/src/file/fsmagic.c
 @@ -31,6 +31,7 @@
  #include <sys/stat.h>
  #include <unistd.h>
@@ -439,10 +417,9 @@
  #ifndef	major			/* if `major' not defined in types.h, */
  #include <sys/sysmacros.h>	/* try this one. */
  #endif
-diff -Naurp tct.orig/src/fstools/fs_tools.h tct/src/fstools/fs_tools.h
---- tct.orig/src/fstools/fs_tools.h	2007-04-09 13:30:32.000000000 +0000
-+++ tct/src/fstools/fs_tools.h	2008-11-28 07:58:27.000000000 +0000
-@@ -201,7 +201,7 @@ extern int optind;
+--- a/src/fstools/fs_tools.h
++++ b/src/fstools/fs_tools.h
+@@ -201,7 +201,7 @@
    */
  #if defined(LINUX2)
  #define SUPPORTED
@@ -451,9 +428,8 @@
  #define HAVE_EXT2FS
  #define HAVE_DTIME
  #if (_FILE_OFFSET_BITS == 64)
-diff -Naurp tct.orig/src/fstools/mylseek.c tct/src/fstools/mylseek.c
---- tct.orig/src/fstools/mylseek.c	2006-06-26 21:07:45.000000000 +0000
-+++ tct/src/fstools/mylseek.c	2008-11-28 07:58:27.000000000 +0000
+--- a/src/fstools/mylseek.c
++++ b/src/fstools/mylseek.c
 @@ -30,9 +30,9 @@
    * This is LINUX, live on the bleeding edge and watch your software break
    * with the next release...
@@ -467,10 +443,9 @@
  /* mylseek - seek beyond the 32-bit barrier */
  
  OFF_T   mylseek(int fd, OFF_T offset, int whence)
-diff -Naurp tct.orig/src/lastcomm/sys_defs.h tct/src/lastcomm/sys_defs.h
---- tct.orig/src/lastcomm/sys_defs.h	2003-08-30 23:18:31.000000000 +0000
-+++ tct/src/lastcomm/sys_defs.h	2008-11-28 07:58:27.000000000 +0000
-@@ -77,10 +77,14 @@ extern int getopt();
+--- a/src/lastcomm/sys_defs.h
++++ b/src/lastcomm/sys_defs.h
+@@ -81,10 +81,14 @@
  #define NODEV		0xffff
  #define HAVE_COMP_MAJOR_PFLTS
  #define HAVE_COMP_EXIT_STATUS
diff -Nru tct-1.19/debian/patches/02-seconds.patch tct-1.19/debian/patches/02-seconds.patch
--- tct-1.19/debian/patches/02-seconds.patch	2011-06-15 21:31:04.000000000 +0200
+++ tct-1.19/debian/patches/02-seconds.patch	2011-06-15 21:23:22.000000000 +0200
@@ -3,9 +3,8 @@
  Adding support for fractions of seconds for timeout (Closes: #412923).
  Fix "does not exit until timeout when launched in a cgi" (Closes: #532342).
 
-diff -Naurp tct.orig/src/misc/timeout.c tct/src/misc/timeout.c
---- tct.orig/src/misc/timeout.c	2009-05-28 19:05:34.000000000 +0000
-+++ tct/src/misc/timeout.c	2009-05-28 20:48:29.000000000 +0000
+--- a/src/misc/timeout.c
++++ b/src/misc/timeout.c
 @@ -39,6 +39,8 @@
  #include <stdlib.h>
  #include <unistd.h>
@@ -15,7 +14,7 @@
  
  extern int optind;
  
-@@ -69,10 +71,11 @@ int     main(argc, argv)
+@@ -69,10 +71,11 @@
  int     argc;
  char  **argv;
  {
@@ -28,7 +27,7 @@
  
      progname = argv[0];
  
-@@ -83,7 +86,7 @@ char  **argv;
+@@ -83,7 +86,7 @@
  	if ((kill_signal = atoi(*argv + 1)) <= 0)
  	    usage();
  
@@ -37,7 +36,7 @@
  	usage();
  
      commandname = argv[1];
-@@ -105,7 +108,11 @@ char  **argv;
+@@ -105,7 +108,11 @@
  	(void) signal(SIGQUIT, terminate);
  	(void) signal(SIGTERM, terminate);
  	(void) signal(SIGALRM, terminate);
diff -Nru tct-1.19/debian/patches/03-check-for-perl5-fix.patch tct-1.19/debian/patches/03-check-for-perl5-fix.patch
--- tct-1.19/debian/patches/03-check-for-perl5-fix.patch	1970-01-01 01:00:00.000000000 +0100
+++ tct-1.19/debian/patches/03-check-for-perl5-fix.patch	2011-06-15 21:23:22.000000000 +0200
@@ -0,0 +1,17 @@
+Description: Adapt check for finding perl 5 binary.
+Origin: vendor
+Bug: http://bugs.debian.org/628357
+Author: Salvatore Bonaccorso <car...@debian.org>
+Last-Update: 2011-06-15
+
+--- a/reconfig
++++ b/reconfig
+@@ -59,7 +59,7 @@
+ 	while (<$dir/perl5* $dir/perl*>) {
+ 		if (-x $_) {
+ 			$perl_version=`($_ -v 2> /dev/null) |
+-				awk '/This is perl, v.*5/ { print $NF }'`;
++				awk '/This is perl 5, version/ { print $NF }'`;
+ 			if ($perl_version) {
+ 				$PERL=$_;
+ 				$pflag="1";
diff -Nru tct-1.19/debian/patches/debian-changes-1.19-1.1 tct-1.19/debian/patches/debian-changes-1.19-1.1
--- tct-1.19/debian/patches/debian-changes-1.19-1.1	1970-01-01 01:00:00.000000000 +0100
+++ tct-1.19/debian/patches/debian-changes-1.19-1.1	2011-06-15 21:30:40.000000000 +0200
@@ -0,0 +1,87 @@
+Description: Upstream changes introduced in version 1.19-1.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ tct (1.19-1.1) unstable; urgency=low
+ .
+   * Non-maintainer upload.
+   * Refresh offsets for 01-conglomeration.patch.
+   * Add 03-check-for-perl5-fix.patch to adapt check for perl 5
+     (Closes: #628357).
+   * Covert to '3.0 (quilt)' source package format and drop quilt framework
+     from debian/control and debian/rules.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Salvatore Bonaccorso <car...@debian.org>
+Bug-Debian: http://bugs.debian.org/628357
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- tct-1.19.orig/extras/realpath
++++ tct-1.19/extras/realpath
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/perl5
+ 
+ #
+ #  Prints out the real pathname of file(s); usage:
+--- tct-1.19.orig/extras/bdf
++++ tct-1.19/extras/bdf
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/perl5
+ 
+ #
+ #  Goes through text & binaries files, looking for executables
+--- tct-1.19.orig/extras/ils2mac
++++ tct-1.19/extras/ils2mac
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/perl5
+ 
+ #
+ # Take a stream of time machine formatted data from ils and re-arrange
+--- tct-1.19.orig/lazarus/lazarus
++++ tct-1.19/lazarus/lazarus
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/perl5
+ #
+ #  Lazarus - tries to revive things that have died and gone into the 
+ # binary spirit world... deleted files, data in memory, swap, etc.
+--- tct-1.19.orig/bin/strip_tct_home
++++ tct-1.19/bin/strip_tct_home
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/perl5
+ #
+ #  NOTE!!!
+ #
+--- tct-1.19.orig/bin/grave-robber
++++ tct-1.19/bin/grave-robber
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/perl5
+ 
+ #
+ #  Usage: $0 [-filmnpstvDEFIMOPVS] [-b body_file] [-c corpse_dir] 
+--- tct-1.19.orig/bin/mactime
++++ tct-1.19/bin/mactime
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/perl5
+ 
+ #  A program that attempts to determine what files (taken from an already
+ # calculated DB; see the file "body") were mucked with at a given time... 
diff -Nru tct-1.19/debian/patches/series tct-1.19/debian/patches/series
--- tct-1.19/debian/patches/series	2011-06-15 21:31:04.000000000 +0200
+++ tct-1.19/debian/patches/series	2011-06-15 21:30:40.000000000 +0200
@@ -1,2 +1,4 @@
 01-conglomeration.patch
 02-seconds.patch
+03-check-for-perl5-fix.patch
+debian-changes-1.19-1.1
diff -Nru tct-1.19/debian/rules tct-1.19/debian/rules
--- tct-1.19/debian/rules	2011-06-15 21:31:04.000000000 +0200
+++ tct-1.19/debian/rules	2011-06-15 21:29:28.000000000 +0200
@@ -3,7 +3,7 @@
 SHELL := sh -e
 
 %:
-	dh ${@} --with quilt
+	dh ${@}
 
 override_dh_auto_clean:
 	cp conf/paths.pl conf/paths.pl.debian
diff -Nru tct-1.19/debian/source/format tct-1.19/debian/source/format
--- tct-1.19/debian/source/format	1970-01-01 01:00:00.000000000 +0100
+++ tct-1.19/debian/source/format	2011-06-15 21:28:49.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)

Attachment: signature.asc
Description: Digital signature

Reply via email to