[Pkg-emboss-commits] r123 - emboss/trunk/debian/patches

[charles-guest at alioth.debian.org]

Author: charles-guest
Date: 2008-01-10 02:30:59 +0000 (Thu, 10 Jan 2008)
New Revision: 123

Added:
   emboss/trunk/debian/patches/ajindex-fix-2008-01-09.patch
Modified:
   emboss/trunk/debian/patches/psiphi-fix-2007-07-27.patch
   emboss/trunk/debian/patches/series
Log:
new patch from upstream ; annotation of the patches

Added: emboss/trunk/debian/patches/ajindex-fix-2008-01-09.patch
===================================================================
--- emboss/trunk/debian/patches/ajindex-fix-2008-01-09.patch	                        (rev 0)
+++ emboss/trunk/debian/patches/ajindex-fix-2008-01-09.patch	2008-01-10 02:30:59 UTC (rev 123)
@@ -0,0 +1,36 @@
+Fixes rare secondary index problem with input files over 2Gb.
+--- a/ajax/ajindex.c
++++ b/ajax/ajindex.c
+@@ -2516,7 +2516,14 @@
+ 
+ static ajint btreeNumIdCompare(const void *a, const void *b)
+ {
+-    return (*(AjPBtNumId const *)a)->offset - (*(AjPBtNumId const *)b)->offset;
++  ajlong val;
++
++    val = (*(AjPBtNumId const *)a)->offset - (*(AjPBtNumId const *)b)->offset;
++
++    if(!val)
++      return 0;
++
++    return (val < 0L) ? -1 : 1;
+ }
+ 
+ 
+@@ -11956,8 +11963,14 @@
+ 
+ static ajint btreeOffsetCompare(const void *a, const void *b)
+ {
+-    return (*(AjPBtId const *)a)->offset -
+-		  (*(AjPBtId const *)b)->offset;
++  ajlong val;
++
++    val = (*(AjPBtId const *)a)->offset - (*(AjPBtId const *)b)->offset;
++
++    if(!val)
++      return 0;
++
++    return (val < 0L) ? -1 : 1;
+ }
+ 
+ 

Modified: emboss/trunk/debian/patches/psiphi-fix-2007-07-27.patch
===================================================================
--- emboss/trunk/debian/patches/psiphi-fix-2007-07-27.patch	2007-11-05 01:49:48 UTC (rev 122)
+++ emboss/trunk/debian/patches/psiphi-fix-2007-07-27.patch	2008-01-10 02:30:59 UTC (rev 123)
@@ -1,3 +1,5 @@
+Fixes a problem with reading more recent CCF files.
+Error traps cases where chains have no atom information.
 Index: EMBOSS-5.0.0/emboss/psiphi.c
 ===================================================================
 --- EMBOSS-5.0.0.orig/emboss/psiphi.c

Modified: emboss/trunk/debian/patches/series
===================================================================
--- emboss/trunk/debian/patches/series	2007-11-05 01:49:48 UTC (rev 122)
+++ emboss/trunk/debian/patches/series	2008-01-10 02:30:59 UTC (rev 123)
@@ -1 +1,2 @@
 psiphi-fix-2007-07-27.patch
+ajindex-fix-2008-01-09.patch