[med-svn] r7892 - trunk/packages/rostlab/libzerg/trunk/debian/patches

[Laszlo Kajan]

Author: lkajan-guest
Date: 2011-09-20 14:33:59 +0000 (Tue, 20 Sep 2011)
New Revision: 7892

Modified:
   trunk/packages/rostlab/libzerg/trunk/debian/patches/blastpgp
   trunk/packages/rostlab/libzerg/trunk/debian/patches/debian-changes-1.0.7-1
Log:
introduced AFTER_LAST_TOKEN macro in order to be able to maintain compatibility with macros in earlier revisions of the library

Modified: trunk/packages/rostlab/libzerg/trunk/debian/patches/blastpgp
===================================================================
--- trunk/packages/rostlab/libzerg/trunk/debian/patches/blastpgp	2011-09-20 13:01:12 UTC (rev 7891)
+++ trunk/packages/rostlab/libzerg/trunk/debian/patches/blastpgp	2011-09-20 14:33:59 UTC (rev 7892)
@@ -1,7 +1,7 @@
 Index: libzerg-1.0.7/zerglexer.lex
 ===================================================================
 --- libzerg-1.0.7.orig/zerglexer.lex	2009-01-27 21:47:40.000000000 +0100
-+++ libzerg-1.0.7/zerglexer.lex	2011-09-20 14:39:44.000000000 +0200
++++ libzerg-1.0.7/zerglexer.lex	2011-09-20 15:43:55.294890453 +0200
 @@ -36,9 +36,9 @@
  static char* _zerg_description_score;
  static char* _zerg_description_evalue;
@@ -322,6 +322,24 @@
  
  %%
  
+@@ -516,7 +487,7 @@
+ void zerg_ignore_all()
+ {
+   int i;
+-  for(i=BLAST_VERSION; i<=UNMATCHED; i++)
++  for(i=BLAST_VERSION; i<AFTER_LAST_TOKEN; i++)
+     _zerg_ignore[i]=1;
+ }
+ 
+@@ -528,7 +499,7 @@
+ void zerg_unignore_all()
+ {
+   int i;
+-  for(i=BLAST_VERSION; i<=UNMATCHED; i++)
++  for(i=BLAST_VERSION; i<AFTER_LAST_TOKEN; i++)
+     _zerg_ignore[i]=0;
+ }
+ 
 @@ -548,3 +519,5 @@
    else
      return pos - YY_CURRENT_BUFFER->yy_n_chars + yytext -YY_CURRENT_BUFFER->yy_ch_buf - _zerg_desconto;
@@ -330,39 +348,32 @@
 +// vim:et:ts=2:
 Index: libzerg-1.0.7/zerg.h
 ===================================================================
---- libzerg-1.0.7.orig/zerg.h	2011-09-20 14:39:44.000000000 +0200
-+++ libzerg-1.0.7/zerg.h	2011-09-20 14:39:44.000000000 +0200
-@@ -36,15 +36,17 @@
+--- libzerg-1.0.7.orig/zerg.h	2011-09-20 15:51:09.482864608 +0200
++++ libzerg-1.0.7/zerg.h	2011-09-20 15:37:37.682909195 +0200
+@@ -36,7 +36,18 @@
  #define PERCENT_POSITIVES 28
  #define QUERY_FRAME 29
  #define SUBJECT_FRAME 30
--#define UNMATCHED 31				// UNMATCHED TOKEN
--#define ROUND_NUMBER 32
--#define HSP_METHOD 33
--#define SEARCHING 34
--#define QUERY_ALN 35
--#define SUBJECT_ALN 36
--#define ROUND_SEQ_FOUND 37
--#define ROUND_SEQ_NEW 38
--#define CONVERGED 39
-+#define ROUND_NUMBER 31
-+#define HSP_METHOD 32
-+#define SEARCHING 33
-+#define QUERY_ALN 34
-+#define SUBJECT_ALN 35
-+#define ROUND_SEQ_FOUND 36
-+#define ROUND_SEQ_NEW 37
-+#define CONVERGED 38
-+#define REFERENCE 39
-+#define TAIL_OF_REPORT 40
-+#define UNMATCHED 41				// UNMATCHED TOKEN, must be last
+-#define UNMATCHED 31    /* Esta tem que ser a ultima */
++#define UNMATCHED 31
++#define ROUND_NUMBER 32
++#define HSP_METHOD 33
++#define SEARCHING 34
++#define QUERY_ALN 35
++#define SUBJECT_ALN 36
++#define ROUND_SEQ_FOUND 37
++#define ROUND_SEQ_NEW 38
++#define CONVERGED 39
++#define REFERENCE 40
++#define TAIL_OF_REPORT 41
++#define AFTER_LAST_TOKEN 42			// dummy token, must be last
  
  #ifdef __cplusplus
  extern "C" {
 Index: libzerg-1.0.7/Makefile.am
 ===================================================================
---- libzerg-1.0.7.orig/Makefile.am	2011-09-20 14:44:28.983071836 +0200
-+++ libzerg-1.0.7/Makefile.am	2011-09-20 14:44:40.051071556 +0200
+--- libzerg-1.0.7.orig/Makefile.am	2011-09-20 14:59:09.000000000 +0200
++++ libzerg-1.0.7/Makefile.am	2011-09-20 15:35:38.354915619 +0200
 @@ -4,7 +4,7 @@
  
  lib_LTLIBRARIES = libzerg.la

Modified: trunk/packages/rostlab/libzerg/trunk/debian/patches/debian-changes-1.0.7-1
===================================================================
--- trunk/packages/rostlab/libzerg/trunk/debian/patches/debian-changes-1.0.7-1	2011-09-20 13:01:12 UTC (rev 7891)
+++ trunk/packages/rostlab/libzerg/trunk/debian/patches/debian-changes-1.0.7-1	2011-09-20 14:33:59 UTC (rev 7892)
@@ -12705,25 +12705,6 @@
 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 +fi
 +
---- libzerg-1.0.7.orig/zerg.h
-+++ libzerg-1.0.7/zerg.h
-@@ -36,7 +36,15 @@
- #define PERCENT_POSITIVES 28
- #define QUERY_FRAME 29
- #define SUBJECT_FRAME 30
--#define UNMATCHED 31    /* Esta tem que ser a ultima */
-+#define UNMATCHED 31				// UNMATCHED TOKEN
-+#define ROUND_NUMBER 32
-+#define HSP_METHOD 33
-+#define SEARCHING 34
-+#define QUERY_ALN 35
-+#define SUBJECT_ALN 36
-+#define ROUND_SEQ_FOUND 37
-+#define ROUND_SEQ_NEW 38
-+#define CONVERGED 39
- 
- #ifdef __cplusplus
- extern "C" {
 --- /dev/null
 +++ libzerg-1.0.7/install-sh
 @@ -0,0 +1,520 @@