[med-svn] r16895 - in trunk/packages/dialign-t/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-05-09 09:58:43 +0000 (Fri, 09 May 2014)
New Revision: 16895

Added:
   trunk/packages/dialign-t/trunk/debian/patches/consistent_declarations.patch
Modified:
   trunk/packages/dialign-t/trunk/debian/changelog
   trunk/packages/dialign-t/trunk/debian/patches/series
Log:
Make sure declarations of function simple_aligner are consistent


Modified: trunk/packages/dialign-t/trunk/debian/changelog
===================================================================
--- trunk/packages/dialign-t/trunk/debian/changelog	2014-05-09 09:57:36 UTC (rev 16894)
+++ trunk/packages/dialign-t/trunk/debian/changelog	2014-05-09 09:58:43 UTC (rev 16895)
@@ -1,3 +1,11 @@
+dialign-t (1.0.2-6) unstable; urgency=medium
+
+  * debian/patches/consistent_declarations.patch: Make sure declarations
+    of function simple_aligner are consistent
+    Closes: #746770
+
+ -- Andreas Tille <tille at debian.org>  Fri, 09 May 2014 11:50:13 +0200
+
 dialign-t (1.0.2-5) unstable; urgency=low
 
   * enable running "debian/rules build-arch", i.e. without building arch

Added: trunk/packages/dialign-t/trunk/debian/patches/consistent_declarations.patch
===================================================================
--- trunk/packages/dialign-t/trunk/debian/patches/consistent_declarations.patch	                        (rev 0)
+++ trunk/packages/dialign-t/trunk/debian/patches/consistent_declarations.patch	2014-05-09 09:58:43 UTC (rev 16895)
@@ -0,0 +1,17 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 09 May 2014 11:50:13 +0200
+Bugs-Debian: http://bugs.debian.org/746770
+Description: Make sure declarations of function simple_aligner are
+ consistent
+
+--- a/source/museq.c
++++ b/source/museq.c
+@@ -53,7 +53,7 @@ extern struct prob_dist* calc_score_dist
+ // alig.c
+ extern struct alignment* create_empty_alignment(struct seq_col *scol);
+ //extern char adapt_diag(struct alignment *algn, struct scr_matrix *smatrix, struct diag* dg);
+-extern int  simple_aligner(struct seq_col *scol, struct diag_col *dcol, 
++extern char simple_aligner(struct seq_col *scol, struct diag_col *dcol, 
+ 			    struct scr_matrix* smatrix, 
+ 			    struct prob_dist *pdist, 
+ 		     struct alignment *algn, int round);

Modified: trunk/packages/dialign-t/trunk/debian/patches/series
===================================================================
--- trunk/packages/dialign-t/trunk/debian/patches/series	2014-05-09 09:57:36 UTC (rev 16894)
+++ trunk/packages/dialign-t/trunk/debian/patches/series	2014-05-09 09:58:43 UTC (rev 16895)
@@ -1,2 +1,3 @@
 prevent_enforcing_arch.patch
 hardening.patch
+consistent_declarations.patch