[med-svn] r22157 - in trunk/packages/rostlab/librg-utils-perl/trunk/debian: . patches

Tatiana Malygina latticetower-guest at moszumanska.debian.org
Wed Jun 22 07:08:57 UTC 2016


Author: latticetower-guest
Date: 2016-06-22 07:08:57 +0000 (Wed, 22 Jun 2016)
New Revision: 22157

Added:
   trunk/packages/rostlab/librg-utils-perl/trunk/debian/patches/
   trunk/packages/rostlab/librg-utils-perl/trunk/debian/patches/remove-defined-for-arrays.patch
   trunk/packages/rostlab/librg-utils-perl/trunk/debian/patches/series
Modified:
   trunk/packages/rostlab/librg-utils-perl/trunk/debian/changelog
Log:
fixed defined(@array) errors with perl 5.22

Modified: trunk/packages/rostlab/librg-utils-perl/trunk/debian/changelog
===================================================================
--- trunk/packages/rostlab/librg-utils-perl/trunk/debian/changelog	2016-06-22 07:06:26 UTC (rev 22156)
+++ trunk/packages/rostlab/librg-utils-perl/trunk/debian/changelog	2016-06-22 07:08:57 UTC (rev 22157)
@@ -3,6 +3,8 @@
   * Team upload.
   * add Testsuite: autopkgtest-pkg-perl to debian/control
   * cme fix dpkg-control
+  * fix error "Can't use 'defined(@array)' (Maybe you should just 
+    omit the defined()?)" from appearing when using with perl 5.22 
 
  -- Tatiana Malygina <merlettaia at gmail.com>  Wed, 22 Jun 2016 09:22:29 +0300
 
@@ -49,4 +51,3 @@
   * New upstream release
 
  -- Laszlo Kajan <lkajan at rostlab.org>  Wed, 28 Sep 2011 11:15:17 +0200
-

Added: trunk/packages/rostlab/librg-utils-perl/trunk/debian/patches/remove-defined-for-arrays.patch
===================================================================
--- trunk/packages/rostlab/librg-utils-perl/trunk/debian/patches/remove-defined-for-arrays.patch	                        (rev 0)
+++ trunk/packages/rostlab/librg-utils-perl/trunk/debian/patches/remove-defined-for-arrays.patch	2016-06-22 07:08:57 UTC (rev 22157)
@@ -0,0 +1,137 @@
+Author: Tatiana Malygina <merlettaia at gmail.com>
+Last-Update: 2016-06-22
+Description: this fix prevents from appearing deprecation error with text 
+  "Can't use 'defined(@array)' (Maybe you should just omit the defined()?) 
+  at /usr/share/perl5/RG/Utils/..." - from appearing when run with perl 5.22
+
+--- a/lib/RG/Utils/Conv_hssp2saf.pm
++++ b/lib/RG/Utils/Conv_hssp2saf.pm
+@@ -604,7 +604,7 @@
+ 				#                  of all numbers wanted (i.e. = $want[M])
+     undef @ptr_numFin2numWant;	# $ptr[M]=   N   : see previous, the other way around!
+ 
+-    $#want=0                    if (! defined @want);
++    $#want=0                    if (! @want);
+     $LreadAll=0; 
+ 				# ------------------------------
+ 				# digest input
+@@ -657,7 +657,7 @@
+ 				# sort the array
+     @wantNum= sort bynumber (@wantNum);
+ 				# too many wanted
+-    if (defined @wantNum && ($wantNum[$#wantNum] > $locNum[$#locNum])){
++    if (@wantNum && ($wantNum[$#wantNum] > $locNum[$#locNum])){
+ 	$#tmp=0; 
+ 	foreach $want (@wantNum){
+ 	    if ($want <= $locNum[$#locNum]){
+--- a/lib/RG/Utils/Copf.pm
++++ b/lib/RG/Utils/Copf.pm
+@@ -2112,7 +2112,7 @@
+ 	    $par{$kwd}=$par{"dirOut"}.$par{$kwd} if (-d $par{"dirOut"});}}
+ 				# ------------------------------
+ 				# push array of output files
+-    $#fileOut=0 if (! defined @fileOut);
++    $#fileOut=0 if (! @fileOut);
+     foreach $kwd (@kwdFileOut){
+ 	push(@fileOut,$par{$kwd});}
+ 				# ------------------------------
+@@ -2240,7 +2240,7 @@
+ 	    printf $fhTraceLocSbr "--- %-20s '%-s'\n",$kwd,$par{$kwd};}}
+ 				# ------------------------------
+ 				# input files
+-    if    (defined @fileIn && $#fileIn>1){
++    if    (@fileIn && $#fileIn>1){
+ 				# get dirs
+ 	$#tmpdir=0; undef %tmpdir;
+ 	foreach $file (@fileIn){
+@@ -2262,10 +2262,10 @@
+ 		$tmp=$fileIn[$it2]; $tmp=~s/^.*\///g;
+ 		printf $fhTraceLocSbr "%-18s ",$tmp;++$it2;}
+ 	    print $fhTraceLocSbr "\n";}}
+-    elsif ((defined @fileIn && $#fileIn==1) || (defined $fileIn && -e $fileIn)){
++    elsif ((@fileIn && $#fileIn==1) || (defined $fileIn && -e $fileIn)){
+ 	$tmp=0;
+ 	$tmp=$fileIn    if (defined $fileIn && $fileIn);
+-	$tmp=$fileIn[1] if (! $tmp && defined @fileIn && $#fileIn==1);
++	$tmp=$fileIn[1] if (! $tmp && @fileIn && $#fileIn==1);
+ 	print  $fhTraceLocSbr "--- \n";
+ 	printf $fhTraceLocSbr "--- %-20s '%-s'\n","Input file:",$tmp;}
+     print  $fhTraceLocSbr "--- \n";
+@@ -5022,7 +5022,7 @@
+ 				#                  of all numbers wanted (i.e. = $want[M])
+     undef @ptr_numFin2numWant;	# $ptr[M]=   N   : see previous, the other way around!
+ 
+-    $#want=0                    if (! defined @want);
++    $#want=0                    if (! @want);
+     $LreadAll=0; 
+ 				# ------------------------------
+ 				# digest input
+@@ -5075,7 +5075,7 @@
+ 				# sort the array
+     @wantNum= sort bynumber (@wantNum);
+ 				# too many wanted
+-    if (defined @wantNum && ($wantNum[$#wantNum] > $locNum[$#locNum])){
++    if (@wantNum && ($wantNum[$#wantNum] > $locNum[$#locNum])){
+ 	$#tmp=0; 
+ 	foreach $want (@wantNum){
+ 	    if ($want <= $locNum[$#locNum]){
+--- a/lib/RG/Utils/Hssp_filter.pm
++++ b/lib/RG/Utils/Hssp_filter.pm
+@@ -1436,7 +1436,7 @@
+ 	    $par{"$kwd"}=$par{"dirOut"}.$par{"$kwd"} if (-d $par{"dirOut"});}}
+ 				# ------------------------------
+ 				# push array of output files
+-    $#fileOut=0 if (! defined @fileOut);
++    $#fileOut=0 if (! @fileOut);
+     foreach $kwd (@kwdFileOut){
+ 	push(@fileOut,$par{"$kwd"});}
+ 				# ------------------------------
+@@ -1564,7 +1564,7 @@
+ 	    printf $fhTraceLocSbr "--- %-20s '%-s'\n",$kwd,$par{"$kwd"};}}
+ 				# ------------------------------
+ 				# input files
+-    if    (defined @fileIn && $#fileIn>1){
++    if    (@fileIn && $#fileIn>1){
+ 				# get dirs
+ 	$#tmpdir=0; undef %tmpdir;
+ 	foreach $file (@fileIn){
+@@ -1586,10 +1586,10 @@
+ 		$tmp=$fileIn[$it2]; $tmp=~s/^.*\///g;
+ 		printf $fhTraceLocSbr "%-18s ",$tmp;++$it2;}
+ 	    print $fhTraceLocSbr "\n";}}
+-    elsif ((defined @fileIn && $#fileIn==1) || (defined $fileIn && -e $fileIn)){
++    elsif ((@fileIn && $#fileIn==1) || (defined $fileIn && -e $fileIn)){
+ 	$tmp=0;
+ 	$tmp=$fileIn    if (defined $fileIn && $fileIn);
+-	$tmp=$fileIn[1] if (! $tmp && defined @fileIn && $#fileIn==1);
++	$tmp=$fileIn[1] if (! $tmp && @fileIn && $#fileIn==1);
+ 	print  $fhTraceLocSbr "--- \n";
+ 	printf $fhTraceLocSbr "--- %-20s '%-s'\n","Input file:",$tmp;}
+     print  $fhTraceLocSbr "--- \n";
+@@ -1816,7 +1816,7 @@
+ 				# ------------------------------
+ 				# (1) find in arguments passed
+ 				# ------------------------------
+-    if (defined @argLoc && $#argLoc > 0) {
++    if (@argLoc && $#argLoc > 0) {
+ 	foreach $arg (@argLoc) {
+ 	    if ($arg=~/^ARCH=(\S+)/i) {
+ 		$archFound=$1;
+@@ -2318,7 +2318,7 @@
+ 				# check arguments
+     return(0,"*** $sbrName: not def fileInLoc!")          if (! defined $fileInLoc);
+     return(0,"*** $sbrName: not def fileOutLoc!")         if (! defined $fileOutLoc);
+-    return(0,"*** $sbrName: not def \@takeLoc!")          if (! defined @takeLoc || $#takeLoc<1);
++    return(0,"*** $sbrName: not def \@takeLoc!")          if (! @takeLoc || $#takeLoc<1);
+     return(0,"*** $sbrName: miss in file '$fileInLoc'!")  if (! -e $fileInLoc);
+ 				# open files
+     &open_file("$fhinLoc","$fileInLoc") ||
+@@ -2371,7 +2371,7 @@
+     $#dir2=$Lok=0;
+     return(0,"no input file")   if (! defined $fileInLoc);
+     $chainLoc="";$idLoc=$fileInLoc;$idLoc=~s/^.*\///g;
+-    $#dir=0                     if (! defined @dir);
++    $#dir=0                     if (! @dir);
+     $Lscreen=0                  if (! defined $Lscreen);
+ 				# passed dir instead of Lscreen
+     if (-d $Lscreen) { @dir=($Lscreen, at dir);

Added: trunk/packages/rostlab/librg-utils-perl/trunk/debian/patches/series
===================================================================
--- trunk/packages/rostlab/librg-utils-perl/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/rostlab/librg-utils-perl/trunk/debian/patches/series	2016-06-22 07:08:57 UTC (rev 22157)
@@ -0,0 +1 @@
+remove-defined-for-arrays.patch




More information about the debian-med-commit mailing list